From 950c082b64e94571c9c959e25e5b19a3e979e705 Mon Sep 17 00:00:00 2001 From: Xue YANG Date: Fri, 9 May 2025 15:41:27 +0200 Subject: [PATCH 1/2] feat: skip recent orders from MabangJob (within 5 min) --- .../java/org/jeecg/modules/business/domain/job/MabangJob.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java index 4323555a7..65d37097e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java @@ -32,13 +32,15 @@ public class MabangJob implements Job { private IPlatformOrderMabangService platformOrderMabangService; private static final Integer DEFAULT_NUMBER_OF_DAYS = 5; + private static final Integer SKIP_RECENT_MINUTES = 5; private static final DateType DEFAULT_DATE_TYPE = DateType.EXPRESS; private static final List DEFAULT_STATUSES = Arrays.asList(AllUnshipped, Shipped, Completed); @Override public void execute(JobExecutionContext context) throws JobExecutionException { - LocalDateTime endDateTime = LocalDateTime.now(ZoneId.of(ZoneId.SHORT_IDS.get("CTT"))); + LocalDateTime endDateTime = LocalDateTime.now(ZoneId.of(ZoneId.SHORT_IDS.get("CTT"))).minusMinutes(SKIP_RECENT_MINUTES); LocalDateTime startDateTime = endDateTime.minusDays(DEFAULT_NUMBER_OF_DAYS); + log.info("抓单时间范围: {} 到 {}", startDateTime, endDateTime); DateType dateType = DEFAULT_DATE_TYPE; boolean overrideRestriction = false; List statuses = DEFAULT_STATUSES; From 724179a9682220b1568331bae45f4c9cc8124f44 Mon Sep 17 00:00:00 2001 From: Xue YANG Date: Fri, 9 May 2025 15:44:12 +0200 Subject: [PATCH 2/2] feat: skip recent orders from MabangJob (within 5 min) --- .../java/org/jeecg/modules/business/domain/job/MabangJob.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java index 65d37097e..8981c1dd0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangJob.java @@ -40,7 +40,6 @@ public class MabangJob implements Job { public void execute(JobExecutionContext context) throws JobExecutionException { LocalDateTime endDateTime = LocalDateTime.now(ZoneId.of(ZoneId.SHORT_IDS.get("CTT"))).minusMinutes(SKIP_RECENT_MINUTES); LocalDateTime startDateTime = endDateTime.minusDays(DEFAULT_NUMBER_OF_DAYS); - log.info("抓单时间范围: {} 到 {}", startDateTime, endDateTime); DateType dateType = DEFAULT_DATE_TYPE; boolean overrideRestriction = false; List statuses = DEFAULT_STATUSES;