定时任务修改

service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java

@@ -36,6 +36,6 @@ public class ObtainInfoExportDelJob implements SimpleJob {
     @Override
     public void execute(ShardingContext shardingContext) {
         log.info("===============ObtainInfoExportDelJob备份数据到本地开始,{}================", DateUtil.date());
-        obtainInfoExportDelJob.obtainInfoService.selectExportDel();
+//        obtainInfoExportDelJob.obtainInfoService.selectExportDel();
     }
 }

service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java

@@ -35,6 +35,6 @@ public class ObtainInfoJob implements SimpleJob {
     @Override
     public void execute(ShardingContext shardingContext) {
         log.info("===============ObtainInfoJob同步前一天数据开始,{}================", DateUtil.date());
-        obtainInfoJob.obtainInfoService.selectAllSave();
+//        obtainInfoJob.obtainInfoService.selectAllSave();
     }
 }

service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java

@@ -80,7 +80,7 @@ public class TimerTaskServiceImpl implements TimerTaskService {
             as.setSellerNick(sellerNick);
             List<TopTrade> list = tradeJpa.getConfirmReceipt(as, tradeStatus);
             if (CollUtil.isEmpty(list)) {
-                log.info("======================卖家:{},在 {} 未查询到可发送的 {} 订单==============", sellerNick, DateUtil.now(), settingType);
+                log.info("======================卖家:{},在 {} 未查询到可发送的 {} 订单==============", sellerNick, DateUtil.now(), AppSettingTypeEnum.valueOf(settingType));
                 continue;
             }
             //过滤黑名单
@@ -105,7 +105,7 @@ public class TimerTaskServiceImpl implements TimerTaskService {
     public void deduct(List<TopTrade> tradeList, SendTemplate template, SellerAccount sellerAccount, AppSetting as, List<String> subNickList) {
         for (TopTrade info : tradeList) {
             String templateStr;
-            if (ObjectUtil.isEmpty(template)||StrUtil.isBlank(template.getContent())) {
+            if (ObjectUtil.isEmpty(template) || StrUtil.isBlank(template.getContent())) {
                 templateStr = RemindTemplates.initShopTitle(as.getMemoContent(), sellerAccount.getShopTitle());
             } else {
                 templateStr = RemindTemplates.initShopTitle(template.getContent(), sellerAccount.getShopTitle());
@@ -129,7 +129,7 @@ public class TimerTaskServiceImpl implements TimerTaskService {
     }
 
     private void conditionFilter(List<TopTrade> list, AppSetting as, Integer settingType) {
-        if (CollUtil.isNotEmpty(list)) {
+        if (CollUtil.isEmpty(list)) {
             return;
         }
         //一天只发送一次