From b2ea7e7a02d748483402aed491050d42b9f4313f Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Tue, 16 Sep 2025 16:11:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sczx/order/service/impl/OrderServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 55c3bd0..e672f4d 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -691,7 +691,7 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void rejectRentOrder(RejectOrderReq rejectOrderReq) {
         OrderMainPO orderMainPO = queryOrderMainPoByOrderNo(rejectOrderReq.getOrderNo(), "0");
-        if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode())||!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){
+        if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode()) && !orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){
             throw new BizException("订单状态异常,非待取车或待还车状态,无法驳回");
         }
         SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
@@ -730,7 +730,7 @@ public class OrderServiceImpl implements OrderService {
                     }
                 }
             });
-        } else if(orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){
+        } else {
             LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
             updateWrapper.set(OrderMainPO::getActEndRentTime, LocalDateTime.now());

From 1afa9895b0b03fbd6ff8b04bbc99e342dcb3e300 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Tue, 16 Sep 2025 16:22:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E8=AE=A2=E5=8D=95=E7=BC=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
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 | 1 +
 1 file changed, 1 insertion(+)

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 e672f4d..387e903 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -726,6 +726,7 @@ public class OrderServiceImpl implements OrderService {
                         fdSubOrder.setPaymentId(orderSubPO.getPaymentId());
                         fdSubOrder.setRefundId(outRefundNo);
                         fdSubOrder.setRemark(rejectOrderReq.getRejectReason());
+                        fdSubOrder.setCreatedAt(LocalDateTime.now());
                         orderSubRepo.save(fdSubOrder);
                     }
                 }