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){