支付功能

mhotel/src/com/happy/Until/DateUtil.java

@@ -239,8 +239,8 @@ public class DateUtil
         }
 
         try {
-            Date start = new SimpleDateFormat(Time_Formatter_Second).parse(startTime);
-            Date end = new SimpleDateFormat(Time_Formatter_Second).parse(endTime);
+            Date start = new SimpleDateFormat(Time_Formatter_Day).parse(startTime);
+            Date end = new SimpleDateFormat(Time_Formatter_Day).parse(endTime);
             String startDate = parseDateToStr(start,"mmdd");
             String endDate = parseDateToStr(end,"mmdd");
 

mhotel/src/com/happy/action/AppBookingAction.java

@@ -729,7 +729,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
                 // 手动接单，发消息给商家
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
-                String live_end = DateUtil.convertTimeArea(booking.getOrderStartTime(),booking.getOrderEndTime()) ;
+                String live_end = booking.getOrderStartTime().substring(0,10)  +"~"+  booking.getOrderEndTime().substring(0,10);
                 String hotelName = "";
                 if (Func.checkNull(booking.getHotelName()))
                 {