From e08db3be0e60a925a0104fe89a88768b74c527f3 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Wed, 30 Jul 2025 01:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95dto=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=9F=E7=94=B5=E5=A5=97=E9=A4=90=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sczx/order/dto/OrderDTO.java               | 4 ++++
 .../java/com/sczx/order/service/impl/OrderServiceImpl.java   | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/sczx/order/dto/OrderDTO.java b/src/main/java/com/sczx/order/dto/OrderDTO.java
index 4f55fe4..72a00e4 100644
--- a/src/main/java/com/sczx/order/dto/OrderDTO.java
+++ b/src/main/java/com/sczx/order/dto/OrderDTO.java
@@ -3,6 +3,7 @@ package com.sczx.order.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sczx.order.thirdpart.dto.CarModelSimpleDTO;
 import com.sczx.order.thirdpart.dto.CompanyStoreDTO;
+import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -118,6 +119,9 @@ public class OrderDTO {
     @ApiModelProperty("租电套餐id")
     private Long rentBatteyRuleId;
 
+    @ApiModelProperty("租电套餐信息")
+    private RentBatteyRuleDTO rentBatteyRule;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;
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 8733dff..d07b5dd 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -172,6 +172,11 @@ public class OrderServiceImpl implements OrderService {
         CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString()));
 
         CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId());
+        RentBatteyRuleDTO rentBatteyRuleDTO = null;
+        if(orderMainPO.getRentBatteyRuleId()!=null){
+            rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
+            orderDTO.setRentBatteyRule(rentBatteyRuleDTO);
+        }
         orderDTO.setCarModelSimpleDTO(carModelSimpleDTO);
         orderDTO.setCompanyStoreDTO(companyStoreDTO);
         LambdaQueryWrapper<OrderSubPO> orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>();