Merge remote-tracking branch 'origin/dev' into dev

service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java

@@ -41,8 +41,13 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService
     public CommonResult<Object> synchronizedAmount(SubAccountsVo subAccountsVo) {
         PayTwoOrder payTwoOrder = new PayTwoOrder();
         //获取同步时间内的历史订单数
-        Integer taoBaoSaleSize = requestCore.getTaoBaoSaleSize(subAccountsVo.getStartTime(), subAccountsVo.getEndTime(), subAccountsVo.getSessionKey());
+        Integer taoBaoSaleSize;
-
+        try {
+            taoBaoSaleSize = requestCore.getTaoBaoSaleSize(subAccountsVo.getStartTime(), subAccountsVo.getEndTime(), subAccountsVo.getSessionKey());
+        } catch (Exception e) {
+            log.error("==========获取淘宝历史订单数错误，{}", e.getMessage());
+            return new CommonResult<>().error("请求错误，检查是否账号过期");
+        }
         double historyAmount = 0.00;
         int day = Math.toIntExact(DateUtil.betweenDay(DateUtil.parse(subAccountsVo.getStartTime()), DateUtil.parse(subAccountsVo.getEndTime()), true));
         int average;

service/trade-service-source/trade-service-source-core/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 200MB #单个文件上传大小

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;
         }
         //一天只发送一次