Merge remote-tracking branch 'origin/master'

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

@@ -228,6 +228,32 @@ public class DateUtil
     }
 
     /**
+     * 转化成时间区间.
+     * @param startTime 字符串开始时间
+     * @param endTime   字符串
+     * @return Date
+     */
+    public static String  convertTimeArea(String startTime, String endTime) {
+        if (Func.checkNullOrEmpty(startTime) || Func.checkNullOrEmpty(endTime)) {
+            return null;
+        }
+
+        try {
+            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");
+
+            return startDate + "-" +endDate;
+        } catch (ParseException e) {
+          new Exception("时间格式错误：" + e.getMessage()).printStackTrace();
+        }
+        return null;
+    }
+
+
+
+    /**
      * 将日期date转化成string
      * @param date
      * @return

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

@@ -666,12 +666,6 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 requestMap.put("package", "prepay_id=" + pay.getPrepay_id());
                 requestMap.put("signType", "MD5");
                 pay.setPaySign(PayWxUtil.getSign(requestMap, WeiXinUtil.key));
-                // 返回支付参数
-                resultjson.put("code", 200);
-                resultjson.put("message", "返回成功");
-                resultjson.put("data", pay);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-
                 // 保存支付信息
                 booking.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
                 booking.setOrderStatus(Func.parseStr(PayEnum.ONE.getNum()));
@@ -735,7 +729,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
                 // 手动接单，发消息给商家
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
-                String live_end = booking.getOrderStartTime() +"~"+  booking.getOrderEndTime();
+                String live_end = booking.getOrderStartTime().substring(0,10)  +"~"+  booking.getOrderEndTime().substring(0,10);
                 String hotelName = "";
                 if (Func.checkNull(booking.getHotelName()))
                 {

mhotel/src/com/happy/service/impl/AppBookImplService.java

@@ -123,6 +123,7 @@ public class AppBookImplService implements AppBookService {
         Booking booking = new Booking();
 
         // 设置民宿信息
+        booking.setHotelId(Func.parseStr(hotel.getId()));
         booking.setHotelName(hotel.getHname());
         booking.setHotelHposition(hotel.getHposition());
         booking.setHotelHpositionWens(hotel.getHpositionWens());