From 831b4f19630899916fb758977832f7732e7a740dbba11f0d401f08bb3d2e44df Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Mon, 8 Dec 2025 17:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E6=B1=A0=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/dto/EbikeOrderBikeInfoDto.java       | 10 ++++++++++
 .../impl/EbikeBikeOrderServiceImpl.java        | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
index 30d948a..6b326f3 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeInfoDto.java
@@ -37,6 +37,11 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private Long bikeInfoId;
 
+    /**
+     * 电池ID
+     */
+    private Long batteryId;
+
     /**
      * 定位
      */
@@ -121,6 +126,11 @@ public class EbikeOrderBikeInfoDto implements Serializable {
      */
     private String ecuSn;
 
+    /**
+     * 电池编号
+     */
+    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 e4b4154..0c2a022 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
@@ -91,6 +91,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Resource
     private EbikeBikeOrderMapper ebikeBikeOrderMapper;
 
+    @Resource
+    private EbikeBatteryInfoMapper ebikeBatteryInfoMapper;
+
     @Override
     public void createBatterySwapOrder(String ecuSn) {
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -388,7 +391,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Override
     public EbikeOrderBikeInfoDto bikeInfo(String bikeCode,Integer orderType) throws IOException {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .select(EBIKE_BIKE_INFO.BIKE_INFO_ID, EBIKE_BIKE_INFO.LOCATION, EBIKE_BIKE_INFO.USAGE_STATUS, EBIKE_BIKE_INFO.LATEST_CYCLING_TIME, EBIKE_ECU_INFO.ECU_SN)
+                .select(EBIKE_BIKE_INFO.BIKE_INFO_ID, EBIKE_BIKE_INFO.BATTERY_ID,EBIKE_BIKE_INFO.LOCATION, EBIKE_BIKE_INFO.USAGE_STATUS, EBIKE_BIKE_INFO.LATEST_CYCLING_TIME, EBIKE_ECU_INFO.ECU_SN)
                 .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode))
                 .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
         if (orderType != null) {
@@ -401,6 +404,19 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         if (bikeInfo == null) {
             throw new EbikeException("车辆编号错误");
         }
+        queryWrapper.clear();
+        queryWrapper.where(EBIKE_ECU_INFO.ECU_SN.eq(bikeInfo.getEcuSn()));
+        EbikeEcuInfo ecuInfo = ebikeEcuInfoMapper.selectOneByQuery(queryWrapper);
+        if (ecuInfo.getBindBattery()){
+            bikeInfo.setBatteryCode(ecuInfo.getEcuSn());
+        }else {
+            queryWrapper.clear();
+            queryWrapper.where(EBIKE_BATTERY_INFO.BATTERY_ID.eq(bikeInfo.getBatteryId()));
+            EbikeBatteryInfo batteryInfo = ebikeBatteryInfoMapper.selectOneByQuery(queryWrapper);
+            if (batteryInfo != null) {
+                bikeInfo.setBatteryCode(batteryInfo.getBatteryCode());
+            }
+        }
         ResGPSDto resGPSDto = (ResGPSDto) redisUtil.getEcu(bikeInfo.getEcuSn());
         bikeInfo.setSoc(resGPSDto.getSoc());
         BigDecimal result = new BigDecimal(resGPSDto.getVoltage())