From 7751595742977b2c9bd1396e1354cb5e2cf9cc86 Mon Sep 17 00:00:00 2001
From: eric <465889110@qq.com>
Date: Mon, 29 Sep 2025 14:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E7=94=B5=E5=AD=90=E8=AE=A2=E5=8D=95re?=
 =?UTF-8?q?turntime?=
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, 3 insertions(+)

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 07306ff..8d0c59a 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -182,6 +182,7 @@ public class OrderServiceImpl implements OrderService {
                         depositOrder.setAmount(rentBatteyRuleDTO.getRentPrice());
                         depositOrder.setCreatedAt(LocalDateTime.now());
                         depositOrder.setPaymentMethod(paymentType);
+                        depositOrder.setReturnTime(endRentTime);
                         orderSubPOList.add(depositOrder);
                     }
                     //生成租车订单
@@ -331,6 +332,7 @@ public class OrderServiceImpl implements OrderService {
                     rentBatteyRuleOrder.setPaymentMethod(paymentType);
                     rentBatteyRuleOrder.setPayStatus(PayStatusEnum.INIT.getCode());
                     rentBatteyRuleOrder.setPaymentId(paymentId);
+                    rentBatteyRuleOrder.setReturnTime(endRentTime);
                     orderSubPOList.add(rentBatteyRuleOrder);
                 }
                 //生成租车订单
@@ -530,6 +532,7 @@ public class OrderServiceImpl implements OrderService {
                     rentBatraayOrder.setCreatedAt(LocalDateTime.now());
                     rentBatraayOrder.setPaymentMethod(paymentType);
                     rentBatraayOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode());
+                    rentBatraayOrder.setReturnTime(newEndRentTime);
                     orderSubRepo.save(rentBatraayOrder);
                 }