From 26ad539120876a7f94001505e4062de7af0758a9 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Sun, 7 Sep 2025 21:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=AD=90=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java | 2 ++ src/main/java/com/sczx/order/task/NoPayOrderProcessTask.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index cf8c912..11f5f65 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -741,6 +741,7 @@ public class OrderServiceImpl implements OrderService { fdSubOrder.setAmount(orderMainPO.getOrderAmount()); fdSubOrder.setPaymentMethod(orderSubPO.getPaymentMethod()); fdSubOrder.setPayStatus(PayStatusEnum.REFUNDING.getCode()); + fdSubOrder.setPaymentId(orderSubPO.getPaymentId()); fdSubOrder.setRefundId(outRefundNo); fdSubOrder.setRemark(rejectOrderReq.getRejectReason()); orderSubRepo.save(fdSubOrder); @@ -1008,6 +1009,7 @@ public class OrderServiceImpl implements OrderService { fdSubOrder.setPaymentMethod(orderSubPO.getPaymentMethod()); fdSubOrder.setPayStatus(PayStatusEnum.REFUNDING.getCode()); fdSubOrder.setRefundId(outRefundNo); + fdSubOrder.setPaymentId(orderSubPO.getPaymentId()); fdSubOrder.setCreatedAt(LocalDateTime.now()); orderSubRepo.save(fdSubOrder); } diff --git a/src/main/java/com/sczx/order/task/NoPayOrderProcessTask.java b/src/main/java/com/sczx/order/task/NoPayOrderProcessTask.java index 290a4d7..e6abf3e 100644 --- a/src/main/java/com/sczx/order/task/NoPayOrderProcessTask.java +++ b/src/main/java/com/sczx/order/task/NoPayOrderProcessTask.java @@ -64,7 +64,7 @@ public class NoPayOrderProcessTask { try { // 查询所有进行中的订单且当前时间已超过预计还车时间 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(OrderMainPO::getOrderStatus, + queryWrapper.eq(OrderMainPO::getDelFlag, "0").in(OrderMainPO::getOrderStatus, Arrays.asList(OrderStatusEnum.WAIT_PAY.getCode(), OrderStatusEnum.RERENT_WAIT_PAY.getCode())) .lt(OrderMainPO::getUpdateTime, LocalDateTime.now().minusHours(1)); -- 2.49.0