From bbec49a4032ec56fb2833b46524a918b50875627 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 31 Dec 2022 17:30:50 +0800 Subject: [PATCH] //schedule --- .../main/java/com/iformall/schedule/InvestSchedule.java | 8 ++++---- .../com/iformall/schedule/OrderRefundAuditSchedule.java | 2 +- .../com/iformall/schedule/PowerBillAutoBuildSchedule.java | 4 ++-- .../com/iformall/schedule/SharingOrderRedoSchedule.java | 4 ++-- .../com/iformall/schedule/SharingOrderResultSchedule.java | 4 ++-- .../com/iformall/schedule/TtMerchantReciverSchedule.java | 2 +- .../java/com/iformall/schedule/WxCUserTagsSchedule.java | 2 +- .../java/com/iformall/schedule/WxMsgModelSchedule.java | 4 ++-- .../pay/service/share/wx/v3/WxPayShareV3Service.java | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 61449f833..11fe0d039 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -60,8 +60,8 @@ public class InvestSchedule { private static final String TAG_REMIND = "招商定时任务-提醒"; - @Async - @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 +// @Async +// @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 //@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 public void messageSchedule() { log.info("{}: 开始", TAG_MESSAGE); @@ -72,8 +72,8 @@ public class InvestSchedule { log.info("{}: 结束", TAG_MESSAGE); } - @Async - @Scheduled(cron = "0 */5 * * * *?") +// @Async +// @Scheduled(cron = "0 */5 * * * *?") public void remindSchedule() { log.info("{}: 开始", TAG_REMIND); // 提醒新 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java index 83b1a79fa..a2bc38e01 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java @@ -42,7 +42,7 @@ public class OrderRefundAuditSchedule { MaUtil maUtil; - @Scheduled(cron = "0 */5 * * * ?")// + @Scheduled(cron = "0 0 */1 * * ?")// //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void orderQueryRefund() { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 5eefd5672..9d6de280e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -61,8 +61,8 @@ public class PowerBillAutoBuildSchedule { /** * 每天5点执行 */ - @Async - @Scheduled(cron = "0 0 5 * * ?") +// @Async +// @Scheduled(cron = "0 0 5 * * ?") public void powerBillAutoConfigStart() { logger.info("自动生成电费账单开始...."); int dayOfMonth = LocalDate.now().getDayOfMonth(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java index 095de9480..8b9478372 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -48,8 +48,8 @@ public class SharingOrderRedoSchedule { } @Async -// @Scheduled(cron = "0 0 2 * * ?") // 每天凌晨02:00分账重试 - @Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟 + @Scheduled(cron = "0 15 2 * * ?") // 每天凌晨02:00分账重试 +// @Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟 // @Scheduled(cron = "0 0/10 * * * ?") // 测试 public void sharingOrderRedoSchedule() { List malls = getMalls(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index 44aa62f43..c6972f08c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -35,8 +35,8 @@ public class SharingOrderResultSchedule { } @Async -// @Scheduled(cron = "0 0 3 * * ?") // 每天凌晨3:00更新分账结果 - @Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟 + @Scheduled(cron = "0 15 3 * * ?") // 每天凌晨3:00更新分账结果 +// @Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟 // @Scheduled(cron = "* */15 * * * ?") // 测试10秒中一次 public void sharingOrderResultSchedule() { List malls = getMalls(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java index 3e36eddfb..d1046251c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java @@ -42,7 +42,7 @@ public class TtMerchantReciverSchedule { /** * 每半小时 */ - @Scheduled(cron = "0 */30 * * * ?") + @Scheduled(cron = "0 33 */1 * * ?") // @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行 public void updateMerchantReciverSchedule() { List ttAppInfos = getTTAppInfos(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java index ba5a76232..0b96e3975 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java @@ -38,7 +38,7 @@ public class WxCUserTagsSchedule { @Async // TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100% //@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签 - @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次 +// @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次 public void wxCUserTagsSchedule() { WxMall wxMall = new WxMall(); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java index 878a8bcce..e3484125a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java @@ -46,7 +46,7 @@ public class WxMsgModelSchedule { WxMsgConfigMapper wxMsgConfigMapper; @Async - @Scheduled(cron = "0 0 */1 * * ?") // + @Scheduled(cron = "0 25 */2 * * ?") // public void querySmsTemplate() { WxMsgModel msgModel = new WxMsgModel(); msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode()); @@ -91,7 +91,7 @@ public class WxMsgModelSchedule { } @Async - @Scheduled(cron = "30 */10 * * * ?") // + @Scheduled(cron = "0 20 */2 * * ?") // public void querySendDetails() { WxMsgCallback msgCallback = new WxMsgCallback(); msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java index 1cc113fc1..6543678b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java @@ -208,8 +208,8 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{ } String out_order_no = result.getString("out_order_no"); - if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getId().toString())){ - throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getId()+"]"); + if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getOrderId().toString())){ + throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getOrderId()+"]"); } return new PayShareQueryResult(true, 200, "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers")))); }