Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

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

@@ -184,7 +184,10 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                     booking.setOrderStatus(Func.parseStr(PayEnum.支付超时.getNum()));
                     booking.setUpdateTime(TimeExchange.getDate());
                     bookService.updateBooking(booking);
-
+                    List<HotelCouponStatus> list = hotelCoupomStatusService.getBookingId(booking.getId() + "");
+                    if (list != null && list.size() > 0) {
+                        hotelCoupomStatusService.restitution(list);
+                    }
                     // 将状态修改为已超时订单时，写入数据操作
                     bookinglogService.addBooklog(OrderEnum.将订单设置为已超时.toString(), booking);
 
@@ -231,7 +234,11 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 // 将状态修改为已超时订单时，写入数据操作
                 bookinglogService.addBooklog(OrderEnum.将订单设置为已超时.toString(),booking);
 
-                System.out.println("已将订单"+booking.getOrderNum()+"标识为支付超时");
+                List<HotelCouponStatus> list = hotelCoupomStatusService.getBookingId(booking.getId() + "");
+                if (list != null && list.size() > 0) {
+                    hotelCoupomStatusService.restitution(list);
+                }
+                System.out.println("已将订单" + booking.getOrderNum() + "标识为支付超时");
 
                 jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
                 jsonObject.put(B.message, "已将订单"+booking.getOrderNum()+"标识为支付超时");
@@ -320,8 +327,12 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             bookService.updateBooking(book);
 
             // 用户在待支付状态下取消了订单时，写入数据操作
-            bookinglogService.addBooklog("用户在待支付状态下,取消了订单",book);
-
+            bookinglogService.addBooklog("用户在待支付状态下,取消了订单", book);
+//            返回优惠券
+            List<HotelCouponStatus> list = hotelCoupomStatusService.getBookingId(book.getId() + "");
+            if (list != null && list.size() > 0) {
+                hotelCoupomStatusService.restitution(list);
+            }
 
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
             jsonObject.put(B.message, ResultStatusCode.OK.getMsg());
@@ -331,14 +342,20 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         {
             book.setOrderStatus(Func.parseStr(PayEnum.退款中.getNum())); // 如果在2已支付,3待入住 情况，商家点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
             book.setRemake(Func.parseStr(PayEnum.已退单.getPayStatus()));
-        }else if(status == PayEnum.已入住.getNum())
-        {
+            List<HotelCouponStatus> list = hotelCoupomStatusService.getBookingId(book.getId() + "");
+            if (list != null && list.size() > 0) {
+                hotelCoupomStatusService.restitution(list);
+            }
+        } else if (status == PayEnum.已入住.getNum()) {
             book.setOrderStatus(Func.parseStr(PayEnum.退款中.getNum())); // 如果在2已支付,3待入住 情况，商家点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
             book.setRemake(Func.parseStr(PayEnum.已退款.getPayStatus()));
+            List<HotelCouponStatus> list = hotelCoupomStatusService.getBookingId(book.getId() + "");
+            if (list != null && list.size() > 0) {
+                hotelCoupomStatusService.restitution(list);
+            }
         }
 
-        if (book.getPayAccount() > 0)
-        {
+        if (book.getPayAccount() > 0) {
             // 注明如果支付金额大于0，则需要退款: （标识走退款操作）
             book.setRefundWay(OrderEnum.微信退款.toString());
         }
@@ -395,7 +412,13 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             book.setOrderStatus(Func.parseStr(PayEnum.已取消.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
             book.setRemake(Func.parseStr(PayEnum.已取消.getPayStatus()));
-            bookService.updateBooking(book);
+            int i = bookService.updateBooking(book);
+//            返还优惠券
+            List<HotelCouponStatus> list = hotelCoupomStatusService.getBookingId(book.getId() + "");
+            if (list != null && list.size() > 0) {
+                hotelCoupomStatusService.restitution(list);
+            }
+
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
             jsonObject.put(B.message, "已取消");
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());

mhotel/src/com/happy/service/HotelCoupomStatusService.java

@@ -30,7 +30,7 @@ public interface HotelCoupomStatusService {
 
     /**
      * 通过订单id返还优惠券
-     * @param bookingId
+     * @param list
      * @return
      */
     int restitution(List<HotelCouponStatus> list);