修改定时任务

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignServiceImpl.java

@@ -275,6 +275,7 @@ public class MarketingCampaignServiceImpl
                     marketingCampaignSopDetailEntity.setName(sopDetailEntity.getName());
                     marketingCampaignSopDetailEntity.setStep(sopDetailEntity.getStep());
                     marketingCampaignSopDetailEntity.setType(sopDetailEntity.getType());
+                    marketingCampaignSopDetailEntity.setDays(sopDetailEntity.getDays());
                     marketingCampaignSopDetailEntity.setEmailContent(sopDetailEntity.getEmailContent());
                     //预留补充ai生成的邮件内容模板
 //                    marketingCampaignSopDetailEntity.setEmailContent();
@@ -347,6 +348,7 @@ public class MarketingCampaignServiceImpl
                     marketingCampaignSopDetailEntity.setName(sopDetailEntity.getName());
                     marketingCampaignSopDetailEntity.setStep(sopDetailEntity.getStep());
                     marketingCampaignSopDetailEntity.setType(sopDetailEntity.getType());
+                    marketingCampaignSopDetailEntity.setDays(sopDetailEntity.getDays());
                     marketingCampaignSopDetailEntity.setEmailContent(sopDetailEntity.getEmailContent());
                     //预留补充ai生成的邮件内容模板
 //                    marketingCampaignSopDetailEntity.setEmailContent();
@@ -404,7 +406,7 @@ public class MarketingCampaignServiceImpl
         List<MarketingCampaignEntity> nonAll = this.lambdaQuery()
                 .eq(MarketingCampaignEntity::getIsDelete, CommonConstant.DEL_FLAG_0)
                 .eq(MarketingCampaignEntity::getStatus, 0)
-                .le(MarketingCampaignEntity::getBeginData, today)
+                .ge(MarketingCampaignEntity::getBeginData, today)
                 .list();
         if (!CollectionUtils.isEmpty(nonAll)) {
             List<Long> startIdList = nonAll.stream().map(MarketingCampaignEntity::getId).collect(Collectors.toList());
@@ -418,7 +420,7 @@ public class MarketingCampaignServiceImpl
         List<MarketingCampaignEntity> stopAll = this.lambdaQuery()
                 .eq(MarketingCampaignEntity::getIsDelete, CommonConstant.DEL_FLAG_0)
                 .eq(MarketingCampaignEntity::getStatus, 1)
-                .ge(MarketingCampaignEntity::getEndDate, today)
+                .le(MarketingCampaignEntity::getEndDate, today)
                 .list();
         if (!CollectionUtils.isEmpty(stopAll)) {
             List<Long> stopIdList = stopAll.stream().map(MarketingCampaignEntity::getId).collect(Collectors.toList());

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/task/MarketStartOrEndTask.java

@@ -18,7 +18,7 @@ public class MarketStartOrEndTask {
     @Resource
     private MarketingCampaignService marketingCampaignService;
 
-    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 50 10 * * ?")
     public void dispatch() {
         long start = System.currentTimeMillis();
         log.info("营销活动开始/结束状态同步任务开始");