From 2a5625fc9461770263876f34d428c48aed2f2bc6 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Tue, 23 Nov 2021 13:51:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hchbox/job/ObtainInfoExportDelJob.java | 2 +- .../src/main/java/com/hchbox/job/ObtainInfoJob.java | 2 +- .../hchbox/module/service/impl/TimerTaskServiceImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java index ec08d74..95deb5a 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java +++ b/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(); } } diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java index 2beb3f2..3b20ed5 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java +++ b/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(); } } diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java index e15788a..d9baf5d 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java +++ b/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 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 tradeList, SendTemplate template, SellerAccount sellerAccount, AppSetting as, List 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 list, AppSetting as, Integer settingType) { - if (CollUtil.isNotEmpty(list)) { + if (CollUtil.isEmpty(list)) { return; } //一天只发送一次 From 5ca53239c7476bd496cc3707047391dfc47613eb Mon Sep 17 00:00:00 2001 From: wujingtao Date: Tue, 23 Nov 2021 13:57:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SynchronizedAmountServiceImpl.java | 9 +++++++-- .../src/main/resources/application.yml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java index 33fc209..ec78a73 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java +++ b/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 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; diff --git a/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml b/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml index 768eba6..05b888b 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml +++ b/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 #单个文件上传大小