From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2
---
src/main/java/com/mzl/flower/schedule/ScheduleService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/schedule/ScheduleService.java b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
index 765abb7..1cf50e6 100644
--- a/src/main/java/com/mzl/flower/schedule/ScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -46,6 +46,9 @@
private UserPaymentV3Service paymentV3Service;
@Autowired
+ private UserPaymentSybService paymentSybService;
+
+ @Autowired
private OrderService orderService;
@Autowired
@@ -114,10 +117,11 @@
try {
LocalDateTime createdTime = o.getCreateTime().plusMinutes(5);
if (createdTime.isBefore(LocalDateTime.now())) {
- boolean f = paymentV3Service.checkOrderStatus(o.getId());
+ /*boolean f = paymentV3Service.checkOrderStatus(o.getId());
if(!f){
paymentV3Service.cancelOrder(o.getId());
- }
+ }*/
+ paymentSybService.cancelOrder(o.getId());
}
} catch (Exception e) {
log.error(e.getMessage(), e);
--
Gitblit v1.9.3