From 0963f4468841d919cd59ca3a2bc6201071bcaae667a6584c62ef9fa0aaa97b6d Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Tue, 13 Jan 2026 11:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=B5=E6=B1=A0=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cdzy/operations/model/dto/EbikeBikeOrderInfoDto.java | 5 +++++
 .../operations/service/impl/EbikeBikeOrderServiceImpl.java   | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderInfoDto.java
index 3c4cf16..ef2bfa5 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderInfoDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeBikeOrderInfoDto.java
@@ -82,6 +82,11 @@ public class EbikeBikeOrderInfoDto implements Serializable {
      */
     private Integer handleState;
 
+    /**
+     * 电池编号
+     */
+    private String batteryCode;
+
     /**
      * 故障部位
      */
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
index 0dec82e..a8e4436 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
@@ -215,10 +215,11 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Override
     public EbikeBikeOrderInfoDto getInfo(Long orderId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .select(EBIKE_BIKE_INFO.LOCATION, EBIKE_BIKE_ORDER.ORDER_ID, EBIKE_BIKE_ORDER.ORDER_TYPE, EBIKE_BIKE_ORDER.BIKE_CODE, EBIKE_BIKE_ORDER.REMARKS, EBIKE_BIKE_ORDER.CREATED_AT, EBIKE_BIKE_ORDER.REMARKS, EBIKE_ECU_INFO.ECU_SN, EBIKE_BIKE_ORDER.HANDLE_STATE)
+                .select(EBIKE_BIKE_INFO.LOCATION, EBIKE_BIKE_ORDER.ORDER_ID, EBIKE_BIKE_ORDER.ORDER_TYPE, EBIKE_BIKE_ORDER.BIKE_CODE, EBIKE_BIKE_ORDER.REMARKS, EBIKE_BIKE_ORDER.CREATED_AT, EBIKE_BIKE_ORDER.REMARKS, EBIKE_ECU_INFO.ECU_SN, EBIKE_BIKE_ORDER.HANDLE_STATE, EBIKE_BATTERY_INFO.BATTERY_CODE)
                 .where(EBIKE_BIKE_ORDER.ORDER_ID.eq(orderId))
                 .leftJoin(EBIKE_BIKE_INFO).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_BIKE_ORDER.BIKE_CODE))
-                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
+                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
+                .leftJoin(EBIKE_BATTERY_INFO).on(EBIKE_BIKE_INFO.BATTERY_ID.eq(EBIKE_BATTERY_INFO.BATTERY_ID));
         EbikeBikeOrderInfoDto infoDto = this.mapper.selectOneWithRelationsByQueryAs(queryWrapper, EbikeBikeOrderInfoDto.class);
         ResGPSDto resGPSDto = (ResGPSDto) redisUtil.getEcu(infoDto.getEcuSn());
         if (Objects.nonNull(resGPSDto)) {