From c61e663fe3ac929aa11708f0e20c65a9655960ce59a264e9868a4fc22af102bf Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Wed, 28 Jan 2026 09:42:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/entity/EbikeBorrowBatteryRecord.java      |  2 +-
 .../service/impl/EbikeBikeOrderServiceImpl.java     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBorrowBatteryRecord.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBorrowBatteryRecord.java
index 54cec7d..a5bdfff 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBorrowBatteryRecord.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBorrowBatteryRecord.java
@@ -35,7 +35,7 @@ public class EbikeBorrowBatteryRecord implements Serializable {
     private Long borrowBatteryRecordId;
 
     /**
-     * 领取时间
+     * 领取数量
      */
     private Integer borrowNum;
 
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 609105a..e825764 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
@@ -361,10 +361,14 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         if (record == null) {
             throw new EbikeException("请领取电池后再尝试归还");
         }
+       if (batteryClaimVo.getCodes().size()!=record.getBorrowNum()){
+           throw new EbikeException("归还数量与领取数量不一致");
+       }
         record.setIsReturn(Boolean.TRUE);
         batteryRecordMapper.update(record);
         List<String> codes = batteryClaimVo.getCodes();
         List<EbikeRecordCodes> list = new ArrayList<>();
+        List<String> ecuSns = new ArrayList<>();
         for (String code : codes) {
             EbikeRecordCodes recordCodes = EbikeRecordCodes.builder()
                     .batteryCode(code)
@@ -372,10 +376,19 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                     .borrowBatteryRecordId(record.getBorrowBatteryRecordId())
                     .build();
             list.add(recordCodes);
+            if (!code.startsWith("B")) {
+                ecuSns.add(code);
+            }
         }
         if (!list.isEmpty()) {
             recordCodesMapper.insertBatch(list);
         }
+        if (!ecuSns.isEmpty()) {
+            UpdateChain.of(EbikeEcuInfo.class)
+                    .set(EBIKE_ECU_INFO.IS_CLAIM, Boolean.FALSE)
+                    .where(EBIKE_ECU_INFO.ECU_SN.in(ecuSns))
+                    .update();
+        }
     }
 
     @Override