修改核销接口

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

@@ -894,28 +894,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             Booking book = bookService.queryByOrder(order_num);
             // 支付成功
             if (result.getResult_code().equals("SUCCESS") && book!=null && ("1").equals(book.getOrderStatus())) {
-
-                //通过订单id找到所属优惠券
-                List<HotelCouponStatus> hotelCouponStatusList = hotelCoupomStatusService.getBookingId(book.getId()+"");
-                if (hotelCouponStatusList != null && hotelCouponStatusList.size() > 0) {
-                    System.out.println("进入核销优惠券");
-                    for (HotelCouponStatus hotelCouponStatus : hotelCouponStatusList) {
-                        String complaintId = hotelCouponStatus.getComplaintId();
-                        System.out.println("核销优惠券id:"+complaintId);
-                        HotelCoupon hotelCoupon = hotelCoupomService.getById(complaintId);
-                        if (hotelCoupon!=null) {
-                            Integer reversedNumber = hotelCoupon.getReversedNumber();
-                            if (reversedNumber==null) {
-                                reversedNumber=0;
-                            }
-                            hotelCoupon.setReversedNumber(reversedNumber+1);
-                            hotelCoupon.setModifyDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                            hotelCoupomService.updatReversedNumber(hotelCoupon);
-                        }
-                    }
-                }
-
-
+                
                 // 保存支付信息
                 book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
                 book.setOrderStatus(Func.parseStr(PayEnum.已支付.getNum()));

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

@@ -47,6 +47,12 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
     @Resource
     public HouseNumberService houseNumberService;
 
+    @Resource
+    public HotelCoupomService hotelCoupomService;
+    @Resource
+    public HotelCoupomStatusService hotelCoupomStatusService;
+
+
     public int page; // 当前页
     public int rows;// 每页显示的行数rows
     public Integer id;
@@ -249,6 +255,30 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     book.setUpdateTime(UUIDUtil.getNewDate());
                     book.setOrderStatus("5");
                     msg = "退房";
+
+
+                    //通过订单id找到所属优惠券
+                    List<HotelCouponStatus> hotelCouponStatusList = hotelCoupomStatusService.getBookingId(book.getId()+"");
+                    if (hotelCouponStatusList != null && hotelCouponStatusList.size() > 0) {
+                        System.out.println("进入核销优惠券");
+                        for (HotelCouponStatus hotelCouponStatus : hotelCouponStatusList) {
+                            String complaintId = hotelCouponStatus.getComplaintId();
+                            System.out.println("核销优惠券id:"+complaintId);
+                            HotelCoupon hotelCoupon = hotelCoupomService.getById(complaintId);
+                            if (hotelCoupon!=null) {
+                                Integer reversedNumber = hotelCoupon.getReversedNumber();
+                                if (reversedNumber==null) {
+                                    reversedNumber=0;
+                                }
+                                hotelCoupon.setReversedNumber(reversedNumber+1);
+                                hotelCoupon.setModifyDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                                hotelCoupomService.updatReversedNumber(hotelCoupon);
+                            }
+                        }
+                    }
+
+
+
                     break;
 //                case 4://退单
 //                    if(!"2".equals(book.getOrderStatus())){

mhotel/src/com/happy/dao/impl/HouseNumberImplDao.java

@@ -97,6 +97,7 @@ public class HouseNumberImplDao implements HouseNumberDao {
     }
 
     /**
+     * »ñÈ¡Èëס·¿¼ä
      * ??????
      */
     @Override