修改代码

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

@@ -132,7 +132,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private SysUserLinkPtlAgreementMapper sysUserLinkPtlAgreementMapper;
 
 
-    
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
                                 SysUserRoleService sysUserRoleService,
                                 EsmUserReferrerService esmUserReferrerService, SysDeptService sysDeptService,
@@ -276,8 +275,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (ObjectUtils.isEmpty(insOrders1)) {
             insOrders1 = insOrders;
         }
+        String licenseNo = quoteInfoVo.getCarInfo().getLicenseNo();
 
-        if (!quoteInfoVo.getCarInfo().getLicenseNo().equals(insOrders1.getLicenseno())) {
+        if (StringUtils.isNotEmpty(licenseNo) && !licenseNo.equals(insOrders1.getLicenseno())) {
             throw new SystemException("1001", "车牌与此订单不符，请重新录单");
         }
 
@@ -371,11 +371,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         Page<InsOrders> resultOrders = new Page<>();
 
         //查询未审核
-        if(orderQueryVo.getAuditStatus().equals("0")){
+        if (orderQueryVo.getAuditStatus().equals("0")) {
             resultOrders = insAreaCompanyService.getPendingAuditOrders(page, orderQueryVo);
-        }else if(orderQueryVo.getAuditStatus().equals("1")){
+        } else if (orderQueryVo.getAuditStatus().equals("1")) {
             //已审核
-            resultOrders = insAreaCompanyService.getAlreadyAuditOrders(page,orderQueryVo);
+            resultOrders = insAreaCompanyService.getAlreadyAuditOrders(page, orderQueryVo);
         }
 
         return new BasePageResult<>(resultOrders.getCurrent(), page.getSize(), resultOrders.getTotal(),
@@ -663,12 +663,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 //            }
 //        }
         if (!Objects.isNull(insFeeOrderNew)) {
-            PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
+            PtlAgreementProductCostsNew ptlAgreementProductCostsNew =
+                    ptlAgreementProductCostsNewService.getById(insFeeOrderNew.getCostsId());
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
 //            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
 //            orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
-            FeeOrderNewVo  feeOrderNewVo =   feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew,ptlAgreementProductCostsNew);
+            FeeOrderNewVo feeOrderNewVo = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew, ptlAgreementProductCostsNew);
             feeOrderNewVo.setFeeId(insFeeOrderNew.getId());
             orderAndAreaCompany.setFeeOrderNewVo(feeOrderNewVo);
             List<DistributionLevelVo> distributionLevelVoList = feeRuleSchemeService.converDistrbutionData(insFeeOrderNew);
@@ -765,11 +766,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersTrackService.save(insOrdersTrack);
         return true;
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:38
-     *  @Description: 通过待客录单id和订单状态查询订单数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:38
+     * @Description: 通过待客录单id和订单状态查询订单数据
      */
     @Override
     public BasePageResult<InsOrders> queryPageHospitalityOrder(OrderQueryVo orderQueryVo) {
@@ -790,47 +792,49 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         //orderQueryVo.setUserId("admin");
         Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
-        List<String> agentUserIds =new ArrayList<>();
-        List<String> agreeIds =new ArrayList<>();
-        if(type==1){
+        List<String> agentUserIds = new ArrayList<>();
+        List<String> agreeIds = new ArrayList<>();
+        if (type == 1) {
             //渠道
             //查询用户表中的信息为领带id为用户id的数据
             List<SysUserBaseVO> allUsersByLeaderId = sysUserMapper.getAllUsersByLeaderId(orderQueryVo.getUserId());
-            if(allUsersByLeaderId!=null && allUsersByLeaderId.size()>0){
+            if (allUsersByLeaderId != null && allUsersByLeaderId.size() > 0) {
                 for (SysUserBaseVO sysUserBaseVO : allUsersByLeaderId) {
                     agentUserIds.add(sysUserBaseVO.getUserId());
                 }
             }
-        }else if(type==2){
+        } else if (type == 2) {
             //查询所有的代理人
             agentUserIds = sysUserMapper.getAgentUserIds();
 
-        }else if(type==3){
+        } else if (type == 3) {
             //查询用户关联的协议
-            List<SysUserLinkPtlAgreementDto> ptlAgreementListByUserIds = sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserId(orderQueryVo.getUserId());
-            if(ptlAgreementListByUserIds!=null && ptlAgreementListByUserIds.size()>0){
+            List<SysUserLinkPtlAgreementDto> ptlAgreementListByUserIds =
+                    sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserId(orderQueryVo.getUserId());
+            if (ptlAgreementListByUserIds != null && ptlAgreementListByUserIds.size() > 0) {
                 for (SysUserLinkPtlAgreementDto sysUserLinkPtlAgreementDto : ptlAgreementListByUserIds) {
                     agreeIds.add(sysUserLinkPtlAgreementDto.getPtlAgreement().getId());
                 }
             }
         }
-        Long total=0l;
-        Page<InsOrders> orderVoPage=new Page<>();
+        Long total = 0l;
+        Page<InsOrders> orderVoPage = new Page<>();
         //注释逻辑给前台返回数据
         if((agentUserIds!=null && agentUserIds.size()>0) || (agreeIds!=null && agreeIds.size()>0)){
-            orderVoPage= baseMapper.queryPageOrderByLinkType(page, orderQueryVo,agentUserIds,agreeIds);
-            total = baseMapper.queryPageOrderByLinkTypeCount(orderQueryVo,agentUserIds,agreeIds);
+        orderVoPage = baseMapper.queryPageOrderByLinkType(page, orderQueryVo, agentUserIds, agreeIds);
+        total = baseMapper.queryPageOrderByLinkTypeCount(orderQueryVo, agentUserIds, agreeIds);
         }
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()
                 , orderVoPage.getRecords());
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/18 10:51
-     *  @Description: 查询子订单的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/18 10:51
+     * @Description: 查询子订单的数据
      */
     @Override
     public BasePageResult<InsOrders> queryPageSubOrders(OrderTaskPoolsVo orderTaskPoolsVo) {