Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -92,10 +92,9 @@ public class RuleAttrMappingVo {
         //车长
 //        ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleLength", carInfo.getCarLength()));
         //转续保 交强
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqRenewalofInsurance", insAreaCompany.getJqRenewal()));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqRenewalOfInsurance", insAreaCompany.getJqRenewal()));
         //转续保 商业
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewalofInsurance", insAreaCompany.getSyRenewal()));
-
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewalOfInsurance", insAreaCompany.getSyRenewal()));
 
         CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
         //车主 证件号码（前6位）
@@ -258,10 +257,6 @@ public class RuleAttrMappingVo {
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("IsDJQ", insAreaCompany.getIsDjq()));
         //紫金鼎然评分
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("UbiPredictedInfoScore", insAreaCompany.getUbiPredictedInfoScore()));
-        //交强续保
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqRenewal", insAreaCompany.getJqRenewal()));
-        //商业续保
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewal", insAreaCompany.getSyRenewal()));
         // 交强出险次数
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqNumberOfClaims", insAreaCompany.getJqClaims() == null ? "0" : insAreaCompany.getJqClaims()));
         // 商业出险次数

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -3,10 +3,7 @@ package com.ydtech.modules.fee.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.dict.insurance.EnergyType;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.po.SysUserAccount;
-import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmRetail;
@@ -18,7 +15,9 @@ import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
+import com.ydtech.modules.order.entity.vo.QueryOrderFeeResultVo;
+import com.ydtech.modules.order.entity.vo.QueryOrderFeeVo;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlNewCarJudgeRules;
@@ -35,11 +34,12 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author: tz
@@ -113,7 +113,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     @Override
     public void verificationCostFactor(InsAreaCompany insAreaCompany, InsOrders insOrders, StringBuilder logs) {
 
-        List<AgreementProductCosts> agreementProductCosts = ptlAgreementProductCostsNewService.costsGetList(insAreaCompany.getAgreementId(), insOrders.getProductid());
+        List<AgreementProductCosts> agreementProductCosts =
+                ptlAgreementProductCostsNewService.costsGetList(insAreaCompany.getAgreementId(), insOrders.getProductid());
 //        if(agreementProductCosts == null || agreementProductCosts.size() == 0){
 //            throw new SystemException("协议费用因子为空");
 //        }
@@ -122,7 +123,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 agreementProductCosts.get(i).setPriorityLevel(10);
             }
         }
-        if (agreementProductCosts.size() > 0) {
+        if (!agreementProductCosts.isEmpty()) {
             //按优先级进行排序
             Collections.sort(agreementProductCosts, Comparator.comparingInt(AgreementProductCosts::getPriorityLevel));
             //遍历费用因子
@@ -144,7 +145,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      */
     @Override
     public void verificationRuleFactor(InsAreaCompany insAreaCompany, InsOrders insOrders) {
-        List<PtlAgreementUndwrtRulesNew> ptlAgreementUndwrtRules = ptlAgreementUndwrtRulesNewService.rulesList(insAreaCompany.getAgreementId());
+        List<PtlAgreementUndwrtRulesNew> ptlAgreementUndwrtRules =
+                ptlAgreementUndwrtRulesNewService.rulesList(insAreaCompany.getAgreementId());
         verificationRules(ptlAgreementUndwrtRules, insAreaCompany, insOrders);
     }
 
@@ -168,7 +170,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.getById(costsId);
 
         //出口配置
-        PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, costsId));
+        PtlAgreementProductCostsExport ptlAgreementProductCostsExport =
+                ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, costsId));
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
         insFeeOrderNew.setId(IdGenerate.nextId());
         insFeeOrderNew.setCostsId(costsId);
@@ -284,8 +287,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         //region 设置机构管理费
 
         //交强机构管理费
-        BigDecimal jqDeptRadio = ptlAgreementProductCostsExport.getJqExportRadioLevel1().add(ptlAgreementProductCostsExport.getJqExportRadioLevel2()).add(ptlAgreementProductCostsExport.getJqExportRadioLevel3()).add(ptlAgreementProductCostsExport.getJqExportRadioLevel4()).add(ptlAgreementProductCostsExport.getJqExportRadioLevel5());
-        FeeOrderNewVo.DeptManagerFee jqDeptManagerFee = feeRuleSchemeService.calcDeptManagerFee(insFeeOrderNew.getJqPremium(), ptlAgreementProductCostsExport.getJqExportRadioLevel1(), ptlAgreementProductCostsExport.getJqExportRadioLevel2(), ptlAgreementProductCostsExport.getJqExportRadioLevel3(), ptlAgreementProductCostsExport.getJqExportRadioLevel4(), ptlAgreementProductCostsExport.getJqExportRadioLevel5());
+        BigDecimal jqDeptRadio =
+                ptlAgreementProductCostsExport.getJqExportRadioLevel1().add(ptlAgreementProductCostsExport.getJqExportRadioLevel2()).add(ptlAgreementProductCostsExport.getJqExportRadioLevel3()).add(ptlAgreementProductCostsExport.getJqExportRadioLevel4()).add(ptlAgreementProductCostsExport.getJqExportRadioLevel5());
+        FeeOrderNewVo.DeptManagerFee jqDeptManagerFee = feeRuleSchemeService.calcDeptManagerFee(insFeeOrderNew.getJqPremium(),
+                ptlAgreementProductCostsExport.getJqExportRadioLevel1(), ptlAgreementProductCostsExport.getJqExportRadioLevel2(),
+                ptlAgreementProductCostsExport.getJqExportRadioLevel3(), ptlAgreementProductCostsExport.getJqExportRadioLevel4(),
+                ptlAgreementProductCostsExport.getJqExportRadioLevel5());
         insFeeOrderNew.setJqDeptProportionLevel1(jqDeptManagerFee.getDeptProportionLevelOne());
         insFeeOrderNew.setJqDeptPremiumsLevel1(jqDeptManagerFee.getDeptPremiumsLevelOne());
         insFeeOrderNew.setJqDeptProportionLevel2(jqDeptManagerFee.getDeptProportionLevelTwo());
@@ -297,8 +304,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         insFeeOrderNew.setJqDeptProportionLevel5(jqDeptManagerFee.getDeptProportionLevelFive());
         insFeeOrderNew.setJqDeptPremiumsLevel5(jqDeptManagerFee.getDeptPremiumsLevelFive());
 
-        BigDecimal syDeptRadio = ptlAgreementProductCostsExport.getSyExportRadioLevel1().add(ptlAgreementProductCostsExport.getSyExportRadioLevel2()).add(ptlAgreementProductCostsExport.getSyExportRadioLevel3()).add(ptlAgreementProductCostsExport.getSyExportRadioLevel4()).add(ptlAgreementProductCostsExport.getSyExportRadioLevel5());
-        FeeOrderNewVo.DeptManagerFee syDeptManagerFee = feeRuleSchemeService.calcDeptManagerFee(insFeeOrderNew.getSyPremium(), ptlAgreementProductCostsExport.getSyExportRadioLevel1(), ptlAgreementProductCostsExport.getSyExportRadioLevel2(), ptlAgreementProductCostsExport.getSyExportRadioLevel3(), ptlAgreementProductCostsExport.getSyExportRadioLevel4(), ptlAgreementProductCostsExport.getSyExportRadioLevel5());
+        BigDecimal syDeptRadio =
+                ptlAgreementProductCostsExport.getSyExportRadioLevel1().add(ptlAgreementProductCostsExport.getSyExportRadioLevel2()).add(ptlAgreementProductCostsExport.getSyExportRadioLevel3()).add(ptlAgreementProductCostsExport.getSyExportRadioLevel4()).add(ptlAgreementProductCostsExport.getSyExportRadioLevel5());
+        FeeOrderNewVo.DeptManagerFee syDeptManagerFee = feeRuleSchemeService.calcDeptManagerFee(insFeeOrderNew.getSyPremium(),
+                ptlAgreementProductCostsExport.getSyExportRadioLevel1(), ptlAgreementProductCostsExport.getSyExportRadioLevel2(),
+                ptlAgreementProductCostsExport.getSyExportRadioLevel3(), ptlAgreementProductCostsExport.getSyExportRadioLevel4(),
+                ptlAgreementProductCostsExport.getSyExportRadioLevel5());
         insFeeOrderNew.setSyDeptProportionLevel1(syDeptManagerFee.getDeptProportionLevelOne());
         insFeeOrderNew.setSyDeptPremiumsLevel1(syDeptManagerFee.getDeptPremiumsLevelOne());
         insFeeOrderNew.setSyDeptProportionLevel2(syDeptManagerFee.getDeptProportionLevelTwo());
@@ -310,8 +321,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         insFeeOrderNew.setSyDeptProportionLevel5(syDeptManagerFee.getDeptProportionLevelFive());
         insFeeOrderNew.setSyDeptPremiumsLevel5(syDeptManagerFee.getDeptPremiumsLevelFive());
 
-        BigDecimal noDeptRadio = ptlAgreementProductCostsExport.getNoCarExportRadioLevel1().add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2()).add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3()).add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4()).add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
-        FeeOrderNewVo.DeptManagerFee noDeptManagerFee = feeRuleSchemeService.calcDeptManagerFee(insFeeOrderNew.getNoPremium(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel1(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel2(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel3(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel4(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
+        BigDecimal noDeptRadio =
+                ptlAgreementProductCostsExport.getNoCarExportRadioLevel1().add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel2()).add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel3()).add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel4()).add(ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
+        FeeOrderNewVo.DeptManagerFee noDeptManagerFee = feeRuleSchemeService.calcDeptManagerFee(insFeeOrderNew.getNoPremium(),
+                ptlAgreementProductCostsExport.getNoCarExportRadioLevel1(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel2(),
+                ptlAgreementProductCostsExport.getNoCarExportRadioLevel3(), ptlAgreementProductCostsExport.getNoCarExportRadioLevel4(),
+                ptlAgreementProductCostsExport.getNoCarExportRadioLevel5());
         insFeeOrderNew.setNoDeptProportionLevel1(noDeptManagerFee.getDeptProportionLevelOne());
         insFeeOrderNew.setNoDeptPremiumsLevel1(noDeptManagerFee.getDeptPremiumsLevelOne());
         insFeeOrderNew.setNoDeptProportionLevel2(noDeptManagerFee.getDeptProportionLevelTwo());
@@ -352,14 +367,16 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      * @param insOrders
      * @return
      */
-    private String verificationCosts(List<AgreementProductCosts> agreementProductCosts, InsAreaCompany insAreaCompany, InsOrders insOrders, StringBuilder logs) {
+    private String verificationCosts(List<AgreementProductCosts> agreementProductCosts, InsAreaCompany insAreaCompany,
+                                     InsOrders insOrders, StringBuilder logs) {
         //匹配费用因子
         //获取所有费用属性
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         //获取新旧车信息
         PtlNewCarJudgeRules carJudgeRule = getCarJudgeRule(insAreaCompany.getCompanyId());
         //获取所有费用属性关联
-        List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(insAreaCompany, insOrders, undwrtRulesAttrList, carJudgeRule);
+        List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(insAreaCompany, insOrders,
+                undwrtRulesAttrList, carJudgeRule);
 
 //        List<AgreementProductCosts> filterAgreementProductCosts = new ArrayList<>();
 
@@ -367,7 +384,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 //        //查找是否有强制非车因子
 //        for(int i=0;i<agreementProductCosts.size();i++) {
 //            PtlAgreementProductCostsAttrLink ptlAgreementProductCostsAttrLink =
-//                    agreementProductCosts.get(i).getCostsAttrLinks().stream().filter(x -> x.getAttrCode().equals("IsNonMotorInsurance")).findFirst().orElse(null);
+//                    agreementProductCosts.get(i).getCostsAttrLinks().stream().filter(x -> x.getAttrCode().equals("IsNonMotorInsurance")
+//                    ).findFirst().orElse(null);
 //
 //            if(!Objects.isNull(ptlAgreementProductCostsAttrLink)){
 //                if(ptlAgreementProductCostsAttrLink.getMin().equals("1")){
@@ -385,7 +403,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         //是否强制走非车
 //        if(isNoCar) {
 //            for(int i=0;i<filterAgreementProductCosts.size();i++) {
-//                if (judgementsIsNoCar(filterAgreementProductCosts.get(i).getCostsAttrLinks(), undwrtRulesAttrList, ruleAttrMappingVoList)) {
+//                if (judgementsIsNoCar(filterAgreementProductCosts.get(i).getCostsAttrLinks(), undwrtRulesAttrList,
+//                ruleAttrMappingVoList)) {
 //                    return filterAgreementProductCosts.get(i).getId();
 //                }
 //            }
@@ -417,14 +436,16 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     }
 
 
-    private boolean verificationRules(List<PtlAgreementUndwrtRulesNew> ptlAgreementUndwrtRulesNews, InsAreaCompany insAreaCompany, InsOrders insOrders) {
+    private boolean verificationRules(List<PtlAgreementUndwrtRulesNew> ptlAgreementUndwrtRulesNews, InsAreaCompany insAreaCompany,
+                                      InsOrders insOrders) {
 
         StringBuilder logs = new StringBuilder();
         //匹配承保规则
         //获取所有承保规则属性
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         //获取所有费用属性关联
-        List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(insAreaCompany, insOrders, undwrtRulesAttrList, getCarJudgeRule(insAreaCompany.getCompanyId()));
+        List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(insAreaCompany, insOrders,
+                undwrtRulesAttrList, getCarJudgeRule(insAreaCompany.getCompanyId()));
 
 
         for (int i = 0; i < ptlAgreementUndwrtRulesNews.size(); i++) {
@@ -445,48 +466,56 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      * @return
      */
     private boolean judgements(List<PtlAgreementProductCostsAttrLink> ptlAgreementProductCostsAttrLinks,
-                               List<PtlAgreementUndwrtRulesAttr> rulesAttrs, List<RuleAttrMappingVo> ruleAttrMappingVoList, StringBuilder logs) {
+                               List<PtlAgreementUndwrtRulesAttr> rulesAttrs, List<RuleAttrMappingVo> ruleAttrMappingVoList,
+                               StringBuilder logs) {
         boolean useFlag = true;
 
-        for (int i = 0; i < ptlAgreementProductCostsAttrLinks.size(); i++) {
-            int finalI = i;
 
+        for (PtlAgreementProductCostsAttrLink ptlAgreementProductCostsAttrLink : ptlAgreementProductCostsAttrLinks) {
             //查找规则中的 传值属性
-            RuleAttrMappingVo ruleAttrMappingVo = ruleAttrMappingVoList.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode())).findFirst().orElse(null);
-
-            //先跳过强制非车的检测
-            if (ptlAgreementProductCostsAttrLinks.get(i).getAttrCode().equals("IsNonMotorInsurance"))
-                continue;
+            RuleAttrMappingVo ruleAttrMappingVo = ruleAttrMappingVoList.stream()
+                    .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
+                    .findFirst()
+                    .orElse(null);
 
             //如果查找不到 传值属性 直接费用对比失败
             if (ruleAttrMappingVo == null) {
-                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLinks.get(i).getAttrCode());
-                log.debug("传入的值找不到该属性:" + ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode());
-                int finalI1 = i;
-                List<PtlAgreementUndwrtRulesAttr> collect = rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI1).getAttrCode())).collect(Collectors.toList());
-                if (collect.size() > 0) {
+                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
+                log.debug("传入的值找不到该属性:" + ptlAgreementProductCostsAttrLink.getAttrCode());
+
+                List<PtlAgreementUndwrtRulesAttr> collect = rulesAttrs.stream()
+                        .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
+                        .collect(Collectors.toList());
+                if (!collect.isEmpty()) {
                     logs.append("规则匹配失败:" + collect.get(0).getAttrName() + "\n");
                 }
                 return false;
             }
 
             //查找 费用因子规则
-            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode())).findFirst().get();
+            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = rulesAttrs.stream()
+                    .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
+                    .findFirst()
+                    .get();
 
-            useFlag = attrEqual(ptlAgreementProductCostsAttrLinks.get(i), ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
+            useFlag = attrEqual(ptlAgreementProductCostsAttrLink, ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
             if (!useFlag) {
-                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLinks.get(i).getAttrCode());
-                log.debug("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMin());
+                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
+                log.debug("检验的值:" + ptlAgreementProductCostsAttrLink.getMin());
                 log.debug("传入的值:" + ruleAttrMappingVo.getValue());
-                int finalI1 = i;
-                List<PtlAgreementUndwrtRulesAttr> collect = rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI1).getAttrCode())).collect(Collectors.toList());
-                if (collect.size() > 0) {
+
+                List<PtlAgreementUndwrtRulesAttr> collect = rulesAttrs.stream()
+                        .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
+                        .collect(Collectors.toList());
+
+                if (!collect.isEmpty()) {
                     logs.append("规则匹配失败:" + collect.get(0).getAttrName() + "\n");
                 }
-                if(ptlAgreementProductCostsAttrLinks.get(i).getMin() != null) {
-                    logs.append("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMin() + "\n");
-                }else{
-                    logs.append("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMax() + "\n");
+
+                if (ptlAgreementProductCostsAttrLink.getMin() != null) {
+                    logs.append("检验的值:" + ptlAgreementProductCostsAttrLink.getMin() + "\n");
+                } else {
+                    logs.append("检验的值:" + ptlAgreementProductCostsAttrLink.getMax() + "\n");
                 }
 
                 logs.append("传入的值:" + ruleAttrMappingVo.getValue() + "\n");
@@ -494,6 +523,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             }
 
         }
+
         return useFlag;
     }
 
@@ -523,19 +553,22 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 return true;
             }
             //查找 费用因子规则
-            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementUndwrtRulesAttrLinks.get(finalI).getAttrCode())).findFirst().get();
+            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr =
+                    rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementUndwrtRulesAttrLinks.get(finalI).getAttrCode())).findFirst().get();
             //如果是多选 对value进行转换
             if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("checkbox")) {
-                PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
-                        x.getName().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
+                PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal =
+                        ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
+                                x.getName().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
                 ruleAttrMappingVo.setValue(ptlAgreementUndwrtRulesDictLabal.getName());
             }
             //如果是单选 并且是 性别的话 转换为code
             if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio")) {
                 if ("CarOwnersSex".equals(ptlAgreementUndwrtRulesAttr.getAttrCode()) || "ApplicantSex".equals(ptlAgreementUndwrtRulesAttr.getAttrCode()) ||
                         "InsuredSex".equals(ptlAgreementUndwrtRulesAttr.getAttrCode())) {
-                    PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
-                            x.getCode().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
+                    PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal =
+                            ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
+                                    x.getCode().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
                     ruleAttrMappingVo.setValue(ptlAgreementUndwrtRulesDictLabal.getCode());
                 }
             }
@@ -544,9 +577,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 return true;
             } else {
                 logs.append("规则匹配失败:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getAttrCode() + "\n");
-                if(ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() != null) {
+                if (ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() != null) {
                     logs.append("校验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMin() + "\n");
-                }else{
+                } else {
                     logs.append("校验的值:" + ptlAgreementUndwrtRulesAttrLinks.get(i).getMax() + "\n");
                 }
                 logs.append("传入的值:" + ruleAttrMappingVo.getValue());
@@ -570,7 +603,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         for (int i = 0; i < ptlAgreementProductCostsAttrLinks.size(); i++) {
             int finalI = i;
             //查找规则中的 传值属性
-            RuleAttrMappingVo ruleAttrMappingVo = ruleAttrMappingVoList.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode())).findFirst().orElse(null);
+            RuleAttrMappingVo ruleAttrMappingVo =
+                    ruleAttrMappingVoList.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode())).findFirst().orElse(null);
             //如果是强制非车险
             if (ptlAgreementProductCostsAttrLinks.get(i).getAttrCode().equals("IsNonMotorInsurance"))
                 continue;
@@ -578,19 +612,22 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             if (ruleAttrMappingVo == null)
                 return false;
             //查找 费用因子规则
-            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode())).findFirst().get();
+            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr =
+                    rulesAttrs.stream().filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLinks.get(finalI).getAttrCode())).findFirst().get();
             //如果是多选 对value进行转换
             if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("checkbox")) {
-                PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
-                        x.getCode().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
+                PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal =
+                        ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
+                                x.getCode().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
                 ruleAttrMappingVo.setValue(ptlAgreementUndwrtRulesDictLabal.getName());
             }
             //如果是单选 并且是 性别的话 转换为code
             if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio")) {
                 if ("CarOwnersSex".equals(ptlAgreementUndwrtRulesAttr.getAttrCode()) || "ApplicantSex".equals(ptlAgreementUndwrtRulesAttr.getAttrCode()) ||
                         "InsuredSex".equals(ptlAgreementUndwrtRulesAttr.getAttrCode())) {
-                    PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
-                            x.getName().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
+                    PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal =
+                            ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
+                                    x.getName().equals(ruleAttrMappingVo.getValue())).findFirst().orElse(null);
                     ruleAttrMappingVo.setValue(ptlAgreementUndwrtRulesDictLabal.getCode());
                 }
             }
@@ -612,7 +649,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      * @param value
      * @return
      */
-    private boolean attrEqual(PtlAgreementProductCostsAttrLink ptlAgreementProductCostsAttrLink, PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, String value) {
+    private boolean attrEqual(PtlAgreementProductCostsAttrLink ptlAgreementProductCostsAttrLink,
+                              PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, String value) {
         if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("checkbox")) {
             return checkBoxEqual(ptlAgreementProductCostsAttrLink, value);
         } else if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("inputNumber")) {
@@ -633,10 +671,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         } else if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio")) {
             return radioEqual(ptlAgreementProductCostsAttrLink, value);
         }
+
         return false;
     }
 
-    private boolean attrEqual(PtlAgreementUndwrtRulesAttrLink ptlAgreementUndwrtRulesAttrLink, PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, String value) {
+    private boolean attrEqual(PtlAgreementUndwrtRulesAttrLink ptlAgreementUndwrtRulesAttrLink,
+                              PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, String value) {
         if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("checkbox")) {
             return checkBoxEqual(ptlAgreementUndwrtRulesAttrLink, value);
         } else if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("inputNumber")) {
@@ -848,7 +888,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      */
     private PtlNewCarJudgeRules getCarJudgeRule(String companyId) {
         //获取车辆新旧车信息
-        List<PtlNewCarJudgeRules> list = ptlNewCarJudgeRulesService.list(new LambdaQueryWrapper<PtlNewCarJudgeRules>().eq(PtlNewCarJudgeRules::getCompanyId, companyId));
+        List<PtlNewCarJudgeRules> list =
+                ptlNewCarJudgeRulesService.list(new LambdaQueryWrapper<PtlNewCarJudgeRules>().eq(PtlNewCarJudgeRules::getCompanyId,
+                        companyId));
         if (list.size() > 0) {
             return list.get(0);
         }

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyAccidentalDriving.java

@@ -48,7 +48,6 @@ public class InsAreaCompanyAccidentalDriving implements Serializable {
     @TableField(value = "quantity")
     private Integer quantity;
 
-
     /**
      * 转换爬虫的驾意险信息
      * @param t

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

@@ -16,7 +16,10 @@ import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.order.service.*;
+import com.ydtech.modules.order.service.InsAreaCompanyAccidentalDrivingService;
+import com.ydtech.modules.order.service.InsAreaCompanyService;
+import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.order.service.InsOrdersTrackService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +33,7 @@ import java.time.LocalDate;
 import java.time.YearMonth;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Administrator
@@ -49,6 +53,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Autowired
     private InsOrdersMapper insOrdersMapper;
+
     public InsAreaCompanyServiceImpl(@Lazy InsOrdersService insOrdersService, InsOrdersTrackService insOrdersTrackService) {
         this.insOrdersService = insOrdersService;
         this.insOrdersTrackService = insOrdersTrackService;
@@ -75,15 +80,15 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         insOrdersTrackService.addingTrajectories(insAreaCompany);
         insOrdersService.updateByOrderStatus(insAreaCompany);
     }
+
     /**
-    * @Description   新的订单内部状态修改
-    * @Author  xingming
-    * @Date   2024/3/28 15:58
-    * @Param
-    * @Return
-    * @Exception
-    *
-    */
+     * @Description 新的订单内部状态修改
+     * @Author xingming
+     * @Date 2024/3/28 15:58
+     * @Param
+     * @Return
+     * @Exception
+     */
     @Override
     public void updateCompanyAndOrdersNew(InsAreaCompany insAreaCompany) {
         baseMapper.updateById(insAreaCompany);
@@ -97,15 +102,23 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         insAreaCompany = updateEntityPruductAndPruductid(insAreaCompany);
         baseMapper.insert(insAreaCompany);
         //保存驾意险信息
-        insAreaCompanyAccidentalDriving.setCompanyId(insAreaCompany.getId());
-        insAreaCompanyAccidentalDriving.setId(IdGenerate.nextId());
-        insAreaCompanyAccidentalDrivingService.save(insAreaCompanyAccidentalDriving);
+
+        final InsAreaCompany finalInsAreaCompany = insAreaCompany;
+        Optional.ofNullable(insAreaCompanyAccidentalDriving)
+                .filter(x -> StringUtils.isNotEmpty(x.getRideRiskName()) && !ObjectUtils.isEmpty(x.getQuantity()))
+                .ifPresent(x -> {
+                    x.setCompanyId(finalInsAreaCompany.getId());
+                    x.setId(IdGenerate.nextId());
+                    insAreaCompanyAccidentalDrivingService.save(insAreaCompanyAccidentalDriving);
+                });
+
         insOrdersTrackService.addingTrajectories(insAreaCompany);
         insOrdersService.updateByOrderStatus(insAreaCompany);
     }
 
     @Override
-    public void insertCompanyAndOrders(InsAreaCompany insAreaCompany, List<InsAreaCompanyAccidentalDriving> insAreaCompanyAccidentalDriving) {
+    public void insertCompanyAndOrders(InsAreaCompany insAreaCompany,
+                                       List<InsAreaCompanyAccidentalDriving> insAreaCompanyAccidentalDriving) {
         //add by hxl   解决部分数据更新不了险种信息
         insAreaCompany = updateEntityPruductAndPruductid(insAreaCompany);
         baseMapper.insert(insAreaCompany);
@@ -133,7 +146,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     public List<InsAreaCompanyQueryDto> getByOrderNo(String orderNo) {
         List<InsAreaCompanyQueryDto> insAreaCompanyQueryDtos = this.baseMapper.selectAcceptInsurance(orderNo);
 
-        if(!insAreaCompanyQueryDtos.isEmpty()){
+        if (!insAreaCompanyQueryDtos.isEmpty()) {
             return insAreaCompanyQueryDtos;
         }
 
@@ -147,25 +160,25 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Override
     public List<InsAreaCompany> getorDerIds() {
-        return  baseMapper.getorDerIds();
+        return baseMapper.getorDerIds();
     }
 
     @Override
     public Page<InsOrders> getAuditOrders(Page page, OrderQueryVo orderQueryVo) {
         /**
-        if(orderQueryVo.getQuoteStartDateStr() != null && orderQueryVo.getQuoteEndDateStr() != null){
-            orderQueryVo.setQuoteStartDateStr(orderQueryVo.getQuoteStartDateStr().toString() + " 00:00:00");
-            orderQueryVo.setQuoteEndDateStr(orderQueryVo.getQuoteEndDateStr().toString() + " 23:59:59");
-        }
-
-//        if(orderQueryVo.getAttachStartDateStr() != null && orderQueryVo.getAttachEndDateStr() != null){
-//            orderQueryVo.setAttachStartDateStr(orderQueryVo.getAttachStartDateStr().toString() + " 00:00:00");
-//            orderQueryVo.setAttachEndDateStr(orderQueryVo.getAttachEndDateStr().toString() + " 23:59:59");
-//        }
-        **/
+         if(orderQueryVo.getQuoteStartDateStr() != null && orderQueryVo.getQuoteEndDateStr() != null){
+         orderQueryVo.setQuoteStartDateStr(orderQueryVo.getQuoteStartDateStr().toString() + " 00:00:00");
+         orderQueryVo.setQuoteEndDateStr(orderQueryVo.getQuoteEndDateStr().toString() + " 23:59:59");
+         }
+
+         //        if(orderQueryVo.getAttachStartDateStr() != null && orderQueryVo.getAttachEndDateStr() != null){
+         //            orderQueryVo.setAttachStartDateStr(orderQueryVo.getAttachStartDateStr().toString() + " 00:00:00");
+         //            orderQueryVo.setAttachEndDateStr(orderQueryVo.getAttachEndDateStr().toString() + " 23:59:59");
+         //        }
+         **/
         Page<InsOrders> pendingAuditOrders = baseMapper.getAuditOrders(page, orderQueryVo);
-        pendingAuditOrders.getRecords().forEach(item->{
-            if(item.getAuditStatus() == null){
+        pendingAuditOrders.getRecords().forEach(item -> {
+            if (item.getAuditStatus() == null) {
                 item.setAuditStatus("0");
             }
         });
@@ -174,12 +187,12 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Override
     public Page<InsOrders> getAlreadyAuditOrders(Page page, OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getStartDate() != null && orderQueryVo.getEndDate() != null){
+        if (orderQueryVo.getStartDate() != null && orderQueryVo.getEndDate() != null) {
             orderQueryVo.setStartDateStr(orderQueryVo.getStartDate().toString());
             orderQueryVo.setEndDateStr(orderQueryVo.getEndDate().toString());
         }
         Page<InsOrders> alreadyAuditOrders = baseMapper.getAlreadyAuditOrders(page, orderQueryVo);
-        alreadyAuditOrders.getRecords().forEach(item->{
+        alreadyAuditOrders.getRecords().forEach(item -> {
             item.setAuditStatus(orderQueryVo.getAuditStatus());
         });
         return alreadyAuditOrders;
@@ -188,26 +201,26 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Override
     public List<InsOrders> getByUserId(String userId) {
         HashMap<String, Object> params = new HashMap<>();
-        params.put("orderStatus","3");
-        params.put("userId",userId);
+        params.put("orderStatus", "3");
+        params.put("userId", userId);
         return baseMapper.getByUserId(params);
     }
 
     @Override
     public InsOrders selectPromotionBy(String userId, int i) {
         HashMap<String, Object> params = new HashMap<>();
-        if(i==1){
-            params.put("firstUserId",userId);
+        if (i == 1) {
+            params.put("firstUserId", userId);
             return baseMapper.selectFirstPromotionBy(params);
 
         }
-        if(i==2){
-            params.put("secondUserId",userId);
+        if (i == 2) {
+            params.put("secondUserId", userId);
             return baseMapper.selectSecondPromotionBy(params);
 
         }
-        if(i==3){
-            params.put("thirdUserId",userId);
+        if (i == 3) {
+            params.put("thirdUserId", userId);
             return baseMapper.selectThirdPromotionBy(params);
 
         }
@@ -217,7 +230,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Override
     public InsAreaCompany getByInsOrderNoNew(String insOrderNo, String timeFiltering) {
         LambdaQueryWrapper<InsAreaCompany> queryWrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotEmpty(timeFiltering)){
+        if (StringUtils.isNotEmpty(timeFiltering)) {
             YearMonth targetYearMonth = YearMonth.parse(timeFiltering); // 假设timeFiltering是形如"2024-04"的字符串
             LocalDate startOfMonth = targetYearMonth.atDay(1); // 当月第一天
             LocalDate endOfMonth = targetYearMonth.atEndOfMonth(); // 当月最后一天
@@ -230,52 +243,56 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Override
     public InsOrders selectByInFeeOrderNew(InsFeeOrderNew insFeeOrderNew, int i) {
         HashMap<String, Object> params = new HashMap<>();
-        if(!ObjectUtils.isEmpty(insFeeOrderNew)){
+        if (!ObjectUtils.isEmpty(insFeeOrderNew)) {
             String userId = insFeeOrderNew.getUserId();
-            params.put("id",insFeeOrderNew.getId());
-            if(i==1){
-                params.put("firstUserId",userId);
+            params.put("id", insFeeOrderNew.getId());
+            if (i == 1) {
+                params.put("firstUserId", userId);
                 return baseMapper.selectFirstPromotionBy(params);
 
             }
-            if(i==2){
-                params.put("secondUserId",userId);
+            if (i == 2) {
+                params.put("secondUserId", userId);
                 return baseMapper.selectSecondPromotionBy(params);
 
             }
-            if(i==3){
-                params.put("thirdUserId",userId);
+            if (i == 3) {
+                params.put("thirdUserId", userId);
                 return baseMapper.selectThirdPromotionBy(params);
             }
         }
         return null;
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/8 18:06
-     *  @Description: 根据年分查询数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/8 18:06
+     * @Description: 根据年分查询数据
      */
     @Override
     public OrderVo selectEntityByinsOrderNo(String insOrderNo, String timeFiltering) {
-        return  insOrdersMapper.selectEntityByinsOrderNo(insOrderNo,timeFiltering);
+        return insOrdersMapper.selectEntityByinsOrderNo(insOrderNo, timeFiltering);
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/13 8:43
-     *  @Description:  批量更新险种信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/13 8:43
+     * @Description: 批量更新险种信息
      */
     @Override
     public HttpResult updateBatchPruductById(String id) {
-        try{
+        try {
             //List<InsAreaCompanyNew> insAreaCompanies = baseMapper.selectListByDateStr(dateStr);
-            List<InsAreaCompany> insAreaCompanies =baseMapper.selectListById(id);
-            if(insAreaCompanies!=null && insAreaCompanies.size()>0){
-                for(InsAreaCompany company :  insAreaCompanies) {
+            List<InsAreaCompany> insAreaCompanies = baseMapper.selectListById(id);
+            if (insAreaCompanies != null && insAreaCompanies.size() > 0) {
+                for (InsAreaCompany company : insAreaCompanies) {
                     //通过主订单的信息判断
-                    List<RiskInfoVo> risks = company.getRiskinfo()==null?new JSONArray().toJavaList(RiskInfoVo.class):company.getRiskinfo().toJavaList(RiskInfoVo.class);
-                    List<KindInfoVo> kinds = company.getKindinfo()==null?new JSONArray().toJavaList(KindInfoVo.class):company.getKindinfo().toJavaList(KindInfoVo.class);
+                    List<RiskInfoVo> risks = company.getRiskinfo() == null ? new JSONArray().toJavaList(RiskInfoVo.class) :
+                            company.getRiskinfo().toJavaList(RiskInfoVo.class);
+                    List<KindInfoVo> kinds = company.getKindinfo() == null ? new JSONArray().toJavaList(KindInfoVo.class) :
+                            company.getKindinfo().toJavaList(KindInfoVo.class);
                     //获取订单的险种信息
                     InsOrders insOrders = new InsOrders();
                     insOrders.productInformation(risks, kinds);
@@ -283,26 +300,29 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
                     company.setProduct(insOrders.getProduct());
                 }
                 this.updateBatchById(insAreaCompanies);
-                if(StringUtils.isNotEmpty(id)){
+                if (StringUtils.isNotEmpty(id)) {
                     return HttpResult.ok(insAreaCompanies);
                 }
             }
-        }catch(Exception e){
+        } catch (Exception e) {
             return HttpResult.error("逻辑异常");
         }
 
         return HttpResult.ok();
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/15 9:17
-     *  @Description: 赋值险种信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/15 9:17
+     * @Description: 赋值险种信息
      */
     public InsAreaCompany updateEntityPruductAndPruductid(InsAreaCompany company) {
         //通过主订单的信息判断
-        List<RiskInfoVo> risks = company.getRiskinfo()==null?new JSONArray().toJavaList(RiskInfoVo.class):company.getRiskinfo().toJavaList(RiskInfoVo.class);
-        List<KindInfoVo> kinds = company.getKindinfo()==null?new JSONArray().toJavaList(KindInfoVo.class):company.getKindinfo().toJavaList(KindInfoVo.class);
+        List<RiskInfoVo> risks = company.getRiskinfo() == null ? new JSONArray().toJavaList(RiskInfoVo.class) :
+                company.getRiskinfo().toJavaList(RiskInfoVo.class);
+        List<KindInfoVo> kinds = company.getKindinfo() == null ? new JSONArray().toJavaList(KindInfoVo.class) :
+                company.getKindinfo().toJavaList(KindInfoVo.class);
         //获取订单的险种信息
         InsOrders insOrders = new InsOrders();
         insOrders.productInformation(risks, kinds);