From 330dad2bcb7a4fb2a43c0e486653e1e5b404301e Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 28 Oct 2024 10:40:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?try=20catch=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InspectionInfoServiceImpl.java       |  6 ++-
 .../impl/RescueDriverInfoServiceImpl.java     | 44 ++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
index 2e68139d..6f7c0163 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
@@ -205,8 +205,12 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
             CustomerMain customerMain = new CustomerMain();
             customerMain.setDataFrom("01");
             customerMainService.saveOrUpdate(customerMain);
+            try {
+                customerInfoService.insertPartnerCustomerInfo(customerInfo);
+            }catch (Exception ignored){
+
+            }
 
-            customerInfoService.insertPartnerCustomerInfo(customerInfo);
         }
         //追加订单明细记录
         orderInfoDetailService.save(new OrderInfoDetail(orderInfo.getId(),"线下订单创建",new Date(),0L,"1"));
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
index 372f0a7a..fa7dcb22 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
@@ -590,31 +590,35 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
         //处理redis
         DriverInfo driverInfo = driverInfoService.getById(rescueInfo.getDriverId());
         AdminUserRespDTO user = userService.getUser(driverInfo.getUserId());
+        try{
+            // 收集客户信息
+            PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
+            customerInfo.setCustomerName(rescueInfo.getConnectionName());
+            customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone());
+            customerInfo.setUserId(rescueInfo.getUserId());
 
-        // 收集客户信息
-        PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
-        customerInfo.setCustomerName(rescueInfo.getConnectionName());
-        customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone());
-        customerInfo.setUserId(rescueInfo.getUserId());
+            // 收集客户车辆信息
+            List<ShopUserCar> userCarList = new ArrayList<>();
+            ShopUserCar userCar = new ShopUserCar();
+            userCar.setCarNo(rescueInfo.getLicenseNum());
+            userCar.setCarModel(rescueInfo.getCarType());
+            userCar.setCarBrand(rescueInfo.getCarBrand());
+            userCar.setUserId(user.getId());
+            userCarList.add(userCar);
 
-        // 收集客户车辆信息
-        List<ShopUserCar> userCarList = new ArrayList<>();
-        ShopUserCar userCar = new ShopUserCar();
-        userCar.setCarNo(rescueInfo.getLicenseNum());
-        userCar.setCarModel(rescueInfo.getCarType());
-        userCar.setCarBrand(rescueInfo.getCarBrand());
-        userCar.setUserId(user.getId());
-        userCarList.add(userCar);
+            customerInfo.setUserCarList(userCarList);
 
-        customerInfo.setUserCarList(userCarList);
+            // 设置客户来源
+            CustomerMain customerMain = new CustomerMain();
+            customerMain.setDataFrom("02");
+            customerMainService.saveOrUpdate(customerMain);
 
-        // 设置客户来源
-        CustomerMain customerMain = new CustomerMain();
-        customerMain.setDataFrom("02");
-        customerMainService.saveOrUpdate(customerMain);
+            // 调用插入客户信息的方法
+            customerInfoService.insertPartnerCustomerInfo(customerInfo);
+        }catch (Exception ignored){
+
+        }
 
-        // 调用插入客户信息的方法
-        customerInfoService.insertPartnerCustomerInfo(customerInfo);
 
 
         //所在顶级机构

From e7bd033a7804fee7785a2bf40641c3923ed851ac Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 28 Oct 2024 11:30:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?try=20catch=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/service/impl/InspectionInfoServiceImpl.java      | 1 -
 .../partner/service/impl/PartnerCustomerInfoServiceImpl.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
index 6f7c0163..b03566c8 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
@@ -200,7 +200,6 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
             customerInfo.setCustomerName(user.getNickname());
             customerInfo.setSex("0");
             customerInfo.setUserAge(user.getUserAge());
-
             // 设置客户来源
             CustomerMain customerMain = new CustomerMain();
             customerMain.setDataFrom("01");
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
index 11155c96..09520af2 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
@@ -126,7 +126,7 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     public int insertPartnerCustomerInfo(PartnerCustomerInfo partnerCustomerInfo) throws Exception {
         // 获取当前商户信息
         ShopMallPartners partners = partnerService.shopInfo();