代码修改

src/main/java/com/ydtech/modules/order/service/InsOrdersCarInfoService.java

@@ -11,10 +11,11 @@ public interface InsOrdersCarInfoService extends IService<InsOrdersCarInfo> {
      * @param idCard 身份证号
      * @return
      */
-    boolean isExist(String idCard);
+    InsOrdersCarInfo isExist(String idCard);
 
     InsOrdersCarInfo getCarInfoByFrameNo(String frameNo);
 
+
 }
 
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersCarInfoServiceImpl.java

@@ -20,12 +20,12 @@ public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMap
      * @param licenseNo 身份证号
      * @return
      */
-    public boolean isExist(String licenseNo){
+    public InsOrdersCarInfo isExist(String licenseNo){
         LambdaQueryWrapper<InsOrdersCarInfo> eq = new LambdaQueryWrapper<InsOrdersCarInfo>().eq(InsOrdersCarInfo::getLicenseNo, licenseNo);
         List<InsOrdersCarInfo> insOrdersCarInfo = baseMapper.selectList(eq);
         if(!Objects.isNull(insOrdersCarInfo))
-            return true;
-        return false;
+            return insOrdersCarInfo.get(0);
+        return null;
     }
 
     /**

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -432,9 +432,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         //查出报价状态为 3
         List<InsAreaCompany> insAreaCompanies = insAreaCompanyService.getorDerIds();
 //      新的费用订单表
-        if (insAreaCompanies.size() > 0) {
+        if (!insAreaCompanies.isEmpty()) {
             List<String> collect =
-                    insAreaCompanies.stream().map(insAreaCompany -> insAreaCompany.getOrderno()).collect(Collectors.toList());
+                    insAreaCompanies.stream().map(InsAreaCompany::getOrderno).collect(Collectors.toList());
             if (!collect.isEmpty()) {
                 wrapper.in(InsOrders::getOrderno, collect);
             }
@@ -939,15 +939,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         final String orderNo = insOrders.getOrderno();
         // 1 车辆信息
         // 是否存在车辆信息
-        if(!insOrdersCarInfoService.isExist(insOrdersBo.getCarinfo().getLicenseNo())){
+
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.isExist(insOrdersBo.getCarinfo().getLicenseNo());
+
+        if(ObjectUtils.isEmpty(insOrdersCarInfo)){
             CarInfoVo carinfo = insOrdersBo.getCarinfo();
-            InsOrdersCarInfo insOrdersCarInfo = new InsOrdersCarInfo();
             BeanUtils.copyProperties(carinfo, insOrdersCarInfo);
             insOrdersCarInfo.setId(IdGenerate.nextId());
             insOrdersCarInfoService.save(insOrdersCarInfo);
             insOrders.setCarInfoId(insOrdersCarInfo.getId());
         }else{
-            InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByFrameNo(insOrdersBo.getCarinfo().getFrameNo());
             insOrders.setCarInfoId(insOrdersCarInfo.getId());
         }