改bug

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

@@ -390,7 +390,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         {
             book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-            book.setRemake(Func.parseStr(PayEnum.FIVE.getNum()));
+            book.setRemake(Func.parseStr(PayEnum.SEVEN.getNum()));
             bookService.updateBooking(book);
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
             jsonObject.put(B.message, "已取消订单");
@@ -402,7 +402,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             // 如果在2已支付,3待入住 情况，用户点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
             book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum()));
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-            book.setRemake(Func.parseStr(PayEnum.FIVE.getNum()));
+            book.setRemake(Func.parseStr(PayEnum.SEVEN.getNum()));
             if (book.getPayAccount() > 0)
             {
                 // 注明如果支付金额大于0，则需要退款: （标识走退款操作）
@@ -418,6 +418,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             return null;
         }
 
+        // 退款操作
         jsonObject = refundMethod(book,users.getOpenid());
         jsonObject.put(B.data, book);
         ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
@@ -640,8 +641,11 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
                 Users users = userService.queryByUserId(book.getCreateUserid());
                 String sendMsg = "订单:"+ book.getOrderNum();
-                // 推给用户
-                Message.send(users.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                // 推给用户（需求确定，用户点取消退款以后[标识订单状态已取消]只发商家，不发用户。  商家点拒单以后[标识订单状态已退单]发商家和用户）
+                if (book.getOrderStatus().equals(Func.parseStr(PayEnum.EIGHT.getNum())))
+                {
+                    Message.send(users.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                }
 
                 // 推给商家
                 String live_end = book.getOrderStartTime().substring(0,10)  +"~"+  book.getOrderEndTime().substring(0,10);

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

@@ -56,6 +56,9 @@ public class AppBookImplService implements AppBookService {
 
         Booking booking = new Booking();
 
+        int day = DateUtil.getDayDiff(startTime,endTime); // 中间多少天
+        String orderLiveTime= Func.parseInt(houseOrderNumber)+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
+
         // 设置民宿信息
         booking.setHotelId(Func.parseStr(hotel.getId()));
         booking.setHotelName(hotel.getHname());
@@ -78,7 +81,7 @@ public class AppBookImplService implements AppBookService {
         booking.setHouseOrderNumber(Func.parseInt(houseOrderNumber));
         booking.setHouseAreas(house.gethAreas());
         booking.setHouseRemake(house.getRemark());
-        double totalPrice = Func.parseDbl(houseOrderNumber) * house.getPrice();
+        double totalPrice = Func.parseDbl(houseOrderNumber) * house.getPrice() * day;
         booking.setHouseTotalPrice(totalPrice);
 
 
@@ -87,8 +90,6 @@ public class AppBookImplService implements AppBookService {
         booking.setUserPhone(userPhone);
         booking.setOrderStartTime(startTime);
         booking.setOrderEndTime(endTime);
-        int day = DateUtil.getDayDiff(startTime,endTime);
-        String orderLiveTime= Func.parseInt(houseOrderNumber)+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
         booking.setOrderLiveTime(orderLiveTime);
 
         // 订单信息