From d74ae44913fe20ed3d802596a01658a5a873c32465e7576e080ed3287cd08759 Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Tue, 27 Jan 2026 16:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operations/model/dto/EbikeScanInfoDto.java | 10 ++++++++++
 .../service/impl/EbikeBikeInfoServiceImpl.java | 18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanInfoDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanInfoDto.java
index 208a3de..b63188f 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanInfoDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanInfoDto.java
@@ -67,6 +67,16 @@ public class EbikeScanInfoDto implements Serializable {
      */
     private Long ecuId;
 
+    /**
+     * 中控SN
+     */
+    private String ecuSn;
+
+    /**
+     * 电量百分比
+     */
+    private Integer soc;
+
     /**
      * 头盔ID
      */
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
index cf9c290..eff0fb6 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
@@ -577,10 +577,24 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
     @Override
     public EbikeScanInfoDto scanInfo(String bikeCode) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .select(EBIKE_BIKE_INFO.ALL_COLUMNS, EBIKE_REGION.REGION_NAME)
+                .select(EBIKE_BIKE_INFO.ALL_COLUMNS, EBIKE_REGION.REGION_NAME, EBIKE_ECU_INFO.ECU_SN)
                 .leftJoin(EBIKE_REGION).on(EBIKE_REGION.REGION_ID.eq(EBIKE_BIKE_INFO.REGION_ID))
+                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
                 .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode));
         EbikeScanInfoDto ebikeScanInfoDto = this.mapper.selectOneByQueryAs(queryWrapper, EbikeScanInfoDto.class);
+        int soc = 0;
+        if (ebikeScanInfoDto != null) {
+            String ecuSn = ebikeScanInfoDto.getEcuSn();
+            if (ecuSn != null) {
+                ResGPSDto resGPSDto = (ResGPSDto) redisUtil.getEcu(ecuSn);
+                if (resGPSDto != null) {
+                    soc = resGPSDto.getSoc();
+                }
+            }
+        } else {
+            throw new EbikeException("车辆编号错误");
+        }
+        ebikeScanInfoDto.setSoc(soc);
         queryWrapper.clear();
         queryWrapper.select(
                         EBIKE_BIKE_ORDER.ORDER_ID,
@@ -598,7 +612,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             for (EbikeScanOrderDto order : list) {
                 if (order.getReceiverId() != null) {
                     order.setAccepted(Boolean.TRUE);
-                    if (order.getReceiverId() == staffId){
+                    if (order.getReceiverId() == staffId) {
                         order.setAcceptSelf(Boolean.TRUE);
                     }
                 }