diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index efb3d43..3ccb26e 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -276,7 +276,7 @@ jarvis: mq-topic: jarvis-goofish-erp-order consumer-group: jarvis-goofish-order-consumer pull-lookback-hours: 72 - pull-cron: "0 0/15 * * * ?" + pull-cron: "0 0/10 * * * ?" auto-ship-cron: "0 2/10 * * * ?" # 订单列表:每页条数(最大 100) pull-page-size: 100 @@ -288,8 +288,8 @@ jarvis: pull-max-update-time-range-seconds: 15552000 # 全量拉单起点:距今多少天(默认约 3 年) pull-full-history-days: 1095 - # 列表拉单是否仅拉 auto-ship-order-statuses(默认待发货);false 时恢复按时间窗全状态(全量回补可临时关闭) - pull-list-only-auto-ship-statuses: true + # true=仅拉 auto-ship-order-statuses(省调用,其它状态依赖推送);false=时间窗内全状态(推荐,与本地对齐) + pull-list-only-auto-ship-statuses: false auto-ship-batch-size: 20 diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/JarvisGoofishProperties.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/JarvisGoofishProperties.java index 9bbfbd2..20ab1ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/JarvisGoofishProperties.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/JarvisGoofishProperties.java @@ -21,7 +21,7 @@ public class JarvisGoofishProperties { private int pullLookbackHours = 72; /** 拉单定时 cron */ - private String pullCron = "0 0/15 * * * ?"; + private String pullCron = "0 0/10 * * * ?"; /** 同步运单 + 自动发货 cron */ private String autoShipCron = "0 2/10 * * * ?"; @@ -59,11 +59,10 @@ public class JarvisGoofishProperties { private String autoShipOrderStatuses = "12"; /** - * 定时/增量「订单列表」拉单是否仅请求 {@link #autoShipOrderStatuses} 中的状态(通常即待发货)。 - * 为 true 时可显著减少列表与后续详情拉取次数;其余状态依赖开放平台推送回调刷新。 - * 全量历史回补若需全状态,可临时设为 false。 + * 为 true 时定时/增量列表拉单仅按 {@link #autoShipOrderStatuses} 过滤(减少调用量,但会漏掉其它状态)。 + * 默认 false:按时间窗拉全状态,与本地 upsert 对齐,推送仍可用于更低延迟。 */ - private boolean pullListOnlyAutoShipStatuses = true; + private boolean pullListOnlyAutoShipStatuses = false; /** * 未在 erp_open_config 配置 express_code 时,自动发货使用的默认快递公司编码(官方列表中日日顺多为 rrs)。 diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/task/GoofishScheduledTasks.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/task/GoofishScheduledTasks.java index 42178b5..888d5dd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/task/GoofishScheduledTasks.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/task/GoofishScheduledTasks.java @@ -29,7 +29,7 @@ public class GoofishScheduledTasks { @Resource private JarvisGoofishProperties goofishProperties; - @Scheduled(cron = "${jarvis.goofish-order.pull-cron:0 0/15 * * * ?}") + @Scheduled(cron = "${jarvis.goofish-order.pull-cron:0 0/10 * * * ?}") public void scheduledPull() { List cfgs = erpOpenConfigService.selectEnabledOrderBySort(); if (cfgs == null || cfgs.isEmpty()) {