From a92e296c28d4c09055f53293378da001117ec979 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 02 九月 2024 17:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/schedule/ScheduleService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/schedule/ScheduleService.java b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
index c45f66b..eea6f6f 100644
--- a/src/main/java/com/mzl/flower/schedule/ScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -133,7 +133,12 @@
@Scheduled(cron = "1 20 0/1 * * ?")
public void autoReceive() {
log.info("自动收货开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
- orderService.autoReceive();
+ List<Order> ls = orderService.autoReceive();
+ if(ls != null && ls.size() > 0){
+ for(Order o : ls){
+ orderService.processAfterReceive(o);
+ }
+ }
log.info("自动收货结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
}
@@ -164,6 +169,7 @@
for(Transfer t : ls){
try {
paymentV3Service.checkTransferStatus(t);
+ settlementService.updateSettlementStatus(t.getId());
} catch (Exception e) {
log.error(e.getMessage(), e);
}
--
Gitblit v1.9.3