From 3df6c925ea3384ca268b842c4931464528b3d90951db14934f395368f9bc0137 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 6 Mar 2026 09:20:19 +0800
Subject: [PATCH] =?UTF-8?q?redis=E6=96=B0=E5=A2=9Eecu=5Fsn=E7=9A=84?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeBikeInfoServiceImpl.java   | 16 ++++++++--------
 .../service/impl/EbikeBikeOrderServiceImpl.java  | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

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 6691d5d..14d6d7d 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
@@ -570,13 +570,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
 
     @Override
     public void changeEcu(String bikeCode, String ecuSn) {
-        // 获取旧的ecu_sn
-        QueryWrapper query = QueryWrapper.create()
-                .select(EBIKE_ECU_INFO.ECU_SN)
-                .from(EBIKE_BIKE_INFO)
-                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_BIKE_INFO.ECU_ID.eq(EBIKE_ECU_INFO.ECU_ID))
-                .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode));
-        String oldEcuSn = this.mapper.selectOneByQueryAs(query, String.class);
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_ECU_INFO.ECU_SN.eq(ecuSn));
         EbikeEcuInfo ebikeEcuInfo = ebikeEcuInfoService.getOne(queryWrapper);
@@ -599,12 +592,19 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         if (bikeInfo.getUsageStatus() == BikeUsageStatus.CYCLING) {
             throw new EbikeException("车辆骑行中暂时无法换绑");
         }
-        updateById(bikeInfo);
         // 车辆上架,删除旧ecu_sn,保存新的ecu_sn
         if (bikeInfo.getStatus() == 1) {
+            // 获取旧的ecu_sn
+            QueryWrapper query = QueryWrapper.create()
+                    .select(EBIKE_ECU_INFO.ECU_SN)
+                    .from(EBIKE_BIKE_INFO)
+                    .leftJoin(EBIKE_ECU_INFO).on(EBIKE_BIKE_INFO.ECU_ID.eq(EBIKE_ECU_INFO.ECU_ID))
+                    .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode));
+            String oldEcuSn = this.mapper.selectOneByQueryAs(query, String.class);
             redisUtil.deleteEcuSnRegionId(oldEcuSn);
             redisUtil.saveEcuSnRegionId(ecuSn, bikeInfo.getRegionId());
         }
+        updateById(bikeInfo);
     }
 
     @Override
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 e39806e..b181fac 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
@@ -401,13 +401,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
 
     @Override
     public void batteryChange(EbikeBatteryChangeVo changeVo) {
-        // 获取旧的ecu_sn
-        QueryWrapper query = QueryWrapper.create()
-                .select(EBIKE_ECU_INFO.ECU_SN)
-                .from(EBIKE_BIKE_INFO)
-                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_BIKE_INFO.ECU_ID.eq(EBIKE_ECU_INFO.ECU_ID))
-                .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(changeVo.getBikeCode()));
-        String oldEcuSn = bikeInfoMapper.selectOneByQueryAs(query, String.class);
         String bikeCode = changeVo.getBikeCode();
         String batteryCode = changeVo.getBatteryCode();
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -472,6 +465,13 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
             }
             // 车辆上架，删除旧区域id，保存新区域id
             if (bikeInfo.getStatus() == 1) {
+                // 获取旧的ecu_sn
+                QueryWrapper query = QueryWrapper.create()
+                        .select(EBIKE_ECU_INFO.ECU_SN)
+                        .from(EBIKE_BIKE_INFO)
+                        .leftJoin(EBIKE_ECU_INFO).on(EBIKE_BIKE_INFO.ECU_ID.eq(EBIKE_ECU_INFO.ECU_ID))
+                        .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(changeVo.getBikeCode()));
+                String oldEcuSn = bikeInfoMapper.selectOneByQueryAs(query, String.class);
                 redisUtil.deleteEcuSnRegionId(oldEcuSn);
                 redisUtil.saveEcuSnRegionId(batteryCode, bikeInfo.getRegionId());
             }