处理更新

src/main/java/com/izouma/nineth/service/MintOrderService.java

@@ -708,7 +708,7 @@ public class MintOrderService {
                 mintOrder.setStatus(MintOrderStatus.AIR_DROP);
                 MintActivity mintActivity = mintActivityRepo.findById(mintOrder.getMintActivityId()).orElse(null);
                 if (ObjectUtils.isNotEmpty(mintActivity) && mintActivity.isAutoDrop()) {
-                    if (!mintActivity.isDelay()) {
+//                    if (!mintActivity.isDelay()) {
                         User user = userRepo.findById(mintOrder.getUserId()).orElseThrow(new BusinessException("无用户"));
                         airDropService.create(AirDrop.builder()
                                                      .name("铸造活动[" + mintActivity.getName() + "]空投")
@@ -725,11 +725,11 @@ public class MintOrderService {
                                                      .build());
                         mintOrder.setStatus(MintOrderStatus.FINISH);
                         mintOrderRepo.save(mintOrder);
-                    } else {
-                        mintOrder.setDelay(true);
-                        mintOrder.setAirDropTime(LocalDateTime.now().plusMinutes(mintActivity.getDelayHours()));
-                        mintOrderRepo.save(mintOrder);
-                    }
+//                    } else {
+//                        mintOrder.setDelay(true);
+//                        mintOrder.setAirDropTime(LocalDateTime.now().plusMinutes(mintActivity.getDelayHours()));
+//                        mintOrderRepo.save(mintOrder);
+//                    }
                 }
             } else {
                 mintOrder.setStatus(MintOrderStatus.DELIVERY);
@@ -869,7 +869,7 @@ public class MintOrderService {
         return true;
     }
 
-    @Scheduled(cron = "0 0/5 * * * ?")
+//    @Scheduled(cron = "0 0/5 * * * ?")
     public void airDropDelayedOrder() {
         if (generalProperties.isNotifyServer()) {
             throw new BusinessException("订单服务器不执行");

src/main/java/com/izouma/nineth/web/MintActivityController.java

@@ -100,18 +100,18 @@ public class MintActivityController extends BaseController {
 //            List<Collection> collections = collectionRepo.findByTag(tagId);
 //            if (collections.stream().anyMatch(collection -> collection.getType().equals(CollectionType.BLIND_BOX)))
 //        });
-        try {
-            MintActivityRule mintActivityRule = mintActivity.getRule();
-            List<MintActivityRule> and = mintActivityRule.getAnd();
-            mintActivityRule.setAnd(mintActivityService.mintActivityRules(and, mintActivity.getId()));
-            mintActivity.setRule(mintActivityRule);
-            if (mintActivity.getAirDropCollectionId() != null) {
-                mintActivity.setAirDropCollection(collectionRepo.findById(mintActivity.getAirDropCollectionId())
-                                                                .orElse(null));
-            }
-        } catch (Exception e) {
-            log.error("生成铸造内容出错" + id, e);
-        }
+//        try {
+//            MintActivityRule mintActivityRule = mintActivity.getRule();
+//            List<MintActivityRule> and = mintActivityRule.getAnd();
+//            mintActivityRule.setAnd(mintActivityService.mintActivityRules(and, mintActivity.getId()));
+//            mintActivity.setRule(mintActivityRule);
+//            if (mintActivity.getAirDropCollectionId() != null) {
+//                mintActivity.setAirDropCollection(collectionRepo.findById(mintActivity.getAirDropCollectionId())
+//                                                                .orElse(null));
+//            }
+//        } catch (Exception e) {
+//            log.error("生成铸造内容出错" + id, e);
+//        }
 
         mintActivity.setVTotal(mintActivity.getTotal());
         mintActivity.setTotal(0);