From b4a37065c56251d13013e73663ff3e660eab2344 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Mon, 22 Sep 2025 02:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E8=BD=A6=E6=97=B6=E9=97=B4=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sczx/order/service/impl/OrderServiceImpl.java     | 3 ++-
 1 file changed, 2 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 35853c0..c9d7384 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -199,6 +199,7 @@ public class OrderServiceImpl implements OrderService {
                     rentOrder.setAmount(rentCarOrderAmount);
                     rentOrder.setCreatedAt(LocalDateTime.now());
                     rentOrder.setPaymentMethod(paymentType);
+                    rentOrder.setReturnTime(endRentTime);
                     orderSubPOList.add(rentOrder);
 
                     BigDecimal orderAmount = orderSubPOList.stream().map(OrderSubPO::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1221,7 +1222,7 @@ public class OrderServiceImpl implements OrderService {
             BigDecimal rentCarOrderAmount = orderSubList.stream().map(OrderSubPO::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
             updateWrapper2.set(OrderMainPO::getOrderAmount, orderMainPO.getOrderAmount().add(rentCarOrderAmount));
             if(rentSubPO!=null){
-                updateWrapper2.set(OrderMainPO::getEndRentTime, rentSubPO.getReturnTime());
+                updateWrapper2.set(rentSubPO.getReturnTime()!=null,OrderMainPO::getEndRentTime, rentSubPO.getReturnTime());
             }
             updateWrapper2.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
             if(orderMainPO.getOverdueDays()>0){