修改重新验卷自动任务

share-quartz/src/main/java/share/quartz/task/CouponRetryTask.java

@@ -37,6 +37,19 @@ public class CouponRetryTask {
     private static final Integer TRY_NUMBER = 3;
 
     public void AuToRetryCoupon() {
+        LambdaQueryWrapper<SConsumerCoupon> consumerCouponWrapper = new LambdaQueryWrapper<>();
+        consumerCouponWrapper.eq(SConsumerCoupon::getUseStatus, UserStatusEnum.UNUSED.getCode());
+        List<SConsumerCoupon> sConsumerCoupons = sConsumerCouponService.list(consumerCouponWrapper);
+        List<SConsumerCoupon> expiredSConsumerCounpons = Optional.ofNullable(sConsumerCoupons).orElse(new ArrayList<>()).stream().filter(item -> {
+            if (item.getEndDate().compareTo(new Date()) < 0) {
+                item.setUseStatus(UserStatusEnum.EXPIRED.getCode());
+                return true;
+            }
+            return false;
+        }).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(expiredSConsumerCounpons)) {
+            sConsumerCouponService.updateBatchById(expiredSConsumerCounpons);
+        }
         LambdaQueryWrapper<CouponLog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CouponLog::getStatus, YesNoEnum.no.getDisplay_3());
         queryWrapper.eq(CouponLog::getNumber, TRY_NUMBER);
@@ -77,18 +90,6 @@ public class CouponRetryTask {
                 sConsumerCouponService.updateById(sConsumerCoupon);
             }
         });
-        LambdaQueryWrapper<SConsumerCoupon> consumerCouponWrapper = new LambdaQueryWrapper<>();
-        consumerCouponWrapper.eq(SConsumerCoupon::getUseStatus,UserStatusEnum.UNUSED.getCode());
-        List<SConsumerCoupon> sConsumerCoupons = sConsumerCouponService.list(consumerCouponWrapper);
-        List<SConsumerCoupon> expiredSConsumerCounpons = Optional.ofNullable(sConsumerCoupons).orElse(new ArrayList<>()).stream().filter(item -> {
-            if(item.getEndDate().compareTo(new Date()) < 0){
-                item.setUseStatus(UserStatusEnum.EXPIRED.getCode());
-                return true;
-            }
-            return false;
-        }).collect(Collectors.toList());
-        if(!CollectionUtils.isEmpty(expiredSConsumerCounpons)){
-            sConsumerCouponService.updateBatchById(expiredSConsumerCounpons);
-        }
+
     }
 }