From 9ff710aaecaec01359376b8f0a08cdcd6b19ae928d808e7103bbb584f4dcff41 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Fri, 28 Nov 2025 09:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E8=BD=A6=E7=BB=91=E5=AE=9A=EF=BC=9A?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeBikeInfoServiceImpl.java        | 99 ++++++++++---------
 1 file changed, 52 insertions(+), 47 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 d7aa177..c13f99b 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
@@ -105,6 +105,10 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             throw new EbikeException("该中控不存在");
         }
 
+        if (ecuInfo.getIsClaim()) {
+            throw new EbikeException("该中控暂时不在库中");
+        }
+
         //判断中控与电池关系
         if (ecuInfo.getBindBattery() && StringUtil.hasText(bindVo.getBatteryCode())) {
             throw new EbikeException("该中控与电池一体无需额外绑定电池");
@@ -162,54 +166,55 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
 
         List<EbikeInventoryRecord> list = new ArrayList<>();
 
-        //TODO：优化封装
-        for (int i = 1; i < 4; i++) {
-            if (i != 2) {
-                if (i == 1 && !ecuInfo.getBindBattery()) {
-                    EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
-                            .operatorId(operatorId)
-                            .inventoryType(i)
-                            .inventoryNum(-1)
-                            .build();
-                    EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder()
-                            .operatorId(inventoryVo.getOperatorId())
-                            .inventoryType(inventoryVo.getInventoryType())
-                            .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum()))
-                            .createdBy(StpUtil.getLoginIdAsLong())
-                            .build();
-                    list.add(inventoryRecord);
-                    inventoryService.reduceInventory(inventoryVo);
-                } else if (i == 3) {
-                    EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
-                            .operatorId(operatorId)
-                            .inventoryType(i)
-                            .inventoryNum(-1)
-                            .build();
-                    EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder()
-                            .operatorId(inventoryVo.getOperatorId())
-                            .inventoryType(inventoryVo.getInventoryType())
-                            .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum()))
-                            .createdBy(StpUtil.getLoginIdAsLong())
-                            .build();
-                    list.add(inventoryRecord);
-                    inventoryService.reduceInventory(inventoryVo);
-                }
-            } else if (bindVo.getHasHelme()) {
-                EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
-                        .operatorId(operatorId)
-                        .inventoryType(i)
-                        .inventoryNum(-1)
-                        .build();
-                EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder()
-                        .operatorId(inventoryVo.getOperatorId())
-                        .inventoryType(inventoryVo.getInventoryType())
-                        .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum()))
-                        .createdBy(StpUtil.getLoginIdAsLong())
-                        .build();
-                list.add(inventoryRecord);
-                inventoryService.reduceInventory(inventoryVo);
-            }
+        if (!ecuInfo.getBindBattery()){
+            EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
+                    .operatorId(operatorId)
+                    .inventoryType(1)
+                    .inventoryNum(-1)
+                    .build();
+            EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder()
+                    .operatorId(inventoryVo.getOperatorId())
+                    .inventoryType(inventoryVo.getInventoryType())
+                    .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum()))
+                    .createdBy(StpUtil.getLoginIdAsLong())
+                    .build();
+            list.add(inventoryRecord);
+            inventoryService.reduceInventory(inventoryVo);
+        }else {
+            ecuInfo.setIsClaim(Boolean.TRUE);
+            ebikeEcuInfoService.updateById(ecuInfo);
         }
+
+        if (bindVo.getHasHelme()){
+            EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
+                    .operatorId(operatorId)
+                    .inventoryType(2)
+                    .inventoryNum(-1)
+                    .build();
+            EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder()
+                    .operatorId(inventoryVo.getOperatorId())
+                    .inventoryType(inventoryVo.getInventoryType())
+                    .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum()))
+                    .createdBy(StpUtil.getLoginIdAsLong())
+                    .build();
+            list.add(inventoryRecord);
+            inventoryService.reduceInventory(inventoryVo);
+        }
+
+        EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
+                .operatorId(operatorId)
+                .inventoryType(3)
+                .inventoryNum(-1)
+                .build();
+        EbikeInventoryRecord inventoryRecord = EbikeInventoryRecord.builder()
+                .operatorId(inventoryVo.getOperatorId())
+                .inventoryType(inventoryVo.getInventoryType())
+                .inventoryRecordNum(Long.valueOf(inventoryVo.getInventoryNum()))
+                .createdBy(StpUtil.getLoginIdAsLong())
+                .build();
+        list.add(inventoryRecord);
+        inventoryService.reduceInventory(inventoryVo);
+
         recordService.saveBatch(list);
 
         //录入最终数据