From 64ff73c373b4011442d38b5fdfaccafeb877a50cdc76bb0ae7582ae049fdacd3 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 5 Nov 2025 11:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E8=BD=A6=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeBikeInfoServiceImpl.java        | 87 +++++++++++++------
 1 file changed, 60 insertions(+), 27 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 378f347..2b77612 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
@@ -14,6 +14,7 @@ import com.cdzy.operations.service.EbikeBikeInfoService;
 import com.cdzy.operations.service.EbikeInventoryRecordService;
 import com.cdzy.operations.service.EbikeInventoryService;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.util.StringUtil;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.postgresql.geometric.PGpolygon;
@@ -62,38 +63,54 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             throw new EbikeException("该中控不存在");
         }
 
-        if (ecuInfo.getBindBattery() && bindVo.getBatteryCode()!=null){
+        //判断中控与电池关系
+        if (ecuInfo.getBindBattery() && StringUtil.hasText(bindVo.getBatteryCode())) {
             throw new EbikeException("该中控与电池一体无需额外绑定电池");
         }
 
+        if (!ecuInfo.getBindBattery() && !StringUtil.hasText(bindVo.getBatteryCode())) {
+            throw new EbikeException("该中控绑定车辆时车辆需绑定电池");
+        }
+
+        //检查电池是否正确
         queryWrapper.clear();
         queryWrapper.where(EBIKE_BATTERY_INFO.BATTERY_CODE.eq(bindVo.getBatteryCode()))
                 .where(EBIKE_BATTERY_INFO.STATUS.eq(BatteryStatus.BIND));
         EbikeBatteryInfo batteryInfo = batteryInfoMapper.selectOneByQuery(queryWrapper);
-        if (batteryInfo == null) {
+        if (batteryInfo == null && !ecuInfo.getBindBattery()) {
             throw new EbikeException("该电池不存在或电池二维码尚未绑定");
         }
 
+        //检查车辆二维码
         queryWrapper.clear();
         queryWrapper.where(EBIKE_BIKE_QR.BIKE_QR_CODE.eq(bindVo.getBikeCode()))
                 .where(EBIKE_BIKE_QR.STATUS.eq(BikeQrStatus.UN_BIND));
         EbikeBikeQr ebikeBikeQr = bikeQrMapper.selectOneByQuery(queryWrapper);
-        if (ebikeBikeQr == null){
+        if (ebikeBikeQr == null) {
             throw new EbikeException("该车辆二维码无效或已使用");
         }
 
-        if (!Objects.equals(batteryInfo.getOperatorId(), ecuInfo.getOperatorId()) && !Objects.equals(ecuInfo.getOperatorId(), ebikeBikeQr.getOperatorId()) && !Objects.equals(batteryInfo.getOperatorId(), ebikeBikeQr.getOperatorId())) {
-            throw new EbikeException("所选组件属于不同的运营商");
+        //判断组件所属运营商
+        if (batteryInfo != null) {
+            if (!Objects.equals(batteryInfo.getOperatorId(), ecuInfo.getOperatorId()) && !Objects.equals(ecuInfo.getOperatorId(), ebikeBikeQr.getOperatorId()) && !Objects.equals(batteryInfo.getOperatorId(), ebikeBikeQr.getOperatorId())) {
+                throw new EbikeException("所选组件属于不同的运营商");
+            }
+        }else {
+            if (!Objects.equals(ecuInfo.getOperatorId(), ebikeBikeQr.getOperatorId())) {
+                throw new EbikeException("所选组件属于不同的运营商");
+            }
         }
 
-        Long operatorId = batteryInfo.getOperatorId();
+        Long operatorId = ecuInfo.getOperatorId();
 
         queryWrapper.clear();
-        queryWrapper.where(EBIKE_BIKE_INFO.BATTERY_ID.eq(batteryInfo.getBatteryId()))
-                .or(EBIKE_BIKE_INFO.ECU_ID.eq(ecuInfo.getEcuId()))
+        queryWrapper.where(EBIKE_BIKE_INFO.ECU_ID.eq(ecuInfo.getEcuId()))
                 .or(EBIKE_BIKE_INFO.BIKE_CODE.eq(bindVo.getBikeCode()));
+        if (batteryInfo != null) {
+            queryWrapper.or(EBIKE_BIKE_INFO.BATTERY_ID.eq(batteryInfo.getBatteryId()));
+        }
         EbikeBikeInfo info = this.mapper.selectOneByQuery(queryWrapper);
-        if (info != null){
+        if (info != null) {
             throw new EbikeException("车辆绑定配件中存已绑定整车的配件");
         }
 
@@ -102,25 +119,40 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         bikeQrMapper.update(ebikeBikeQr);
 
         List<EbikeInventoryRecord> list = new ArrayList<>();
+
+        //TODO：优化封装
         for (int i = 1; i < 4; i++) {
             if (i != 2) {
-                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);
-
-                //TODO：优化为批量削减库存（需要更复杂的校验
-                inventoryService.reduceInventory(inventoryVo);
-            }
-            if (i == 2 && bindVo.getHasHelme()) {
+                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)
@@ -138,6 +170,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         }
         recordService.saveBatch(list);
 
+        //录入最终数据
         EbikeBikeInfo bikeInfo = EbikeBikeInfo.builder()
                 .operatorId(operatorId)
                 .bikeCode(bindVo.getBikeCode())
@@ -156,7 +189,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         QueryWrapper query = QueryWrapper.create()
                 .select(EBIKE_BIKE_INFO.ALL_COLUMNS)
                 .from(EBIKE_BIKE_INFO)
-                .where("ST_Within(location::geometry, ?::geometry)",polygon);
+                .where("ST_Within(location::geometry, ?::geometry)", polygon);
         return this.mapper.selectListByQuery(query);
     }