Browse Source

定时任务执行优化

ouyang 3 years ago
parent
commit
790a1f6e8f

+ 4 - 4
src/main/java/com/izouma/nineth/service/scheduledTask/SubscribeTask.java

@@ -38,7 +38,7 @@ public class SubscribeTask {
                 .findAllByStartTimeGreaterThanAndStartTimeLessThanEqual(startTime, endTime);
                 .findAllByStartTimeGreaterThanAndStartTimeLessThanEqual(startTime, endTime);
         if (!Collections.isEmpty(ongoingList)) {
         if (!Collections.isEmpty(ongoingList)) {
             for (Collection collection : ongoingList) {
             for (Collection collection : ongoingList) {
-                if (collection.getStartTime().isAfter(startTime)) {
+                if (collection.getStartTime().isAfter(startTime) && !collection.getSubscribeStatus().equals(SubscribeStatus.ONGOING)) {
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ONGOING);
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ONGOING);
                 }
                 }
             }
             }
@@ -47,7 +47,7 @@ public class SubscribeTask {
                 .findAllByEndTimeGreaterThanAndEndTimeLessThanEqual(startTime, endTime);
                 .findAllByEndTimeGreaterThanAndEndTimeLessThanEqual(startTime, endTime);
         if (!Collections.isEmpty(subscribeEndingList)) {
         if (!Collections.isEmpty(subscribeEndingList)) {
             for (Collection collection : subscribeEndingList) {
             for (Collection collection : subscribeEndingList) {
-                if (collection.getEndTime().isAfter(startTime)) {
+                if (collection.getEndTime().isAfter(startTime) && !collection.getSubscribeStatus().equals(SubscribeStatus.SUBSCRIBE_ENDING)) {
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.SUBSCRIBE_ENDING);
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.SUBSCRIBE_ENDING);
                 }
                 }
             }
             }
@@ -84,7 +84,7 @@ public class SubscribeTask {
                 .findAllByPublishTimeGreaterThanAndPublishTimeLessThanEqual(startTime, endTime);
                 .findAllByPublishTimeGreaterThanAndPublishTimeLessThanEqual(startTime, endTime);
         if (!Collections.isEmpty(announcingList)) {
         if (!Collections.isEmpty(announcingList)) {
             for (Collection collection : announcingList) {
             for (Collection collection : announcingList) {
-                if (collection.getPublishTime().isAfter(startTime)) {
+                if (collection.getPublishTime().isAfter(startTime) && !collection.getSubscribeStatus().equals(SubscribeStatus.ANNOUNCING)) {
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ANNOUNCING);
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ANNOUNCING);
                 }
                 }
             }
             }
@@ -93,7 +93,7 @@ public class SubscribeTask {
                 .findAllByPurchaseTimeGreaterThanAndPurchaseTimeLessThanEqual(startTime, endTime);
                 .findAllByPurchaseTimeGreaterThanAndPurchaseTimeLessThanEqual(startTime, endTime);
         if (!Collections.isEmpty(onSaleList)) {
         if (!Collections.isEmpty(onSaleList)) {
             for (Collection collection : onSaleList) {
             for (Collection collection : onSaleList) {
-                if (collection.getPurchaseTime().isAfter(startTime)) {
+                if (collection.getPurchaseTime().isAfter(startTime) && !collection.getSubscribeStatus().equals(SubscribeStatus.ON_SALE)) {
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ON_SALE);
                     collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ON_SALE);
                 }
                 }
             }
             }