换电完善

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;
 

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