785834757 il y a 2 ans
Parent
commit
c527a67e65

+ 4 - 0
src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -90,6 +90,10 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Override
     @Transactional
     public void insertCompanyAndOrders(InsAreaCompany insAreaCompany) {
+        //areaCompany id 是否为空
+        if(insAreaCompany.getId() == null || "".equals(insAreaCompany.getId())){
+            insAreaCompany.setId(IdGenerate.nextId());
+        }
         InsOrders insOrder = insOrdersService.getById(insAreaCompany.getOrderno());
         //车辆信息
         String carInfoId = insAreaCompanyCarInfoService.getCarInfoId(insOrder.getCarInfoId());

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

@@ -23,7 +23,7 @@ public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMap
     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))
+        if(insOrdersCarInfo.size() > 0)
             return insOrdersCarInfo.get(0);
         return null;
     }

+ 1 - 0
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -936,6 +936,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.isExist(insOrdersBo.getCarinfo().getLicenseNo());
 
         if(ObjectUtils.isEmpty(insOrdersCarInfo)){
+            insOrdersCarInfo = new InsOrdersCarInfo();
             CarInfoVo carinfo = insOrdersBo.getCarinfo();
             BeanUtils.copyProperties(carinfo, insOrdersCarInfo);
             insOrdersCarInfo.setId(IdGenerate.nextId());