From d75169a56148caa98dd8ee1f08a940faee4d6231 Mon Sep 17 00:00:00 2001
From: dzl <863620989@qq.com>
Date: Wed, 28 May 2025 09:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E8=BD=A6=E7=BB=91=E5=AE=9A=E5=89=8D?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=87=BA=E5=BA=93=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeBikeInfoServiceImpl.java        | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index 478d36b0..a40dcd3c 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -149,8 +149,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         try {
             EbikeBikeInfo ebikeBikeInfo = new EbikeBikeInfo();
             BeanUtils.copyProperties(reqEbikeBikeInfoDto, ebikeBikeInfo);
-            EbikeHelmetInfo ebikeHelmetInfo = new EbikeHelmetInfo();
-            BeanUtils.copyProperties(reqEbikeBikeInfoDto.getEbikeHelmetInfo(), ebikeHelmetInfo);
             EbikeBatteryInfo ebikeBatteryInfo = new EbikeBatteryInfo();
             BeanUtils.copyProperties(reqEbikeBikeInfoDto.getEbikeBatteryInfo(), ebikeBatteryInfo);
             EbikeEcuInfo ebikeEcuInfo = new EbikeEcuInfo();
@@ -172,16 +170,21 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeEcuInfoMapper.insert(ebikeEcuInfo);
             ebikeBikeInfo.setEcuId(ebikeEcuInfo.getEcuId());
 
-            List<EbikeHelmetOutRecords> ebikeHelmetOutRecords = new ArrayList<>();
-            EbikeHelmetOutRecords helmetOutRecords = new EbikeHelmetOutRecords();
-            BeanUtils.copyProperties(ebikeHelmetInfo, helmetOutRecords);
-            ebikeHelmetOutRecords.add(helmetOutRecords);
-            reqComponentOutRecordDto.setEbikeHelmetOutRecords(ebikeHelmetOutRecords);
-            reqComponentOutRecordDto.setComponentType("262711452730001");
-            //头盔出库
-            operateFeignClient.componentInventoryOutbound(reqComponentOutRecordDto);
-            ebikeHelmetInfoMapper.insert(ebikeHelmetInfo);
-            ebikeBikeInfo.setHelmetId(ebikeHelmetInfo.getHelmetId());
+            if (reqEbikeBikeInfoDto.getEbikeHelmetInfo() != null) {
+                EbikeHelmetInfo ebikeHelmetInfo = new EbikeHelmetInfo();
+                BeanUtils.copyProperties(reqEbikeBikeInfoDto.getEbikeHelmetInfo(), ebikeHelmetInfo);
+                List<EbikeHelmetOutRecords> ebikeHelmetOutRecords = new ArrayList<>();
+                EbikeHelmetOutRecords helmetOutRecords = new EbikeHelmetOutRecords();
+                BeanUtils.copyProperties(ebikeHelmetInfo, helmetOutRecords);
+                ebikeHelmetOutRecords.add(helmetOutRecords);
+                reqComponentOutRecordDto.setEbikeHelmetOutRecords(ebikeHelmetOutRecords);
+                reqComponentOutRecordDto.setComponentType("262711452730001");
+                reqComponentOutRecordDto.setEbikeEcuOutRecords(null);
+                //头盔出库
+                operateFeignClient.componentInventoryOutbound(reqComponentOutRecordDto);
+                ebikeHelmetInfoMapper.insert(ebikeHelmetInfo);
+                ebikeBikeInfo.setHelmetId(ebikeHelmetInfo.getHelmetId());
+            }
 
             List<EbikeBatteryOutRecords> ebikeBatteryOutRecords = new ArrayList<>();
             EbikeBatteryOutRecords batteryOutRecords = new EbikeBatteryOutRecords();
@@ -189,6 +192,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeBatteryOutRecords.add(batteryOutRecords);
             reqComponentOutRecordDto.setEbikeBatteryOutRecords(ebikeBatteryOutRecords);
             reqComponentOutRecordDto.setComponentType("262711452730000");
+            reqComponentOutRecordDto.setEbikeHelmetOutRecords(null);
             //电池出库
             operateFeignClient.componentInventoryOutbound(reqComponentOutRecordDto);
             ebikeBatteryInfoMapper.insert(ebikeBatteryInfo);