Merge branch 'master_delay' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/dto/nftdomain/CreateCollection.java

@@ -11,7 +11,7 @@ import lombok.Data;
 public class CreateCollection {
     Long   id;
     int    num;
-    double delayHours;
-    int    minutes;
+    int    delayHours;
+//    int    minutes;
     double delayTime;
 }

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

@@ -734,7 +734,7 @@ public class MintOrderService {
                                                          .build());
 //                            mintOrder.setStatus(MintOrderStatus.FINISH);
                         } else {
-                            LocalDateTime dropTime = LocalDateTime.now().plusMinutes(collection.getDelayHours());
+                            LocalDateTime dropTime = LocalDateTime.now().plusHours(collection.getDelayHours());
                             if (mintOrder.getAirDropTime() == null) {
                                 mintOrder.setAirDropTime(dropTime);
                             } else {
@@ -934,7 +934,7 @@ public class MintOrderService {
 //                                mintOrder.setStatus(MintOrderStatus.FINISH);
 //                                mintOrderRepo.save(mintOrder);
                             } else {
-                                LocalDateTime dropTime = LocalDateTime.now().plusMinutes(collection.getDelayHours());
+                                LocalDateTime dropTime = LocalDateTime.now().plusHours(collection.getDelayHours());
                                 if (mintOrder.getAirDropTime() == null) {
                                     mintOrder.setAirDropTime(dropTime);
                                 } else {

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

@@ -45,14 +45,14 @@ public class MintActivityController extends BaseController {
     @PostMapping("/save")
     public MintActivity save(@RequestBody MintActivity record) {
         if (record.getRule() != null) mintActivityService.checkRule(record.getRule());
-        List<CreateCollection> createCollections = new ArrayList<>();
-        record.getTargetCollectionIds().forEach(collection -> {
-            double hour = collection.getDelayHours();
-            int minutes = (int) (hour * 60);
-            collection.setMinutes(minutes);
-            createCollections.add(collection);
-        });
-        record.setTargetCollectionIds(createCollections);
+//        List<CreateCollection> createCollections = new ArrayList<>();
+//        record.getTargetCollectionIds().forEach(collection -> {
+//            double hour = collection.getDelayHours();
+//            int minutes = (int) (hour * 60);
+////            collection.setMinutes(minutes);
+//            createCollections.add(collection);
+//        });
+//        record.setTargetCollectionIds(createCollections);
         if (record.getId() != null) {
             MintActivity orig = mintActivityRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             orig.setName(record.getName());