Переглянути джерело

修改支付订单优惠券未锁定问题

liu 2 роки тому
батько
коміт
87444c4027

+ 1 - 0
mhotel/src/com/happy/action/AppBookingAction.java

@@ -91,6 +91,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         this.request = request;
     }
 
+    @Override
     public void setServletRequest(HttpServletRequest request) {
         this.request = request;
     }

+ 1 - 1
mhotel/src/com/happy/dao/impl/HotelCoupomStatusImplDao.java

@@ -103,7 +103,7 @@ public class HotelCoupomStatusImplDao implements HotelCoupomStatusDao {
 
     @Override
     public HotelCouponStatus getById(String id) {
-        String sql = "select * from hotel_coupon_status AND id = :id ";
+        String sql = "select * from hotel_coupon_status where id = :id and status=1";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",id);
         List<HotelCouponStatus> list = null;

+ 5 - 5
mhotel/src/com/happy/service/impl/AppBookImplService.java

@@ -97,11 +97,10 @@ public class AppBookImplService implements AppBookService {
 
         if (!Func.checkNull(complaintId) && !Func.checkNull(useId)) {
             HotelCouponStatus hotelCouponStatus = hotelCoupomStatusService.getById(useId);
-            hotelCouponStatus.setStatus(2);
-            hotelCouponStatus.setBookingId(bookingId);
-
-
-            BigDecimal totalPriceBigDecimal = new BigDecimal(totalPrice);
+            if (hotelCouponStatus!=null) {
+                hotelCouponStatus.setStatus(2);
+                hotelCouponStatus.setBookingId(bookingId);
+                BigDecimal totalPriceBigDecimal = new BigDecimal(totalPrice);
 
             //        优惠券
             HotelCoupon hotelCoupon = hotelCoupomService.getById(complaintId);
@@ -153,6 +152,7 @@ public class AppBookImplService implements AppBookService {
 
                 hotelCoupomStatusService.update(hotelCouponStatus);
 
+                }
             }
         }