From 2b250068cf5c4a73877993c3f41655b272ac2dba Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Fri, 19 Sep 2025 00:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=A7=9F=E7=94=B5=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7?=
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 d486b27..cc9abec 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -589,6 +589,7 @@ public class OrderServiceImpl implements OrderService {
         if(!CollectionUtils.isEmpty(orderSubPOList2)){
             orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId());
             orderDetailDTO.setPayOrderDTOList(OrderSubConvert.INSTANCE.posToPayOrderDtos(orderSubPOList2));
+            orderDetailDTO.setRentBatteyOrderNo(orderSubPOList2.stream().filter(orderSubPO -> StringUtils.equalsIgnoreCase(orderSubPO.getSuborderType(), SubOrderTypeEnum.RENTBATTEY.getCode())).findFirst().map(OrderSubPO::getSuborderNo).orElse( null));
         }
         //计算续租金额
         BigDecimal reRentCarAmount = getReRentCarAmount(orderMainPO.getEndRentTime(), orderMainPO.getRentalType(), orderMainPO.getRentalPrice(), orderMainPO.getRentalDays());