bugfix:使用时间验证先回滚

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -20,7 +20,6 @@ import shop.alien.mapper.*;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.LifeCouponService;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
-import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 import shop.alien.util.common.constant.OrderStatusEnum;
 
@@ -451,25 +450,6 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
     public R<String> orderVerify(String orderCode) {
         OrderCouponMiddle orderCouponMiddle = orderCouponMiddleMapper.selectOne(new LambdaQueryWrapper<OrderCouponMiddle>().eq(OrderCouponMiddle::getCouponCode, orderCode));
         if (!StringUtils.isEmpty(orderCouponMiddle) && orderCouponMiddle.getStatus() == 1) {
-            LifeCoupon lifeCoupon = lifeCouponMapper.selectOne(new LambdaQueryWrapper<LifeCoupon>().eq(LifeCoupon::getId, orderCouponMiddle.getCouponId()));
-            //有效期到
-            Date date = DateUtils.calcDays(orderCouponMiddle.getCreatedTime(), lifeCoupon.getExpirationDate());
-            //开始时间段
-            int beginUseTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
-            //结束时间段
-            int endUseTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());
-            if (new Date().after(date)) {
-                return R.fail("该劵已过期");
-            }
-            if (endUseTime < beginUseTime) {
-                if (!(LocalDateTime.now().getHour() >= beginUseTime || LocalDateTime.now().getHour() < endUseTime)) {
-                    return R.fail("该劵未到使用时间");
-                }
-            } else if (endUseTime > beginUseTime) {
-                if (LocalDateTime.now().getHour() < beginUseTime || LocalDateTime.now().getHour() >= endUseTime) {
-                    return R.fail("该劵未到使用时间");
-                }
-            }
             LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserOrder>().eq(LifeUserOrder::getId, orderCouponMiddle.getOrderId()));
             //类型为:1 代金券订单
             if (lifeUserOrder.getCouponType() == 1) {
@@ -641,6 +621,24 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
                 return R.fail("该劵在不可用日期内");
             }
         }
+    /*    //有效期到
+        Date date = DateUtils.calcDays(orderCouponMiddle.getCreatedTime(), lifeCoupon.getExpirationDate());
+        //开始时间段
+        int beginUseTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
+        //结束时间段
+        int endUseTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());
+        if (new Date().after(date)) {
+            return R.fail("该劵已过期");
+        }
+        if (endUseTime < beginUseTime) {
+            if (!(LocalDateTime.now().getHour() >= beginUseTime || LocalDateTime.now().getHour() < endUseTime)) {
+                return R.fail("该劵未到使用时间");
+            }
+        } else if (endUseTime > beginUseTime) {
+            if (LocalDateTime.now().getHour() < beginUseTime || LocalDateTime.now().getHour() >= endUseTime) {
+                return R.fail("该劵未到使用时间");
+            }
+        }*/
         // 判断是否在使用时间内
         Integer buyUseStartTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
         Integer buyUseEndTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());