修改

authentication/src/main/java/com/jzg/controller/AuthController.java

@@ -389,14 +389,14 @@ public class AuthController extends BaseController {
         return HttpResult.ok(sysUserService.page(page));
     }
 
-    @Operation(summary = "获取用户权限标识")
-    @GetMapping("/getUserPer")
     /**
      * 获取当前登录用户的权限标识集合
      * 请求方式/路径：GET /auth/getUserPer
      * 入参：无
      * 返回：HttpResult<List<String>>（权限标识列表）
      */
+    @Operation(summary = "获取用户权限标识")
+    @GetMapping("/getUserPer")
     public HttpResult<List<String>> getUserPer() {
         List<String> userPerms = getUserPerms();
         return HttpResult.ok(userPerms);

commons/src/main/java/com/jzg/commons/constants/CompanyConstants.java

@@ -84,6 +84,11 @@ public enum CompanyConstants {
     public final String companyCode;
     public final String companyName;
 
+    /**
+     * 通过保司Code返回保险公司名称
+     * @param companyCode
+     * @return String
+     */
     public static String getCompanyNameByCode(String companyCode) {
         for (CompanyConstants companyConstant : CompanyConstants.values()) {
             if (companyConstant.companyCode.equals(companyCode)) {

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -22,6 +22,10 @@ public class BaseController {
     @Autowired
     RedissonClient redissonClient;
 
+    /**
+     * 获取token
+     * @return token
+     */
     public String getToken(){
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if(attributes == null){
@@ -29,10 +33,13 @@ public class BaseController {
             return null;
         }
         HttpServletRequest request = attributes.getRequest();
-
         return request.getHeader("Authorization");
     }
 
+    /**
+     * 校验token是否过期
+     * @param token
+     */
     private void valiedToken(String token){
         if (Objects.isNull(token) || Objects.isNull(redissonClient.getBucket(token).get())) {
             throw new TokenExpireException("用户登录信息过期");
@@ -118,6 +125,10 @@ public class BaseController {
         return userInfo.getString("deptId");
     }
 
+    /**
+     * 获取系统code（租户编码）
+     * @return String
+     */
     public String getUserSystemCode(){
         String authorizationHeader = getToken();
         if(authorizationHeader == null){

commons/src/main/java/com/jzg/commons/entity/costs/vo/ValidateSchemeRuleVo.java

@@ -8,6 +8,7 @@ import com.jzg.commons.entity.quote.vo.QuoteVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RList;
 import org.redisson.api.RedissonClient;
 
@@ -16,13 +17,27 @@ import java.util.Objects;
 
 import static com.jzg.commons.constants.RedisKeyConstants.DICT_REDIS_KEY;
 
+/**
+ * 方案规则验证VO
+ * 用于封装报价信息和属性链接，支持方案规则验证
+ */
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
+@Slf4j
 public class ValidateSchemeRuleVo {
+    /** 报价信息 */
     private QuoteVo quoteVo;
+    /** 方案规则属性链接列表 */
     private List<PtlSchemeRulesAttrLink> attrLinks;
 
+    /**
+     * 构建报价对象
+     * 根据方案规则过滤条件构建完整的报价信息，并转换字典值为标签
+     * 
+     * @param schemeRuleFilterVo 方案规则过滤条件
+     * @param redissonClient Redis客户端，用于获取字典数据
+     */
     public void builderQuoteVo(SchemeRuleFilterVo schemeRuleFilterVo, RedissonClient redissonClient){
         if(Objects.isNull(quoteVo)){
             quoteVo = new QuoteVo();
@@ -37,19 +52,18 @@ public class ValidateSchemeRuleVo {
         RList<SysDict> carNatureCode = redissonClient.getList(DICT_REDIS_KEY + "car_nature_code");
         this.quoteVo.getCarInfoVo().setCarNatureCode(
                 carNatureCode.stream().filter(x -> x.getValue().equals(this.quoteVo.getCarInfoVo().getCarNatureCode())).findFirst().get().getValue());
+        log.info("车辆性质代码：{}",quoteVo.getCarInfoVo().getCarNatureCode());
         //能源类型
         RList<SysDict> energyTypeCode = redissonClient.getList(DICT_REDIS_KEY + "energy_type_code");
         this.quoteVo.getCarInfoVo().setEnergyTypeCode(
                 energyTypeCode.stream().filter(x->x.getValue().equals(this.quoteVo.getCarInfoVo().getEnergyTypeCode())).findFirst().get().getValue()
         );
 
+        //车辆种类
         RList<SysDict> vehicleUseCode = redissonClient.getList(DICT_REDIS_KEY + "car_kind_code");
         this.quoteVo.getCarInfoVo().setCarKindCode(
                 vehicleUseCode.stream().filter(x->x.getValue().equals(this.quoteVo.getCarInfoVo().getCarKindCode())).findFirst().get().getValue()
         );
-
-
         System.out.printf(JSONObject.toJSONString(this.quoteVo));
-
     }
 }

commons/src/main/java/com/jzg/commons/entity/scheme/vo/PtlAgreementInsCompanyVo.java

@@ -24,12 +24,18 @@ public class PtlAgreementInsCompanyVo extends EsmInsCompany implements Serializa
 //    @Schema(description = "税源协议id")
 //    private String TaxSourceAgreementId;
 
+    /**
+     * 协议信息
+     */
     @Schema(description = "协议信息")
     private List<PtlAgreement> agreement;
 
 //    @Schema(description = "报价后的信息")
 //    private InsOrdersEditingVo.InsAreaCompanyEditingDto editingDto;
 
+    /**
+     * 投保指引
+     */
     @Schema(description = "投保指引")
     private String insGuide;
 

commons/src/main/java/com/jzg/commons/entity/system/vo/SysSystemBusPermsVo.java

@@ -38,6 +38,9 @@ public class SysSystemBusPermsVo implements Serializable {
     @Schema(description = "支持报价的保司")
     private Integer quoteCompany;
 
+    /**
+     * 支持报价的保司列表
+     */
     @Schema(description = "报价的保司")
     private List<String> quoteCompanyList = new ArrayList<>();
 
@@ -79,22 +82,27 @@ public class SysSystemBusPermsVo implements Serializable {
         this.salesmanWithdrawAccountAuditDept = sysSystemBusPerms.getSalesmanWithdrawAccountAuditDept();
         this.salesmanWithdrawPaymentAuditDept = sysSystemBusPerms.getSalesmanWithdrawPaymentAuditDept();
 
+        //报价的保司
         this.quoteCompanyList.addAll(links.stream()
                 .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.QUOTE_COMPANY_BUS.getCode()))
                 .map(link->link.getBusId()).collect(Collectors.toList()));
 
+        //订单审核指定机构
         this.orderAuditDeptList.addAll(links.stream()
                 .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.ORDER_AUDIT_DEPT_BUS.getCode()))
                 .map(link->link.getBusId()).collect(Collectors.toList()));
 
+        //业务员审核指定机构
         this.salesmanAuditDeptList.addAll(links.stream()
                .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.SALESMAN_AUDIT_DEPT.getCode()))
                .map(link->link.getBusId()).collect(Collectors.toList()));
 
+        //业务员提现账号审核指定机构
         this.salesmanWithdrawAccountAuditDeptList.addAll(links.stream()
               .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.SALESMAN_WITHDRAW_ACCOUNT_AUDIT_DEPT.getCode()))
               .map(link->link.getBusId()).collect(Collectors.toList()));
 
+        //业务员提现申请付款审核指定机构
         this.salesmanWithdrawPaymentAuditDeptList.addAll(links.stream()
              .filter(link -> link.getBusCode().equals(SystemBusPermsConstants.SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT.getCode()))
              .map(link->link.getBusId()).collect(Collectors.toList()));

gateway/src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ spring:
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/attribution/**
+            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/attributionTemplate/**,/manager/attribution/**
 
         - id: tenant_route
           uri: http://localhost:8084/

platform/src/main/java/com/jzg/controller/AttributionTemplateController.java

@@ -48,6 +48,11 @@ public class AttributionTemplateController {
         return ptlInsAttributionTemplateService.getPtlInsAttributionTemplate(ptlInsAttributionTemplateVo);
     }
 
+    /**
+     *获取协议属性信息
+     * @param agreementId
+     * @return HttpResult<PtlAgreementAttribution>
+     */
     @GetMapping("/getAgreementAttribution")
     @Operation(summary = "获取协议属性信息")
     public HttpResult<PtlAgreementAttribution> getAgreementAttribution(String agreementId) {

platform/src/main/java/com/jzg/controller/EsmInsCompanyController.java

@@ -165,10 +165,10 @@ public class EsmInsCompanyController extends BaseController {
     }
 
     /**
-     * 根据主键查询
+     * 根据主键查询保险公司信息
      *
      * @param id
-     * @return
+     * @return HttpResult<EsmInsCompany>
      */
     @Operation(summary = "根据主键查询")
     @GetMapping(value = "/findById")

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -28,6 +28,7 @@ import com.jzg.mapper.*;
 import com.jzg.service.PtlAgreementService;
 import com.jzg.service.SysSystemService;
 import com.jzg.service.SysAreaBService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,6 +44,7 @@ import java.util.stream.Collectors;
  * @author dongxin
  */
 @Service
+@Slf4j
 public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem>
     implements SysSystemService {
 
@@ -561,6 +563,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         if(busPerms.getQuoteCompany() == 2){
             companyIds = busPerms.getQuoteCompanyList();
         }
+        log.info("获取用户保司列表,companyIds:{}",companyIds);
         List<EsmInsCompany> companyList = baseMapper.getCompanyList(companyIds);
 
         // 根据用户权限获取 可使用的协议
@@ -578,7 +581,6 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         });
 
         companyList = companyList.stream().filter(x -> Objects.nonNull(x.getAgreements()) && x.getAgreements().size() > 0).collect(Collectors.toList());
-
         return companyList;
     }
 

tenant/costsorrule/src/main/java/com/jzg/costsorrule/controller/RuleController.java

@@ -11,6 +11,7 @@ import com.jzg.costsorrule.model.RuleAttrLinkVo;
 import com.jzg.commons.entity.costs.vo.ValidateSchemeRuleVo;
 import com.jzg.costsorrule.service.RuleService;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,6 +32,7 @@ import java.util.stream.Collectors;
 @Tag(name="规则校验")
 @RestController
 @RequestMapping("/validate/rule")
+@Slf4j
 public class RuleController extends BaseController {
 
     @Autowired
@@ -40,12 +42,19 @@ public class RuleController extends BaseController {
     private PtlAgreementUndwrtRulesAttrMapper ptlAgreementUndwrtRulesAttrMapper;
 
 
+    /**
+     * 规则校验
+     * @param validateSchemeRuleVo
+     * @return
+     */
     @PostMapping(value = "/validateSchemeRule")
     public HttpResult validateSchemeRule(@RequestBody ValidateSchemeRuleVo validateSchemeRuleVo){
         Map<String, List<PtlSchemeRulesAttrLink>> maps = validateSchemeRuleVo.getAttrLinks().stream().collect(Collectors.groupingBy(PtlSchemeRulesAttrLink::getSchemeId));
         HashMap<String,String> attrMap = new HashMap<>();
         //将传入的对象转换成Map对象用于校验因子
         ruleService.traverseJsonObject(JSON.parseObject(JSON.toJSONString(validateSchemeRuleVo.getQuoteVo())),attrMap);
+        log.info("attrMap:{}",attrMap);
+
         List<PtlAgreementUndwrtRulesAttr> rulesAttrs = ptlAgreementUndwrtRulesAttrMapper.selectList(new LambdaQueryWrapper<>());
 
 
@@ -58,6 +67,7 @@ public class RuleController extends BaseController {
         for (Map.Entry<String, List<RuleAttrLinkVo>> entry : converMaps.entrySet()) {
             String key = entry.getKey();
             List<RuleAttrLinkVo> vos = entry.getValue();
+            //重点 校验规则
             if(ruleService.verificationRule(attrMap,vos,rulesAttrs,logs)){
                 schemeIds.add(key);
             }

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/RuleService.java

@@ -15,8 +15,9 @@ public interface RuleService {
      * 规则校验
      * @param maps      传入表单的值
      * @param linkVos   规则因子
+     * @param rulesAttrs 规则属性
      * @param logs      日志
-     * @return
+     * @return boolean
      */
     boolean verificationRule(Map<String,String> maps, List<RuleAttrLinkVo> linkVos, List<PtlAgreementUndwrtRulesAttr> rulesAttrs, StringBuilder logs);
 

tenant/costsorrule/src/main/java/com/jzg/costsorrule/service/impl/RuleServiceImpl.java

@@ -8,6 +8,7 @@ import com.jzg.costsorrule.constants.AttrTypeConstant;
 import com.jzg.costsorrule.constants.OperatorConstant;
 import com.jzg.costsorrule.model.RuleAttrLinkVo;
 import com.jzg.costsorrule.service.RuleService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -17,45 +18,46 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 public class RuleServiceImpl implements RuleService {
 
     /**
      * 预处理数据
+     *
      * @param attrMap
      * @param linkVos
      * @return
      */
-    private void dealData(Map<String,String> attrMap, List<RuleAttrLinkVo> linkVos){
+    private void dealData(Map<String, String> attrMap, List<RuleAttrLinkVo> linkVos) {
         //需要截取的字符串
-        Set<String> idNumbers = Set.of("OwnersInfoIdentifyNumber", "ApplicantIDNumber", "InsuredIDNumber","LicenseNo")
+        Set<String> idNumbers = Set.of("OwnersInfoIdentifyNumber", "ApplicantIDNumber", "InsuredIDNumber", "LicenseNo")
                 .stream().map(String::toLowerCase).collect(Collectors.toSet());
         //boolean 类型的转换
         Set<String> inputTags = Set.of("NewEnergyMark")
                 .stream().map(String::toLowerCase).collect(Collectors.toSet());
-        linkVos.forEach(vo->{
-            if(idNumbers.contains(vo.getAttrCode())){
+        linkVos.forEach(vo -> {
+            if (idNumbers.contains(vo.getAttrCode())) {
                 String value = attrMap.get(vo.getAttrCode().toLowerCase());
                 String substring = value.substring(0, vo.getMin().length());
-                attrMap.put(vo.getAttrCode(),substring);
+                attrMap.put(vo.getAttrCode(), substring);
             }
-            if(inputTags.contains(vo.getAttrCode())){
+            if (inputTags.contains(vo.getAttrCode())) {
                 String value = attrMap.get(vo.getAttrCode().toLowerCase());
-                if("false".equals(value)){
-                    attrMap.put(vo.getAttrCode(),"0");
-                }else if("true".equals(value)){
-                    attrMap.put(vo.getAttrCode(),"1");
+                if ("false".equals(value)) {
+                    attrMap.put(vo.getAttrCode(), "0");
+                } else if ("true".equals(value)) {
+                    attrMap.put(vo.getAttrCode(), "1");
                 }
             }
         });
 
 
-
     }
 
     @Override
-    public boolean verificationRule(Map<String,String> maps, List<RuleAttrLinkVo> linkVos,List<PtlAgreementUndwrtRulesAttr> rulesAttrs, StringBuilder logs) {
+    public boolean verificationRule(Map<String, String> maps, List<RuleAttrLinkVo> linkVos, List<PtlAgreementUndwrtRulesAttr> rulesAttrs, StringBuilder logs) {
         //预处理数据
-        dealData(maps,linkVos);
+        dealData(maps, linkVos);
         //匹配费用因子
         for (int i = 0; i < linkVos.size(); i++) {
             //判断是否匹配
@@ -65,10 +67,10 @@ public class RuleServiceImpl implements RuleService {
             String attrValue = maps.get(linkVos.get(i).getAttrCode().toLowerCase());
             int finalI = i;
             PtlAgreementUndwrtRulesAttr rulesAttr = rulesAttrs.stream().filter(value -> value.getAttrCode().toLowerCase().equals(linkVos.get(finalI).getAttrCode().toLowerCase())).findFirst().orElse(null);
-            if(Objects.isNull(attrValue) || Objects.isNull(rulesAttr)){
+            if (Objects.isNull(attrValue) || Objects.isNull(rulesAttr)) {
                 return false;
             }
-            if (!judgements(attrValue, linkVos.get(i),rulesAttr, logs)) {
+            if (!judgements(attrValue, linkVos.get(i), rulesAttr, logs)) {
                 //返回 费用id   如果需要匹配非车的情况  将返回值返回list 后赛选
                 return false;
             }
@@ -80,25 +82,20 @@ public class RuleServiceImpl implements RuleService {
 
     /**
      * 匹配费用因子
+     *
      * @param value     表单值
      * @param linkVo    费用因子
      * @param rulesAttr 规则因子
      * @param logs      日志
      * @return
      */
-    private boolean judgements(String value,
-                               RuleAttrLinkVo linkVo,
-                               PtlAgreementUndwrtRulesAttr rulesAttr,
-                               StringBuilder logs) {
-
+    private boolean judgements(String value, RuleAttrLinkVo linkVo, PtlAgreementUndwrtRulesAttr rulesAttr, StringBuilder logs) {
         boolean useFlag = attrEqual(value, linkVo, rulesAttr);
         return useFlag;
     }
 
 
-
-
-    private boolean attrEqual(String value,RuleAttrLinkVo linkVo,PtlAgreementUndwrtRulesAttr rulesAttr) {
+    private boolean attrEqual(String value, RuleAttrLinkVo linkVo, PtlAgreementUndwrtRulesAttr rulesAttr) {
         if (rulesAttr.getAttrType().equals(AttrTypeConstant.CHECKBOX.getCode())) {
             return checkBoxEqual(linkVo, value);
         } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.INPUTNUMBER.getCode())) {
@@ -113,7 +110,7 @@ public class RuleServiceImpl implements RuleService {
             return selectEqual(linkVo, value);
         } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.RADIO.getCode())) {
             return radioEqual(linkVo, value);
-        } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.DATETIME.getCode())){
+        } else if (rulesAttr.getAttrType().equals(AttrTypeConstant.DATETIME.getCode())) {
             return dateTimeEqual(linkVo, value);
         }
 
@@ -173,7 +170,6 @@ public class RuleServiceImpl implements RuleService {
         equalsMap.add("SyCharacterBasedRating");
 
 
-
         //equest 等于判断
 //        if(equalsMap.contains(linkVo.getAttrCode())){
 //            boolean b = value.anyMatch(value::equals);
@@ -219,18 +215,18 @@ public class RuleServiceImpl implements RuleService {
         return minValue == valueBool;
     }
 
-    public boolean dateTimeEqual(RuleAttrLinkVo linkVo, String value){
+    public boolean dateTimeEqual(RuleAttrLinkVo linkVo, String value) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        if(Objects.isNull(value) || value.equals("")){
+        if (Objects.isNull(value) || value.equals("")) {
             return false;
         }
-        LocalDateTime v = LocalDateTime.parse(value,formatter);
-        LocalDateTime min = null,max = null;
-        if(!Objects.isNull(linkVo.getMin())){
-            min = LocalDateTime.parse(linkVo.getMin(),formatter);
+        LocalDateTime v = LocalDateTime.parse(value, formatter);
+        LocalDateTime min = null, max = null;
+        if (!Objects.isNull(linkVo.getMin())) {
+            min = LocalDateTime.parse(linkVo.getMin(), formatter);
         }
-        if(!Objects.isNull(linkVo.getMax())){
-            max = LocalDateTime.parse(linkVo.getMax(),formatter);
+        if (!Objects.isNull(linkVo.getMax())) {
+            max = LocalDateTime.parse(linkVo.getMax(), formatter);
         }
 
         //统一处理数值
@@ -262,7 +258,7 @@ public class RuleServiceImpl implements RuleService {
     //region  表单转换成json对象
 
     @Override
-    public void traverseJsonObject(JSONObject jsonObject, HashMap<String,String> attrMap) {
+    public void traverseJsonObject(JSONObject jsonObject, HashMap<String, String> attrMap) {
         if (Objects.isNull(jsonObject)) {
             return;
         }
@@ -271,35 +267,35 @@ public class RuleServiceImpl implements RuleService {
             String key = entry.getKey();
             Object value = entry.getValue();
 
-            if(!(value instanceof JSONObject) && !(value instanceof JSONArray)){
-                attrMap.put(key.toLowerCase(),value.toString());
+            if (!(value instanceof JSONObject) && !(value instanceof JSONArray)) {
+                attrMap.put(key.toLowerCase(), value.toString());
             }
 
             // 如果值是嵌套的 JSONObject，递归遍历
             if (value instanceof JSONObject) {
-                if(isUserKey(key))
-                {
-                    traverseJsonObject((JSONObject) value,attrMap,key);
-                }else{
-                    traverseJsonObject((JSONObject) value,attrMap);
+                if (isUserKey(key)) {
+                    traverseJsonObject((JSONObject) value, attrMap, key);
+                } else {
+                    traverseJsonObject((JSONObject) value, attrMap);
                 }
             }
 
             // 如果值是嵌套的数组（JSONArray），遍历数组
             if (value instanceof JSONArray) {
                 System.out.println("Nested JSONArray for key: " + key);
-                traverseJsonArray((JSONArray) value,attrMap);
+                traverseJsonArray((JSONArray) value, attrMap);
             }
         }
     }
 
     /**
      * 处理车主 投保人 被保人信息
+     *
      * @param jsonObject
      * @param attrMap
      * @param parentKey
      */
-    public void traverseJsonObject(JSONObject jsonObject,HashMap<String,String> attrMap,String parentKey) {
+    public void traverseJsonObject(JSONObject jsonObject, HashMap<String, String> attrMap, String parentKey) {
         if (Objects.isNull(jsonObject)) {
             return;
         }
@@ -307,13 +303,13 @@ public class RuleServiceImpl implements RuleService {
             String key = entry.getKey();
             Object value = entry.getValue();
 
-            if(!(value instanceof JSONObject) && !(value instanceof JSONArray)){
-                attrMap.put(parentKey.toLowerCase() + key.toLowerCase(),value.toString());
+            if (!(value instanceof JSONObject) && !(value instanceof JSONArray)) {
+                attrMap.put(parentKey.toLowerCase() + key.toLowerCase(), value.toString());
             }
         }
     }
 
-    public void traverseJsonArray(JSONArray jsonArray,HashMap<String,String> attrMap) {
+    public void traverseJsonArray(JSONArray jsonArray, HashMap<String, String> attrMap) {
         if (jsonArray == null) {
             System.out.println("JSONArray is null.");
             return;
@@ -329,20 +325,20 @@ public class RuleServiceImpl implements RuleService {
             // 如果元素是嵌套的 JSONObject，递归遍历
             if (element instanceof JSONObject) {
                 System.out.println("Nested JSONObject in array at index: " + i);
-                traverseJsonObject((JSONObject) element,attrMap);
+                traverseJsonObject((JSONObject) element, attrMap);
             }
 
             // 如果元素是嵌套的数组（JSONArray），递归遍历
             if (element instanceof JSONArray) {
                 System.out.println("Nested JSONArray in array at index: " + i);
-                traverseJsonArray((JSONArray) element,attrMap);
+                traverseJsonArray((JSONArray) element, attrMap);
             }
         }
     }
 
     //判断是否是车主 投保人 被保人信息
-    public boolean isUserKey(String key){
-        if(key.equals("ownersInfo") || key.equals("policyHolderInfo") || key.equals("insuredPersonInfo")){
+    public boolean isUserKey(String key) {
+        if (key.equals("ownersInfo") || key.equals("policyHolderInfo") || key.equals("insuredPersonInfo")) {
             return true;
         }
         return false;
@@ -352,14 +348,14 @@ public class RuleServiceImpl implements RuleService {
 
 
     @Override
-    public Map<String, List<RuleAttrLinkVo>> convertSchemeRule(Map<String, List<PtlSchemeRulesAttrLink>> schemeRules){
+    public Map<String, List<RuleAttrLinkVo>> convertSchemeRule(Map<String, List<PtlSchemeRulesAttrLink>> schemeRules) {
         Map<String, List<RuleAttrLinkVo>> convertMaps = new HashMap<>();
         for (Map.Entry<String, List<PtlSchemeRulesAttrLink>> entry : schemeRules.entrySet()) {
             String key = entry.getKey();
             List<RuleAttrLinkVo> vos = new ArrayList<>();
             List<PtlSchemeRulesAttrLink> values = entry.getValue();
 
-            values.forEach(value->{
+            values.forEach(value -> {
                 RuleAttrLinkVo vo = new RuleAttrLinkVo();
                 vo.setMin(value.getMin());
                 vo.setMax(value.getMax());
@@ -368,7 +364,7 @@ public class RuleServiceImpl implements RuleService {
                 vo.setMinArray(value.getMinArray().toArray(new String[0]));
                 vos.add(vo);
             });
-            convertMaps.put(key,vos);
+            convertMaps.put(key, vos);
         }
         return convertMaps;
     }

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/service/impl/BoHaiApiRequestImpl.java

@@ -28,6 +28,7 @@ import com.jzg.commons.entity.quote.vo.base.OrderBase;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.utils.DateUtil;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
@@ -42,6 +43,7 @@ import java.util.stream.Collectors;
  **/
 @QuoteApiService(value = InsuranceCode.INSURANCE_BPIC)
 @RequiredArgsConstructor
+@Slf4j
 public class BoHaiApiRequestImpl implements BoHaiApiRequest {
 
     private final BoHaiApiOrderService boHaiApiOrderService;
@@ -51,6 +53,7 @@ public class BoHaiApiRequestImpl implements BoHaiApiRequest {
     private final PlatformClient platformClient;
 
     public String getApiUrl(String companyId) {
+        log.info("companyId：{}", companyId);
         // 获取保司配置url地址
         HttpResult<PtlAgreementUrl> ptlAgreementUrl = platformClient.getAgreementUrlByCompanyId(companyId);
         return ptlAgreementUrl.getData().getUrl();
@@ -126,7 +129,8 @@ public class BoHaiApiRequestImpl implements BoHaiApiRequest {
         OrderBase order = quoteVo.getOrder();
         AttributionInformationVo attributionInformationVo = order.getAttributionInformationVo();
         //配置信息
-        String url = getApiUrl(order.getInsuranceCompanyId());
+        //String url = getApiUrl(order.getInsuranceCompanyId());
+        String url = getApiUrl(order.getInsuranceCompanyCode());
         BoHaiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(BoHaiConfigureParameters.class, attributionInformationVo.getConfigInfo());
 
         // 生成订单号
@@ -135,6 +139,7 @@ public class BoHaiApiRequestImpl implements BoHaiApiRequest {
         try {
             generateOrderNoResponse = boHaiRequestApiComponent.generateOrderNo(generateOrderNoRequest, parameters.getSysSourceCode(),url);
         } catch (Exception e) {
+            e.printStackTrace();
             throw new RuntimeException(e);
         }
         String orderNo = generateOrderNoResponse.getData().getOrderNo();

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/component/BoHaiBuildingAttributionInformation.java

@@ -0,0 +1,44 @@
+package com.jzg.quotation.bohai.crawler.component;
+
+import com.jzg.quotation.bohai.crawler.entity.BoHaiCrawlerConfigureParameters;
+import com.jzg.quotation.bohai.crawler.entity.request.BoHaiCrawlerChannelPackagesRequest;
+import com.jzg.quotation.bohai.crawler.entity.request.BoHaiCrawlerCompaniesRequest;
+import com.jzg.quotation.bohai.crawler.entity.request.quote.ProposalInfoDTO;
+import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerChannelPackagesResponse;
+import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerCompaniesResponse;
+import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerGetSaleInfoResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description: 渤海财险 归属配置
+ * @author: wenks
+ * @date: 2025/3/3 11:59
+ **/
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class BoHaiBuildingAttributionInformation {
+
+    private final BoHaiCrawlerRequestComponent boHaiCrawlerRequestComponent;
+
+    public ProposalInfoDTO build(BoHaiCrawlerConfigureParameters parameters, String operatorCode, HttpHeaders headers) {
+        try {
+            // 机构查询
+            BoHaiCrawlerCompaniesRequest boHaiCrawlerCompaniesRequest = new BoHaiCrawlerCompaniesRequest(parameters.getCDptCde(), parameters.getLoginCompany(), operatorCode);
+            BoHaiCrawlerCompaniesResponse.ListDTO companies = boHaiCrawlerRequestComponent.companies(boHaiCrawlerCompaniesRequest, parameters.getCDptCde(), headers);
+            // 获取渠道信息
+            BoHaiCrawlerGetSaleInfoResponse saleInfo = boHaiCrawlerRequestComponent.getSaleInfo(operatorCode, headers);
+            // 渠道套餐查询
+            BoHaiCrawlerChannelPackagesRequest boHaiCrawlerChannelPackagesRequest = new BoHaiCrawlerChannelPackagesRequest(parameters, operatorCode);
+            BoHaiCrawlerChannelPackagesResponse boHaiCrawlerChannelPackagesResponse = boHaiCrawlerRequestComponent.channelPackages(boHaiCrawlerChannelPackagesRequest, parameters.getChannelPackages(), headers);
+            return new ProposalInfoDTO(companies, boHaiCrawlerChannelPackagesResponse, saleInfo, parameters.getLoginCompany());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+}

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/component/BoHaiCrawlerRequestComponent.java

@@ -19,7 +19,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.reactive.function.client.WebClient;
 
 import java.util.List;
 import java.util.UUID;
@@ -56,7 +55,7 @@ public class BoHaiCrawlerRequestComponent {
         // 登录存入缓存当中
         BoHaiCrawlerAuthenticateRequest request = new BoHaiCrawlerAuthenticateRequest(captcha, username, password);
         BoHaiCrawlerBaseRequest crawlerBaseRequest = new BoHaiCrawlerBaseRequest(request);
-        return requestComponent.objectPost(RequestUrl.AUTHENTICATE.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), crawlerBaseRequest, BoHaiCrawlerBaseResponse.class);
+        return requestComponent.objectPost(RequestUrl.AUTHENTICATE.getRequestUrl(""), crawlerBaseRequest, BoHaiCrawlerBaseResponse.class);
     }
 
     /**
@@ -72,7 +71,7 @@ public class BoHaiCrawlerRequestComponent {
         MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
         map.add("imgId", UUID.randomUUID().toString().replaceAll("-", ""));
         // 请求
-        BoHaiCrawlerBaseResponse boHaiCrawlerBaseResponse = requestComponent.requestGET(RequestUrl.CAPTCHA.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), map, "", BoHaiCrawlerBaseResponse.class);
+        BoHaiCrawlerBaseResponse boHaiCrawlerBaseResponse = requestComponent.requestGET(RequestUrl.CAPTCHA.getRequestUrl(""), map, "", BoHaiCrawlerBaseResponse.class);
         BoHaiCrawlerCaptchaResponse boHaiCrawlerCaptchaResponse = DESEncryption.decryptStrToObject(boHaiCrawlerBaseResponse.getResult(), BoHaiCrawlerCaptchaResponse.class);
         // 识别验证码
         String s = exteriorUtilsRequest.captchaIdentify(boHaiCrawlerCaptchaResponse.getImg());
@@ -131,7 +130,7 @@ public class BoHaiCrawlerRequestComponent {
      * @return
      */
     public String createToken(String operatorCode, HttpHeaders headers) {
-        String url = RequestUrl.CREATE_TOKEN.getRequestUrl(boHaiCrawlerProperties.getBaseUrl());
+        String url = RequestUrl.CREATE_TOKEN.getRequestUrl("");
         MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
         map.add("operatorCode", operatorCode);
         BoHaiCrawlerBaseResponse daJiaCrawlerBaseResponse = requestComponent.get(url, map, "", BoHaiCrawlerBaseResponse.class, headers);
@@ -161,7 +160,8 @@ public class BoHaiCrawlerRequestComponent {
     public <BoHaiResponse> BoHaiResponse request(CrawlerRequestUrlStandard crawlerRequestUrlStandard, Object request, Class<BoHaiResponse> responseClass, HttpHeaders headers) {
         // 参数加密
         BoHaiCrawlerBaseRequest crawlerBaseRequest = new BoHaiCrawlerBaseRequest(request);
-        ResponseEntity<BoHaiCrawlerBaseResponse> responseEntity = requestComponent.objectPost(crawlerRequestUrlStandard.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), crawlerBaseRequest, BoHaiCrawlerBaseResponse.class, headers);
+        //ResponseEntity<BoHaiCrawlerBaseResponse> responseEntity = requestComponent.objectPost("", crawlerBaseRequest, BoHaiCrawlerBaseResponse.class, headers);
+        ResponseEntity<BoHaiCrawlerBaseResponse> responseEntity = requestComponent.objectPost(RequestUrl.CAR.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), crawlerBaseRequest, BoHaiCrawlerBaseResponse.class, headers);
         BoHaiCrawlerBaseResponse boHaiCrawlerBaseResponse = responseEntity.getBody();
         AssertionUtils.isEmpty(boHaiCrawlerBaseResponse, "请求异常请重试");
         if (!"200".equals(boHaiCrawlerBaseResponse.getCode())) {
@@ -172,8 +172,33 @@ public class BoHaiCrawlerRequestComponent {
         return JSON.parseObject(decrypt, responseClass);
     }
 
+
     /**
-     * 获取机构信息
+     * 请求（请求参数没有加密）
+     *
+     * @param crawlerRequestUrlStandard
+     * @param request
+     * @param responseClass
+     * @param headers
+     * @return BoHaiResponse
+     */
+    public <BoHaiResponse> BoHaiResponse request1(CrawlerRequestUrlStandard crawlerRequestUrlStandard, Object request, Class<BoHaiResponse> responseClass, HttpHeaders headers) {
+        // 参数
+        BoHaiCrawlerBaseRequest1 crawlerBaseRequest = new BoHaiCrawlerBaseRequest1(request);
+        //ResponseEntity<BoHaiCrawlerBaseResponse> responseEntity = requestComponent.objectPost("", crawlerBaseRequest, BoHaiCrawlerBaseResponse.class, headers);
+        ResponseEntity<BoHaiCrawlerBaseResponse1> responseEntity = requestComponent.objectPost(RequestUrl.CAR.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), crawlerBaseRequest, BoHaiCrawlerBaseResponse1.class, headers);
+        BoHaiCrawlerBaseResponse1 boHaiCrawlerBaseResponse = responseEntity.getBody();
+        log.info("boHaiCrawlerBaseResponse参数的值：{}",JSON.toJSONString(boHaiCrawlerBaseResponse));
+
+        AssertionUtils.isEmpty(boHaiCrawlerBaseResponse, "请求异常请重试");
+        if (!"200".equals(boHaiCrawlerBaseResponse.getCode())) {
+            throw new SystemException(boHaiCrawlerBaseResponse.getMsg());
+        }
+        return JSON.parseObject("", responseClass);
+    }
+
+    /**
+     * 获取机构信息（目前这个没有用）
      *
      * @param request 获取机构信息 请求实体
      * @param cDptCde 机构编码
@@ -182,7 +207,8 @@ public class BoHaiCrawlerRequestComponent {
      */
     public BoHaiCrawlerCompaniesResponse.ListDTO companies(BoHaiCrawlerCompaniesRequest request, String cDptCde, HttpHeaders headers) {
         MultiValueMap<String, String> multiValueMap = RequestObjectConversion.convertMultiValueStringMap(request);
-        BoHaiCrawlerBaseResponse response = requestComponent.get(RequestUrl.COMPANIES.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), multiValueMap, "", BoHaiCrawlerBaseResponse.class, headers);
+        //BoHaiCrawlerBaseResponse response = requestComponent.get(RequestUrl.COMPANIES.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), multiValueMap, "", BoHaiCrawlerBaseResponse.class, headers);
+        BoHaiCrawlerBaseResponse response = requestComponent.get("", multiValueMap, "", BoHaiCrawlerBaseResponse.class, headers);
         BoHaiCrawlerCompaniesResponse daJiaCrawlerCompaniesResponse = DESEncryption.decryptStrToObject(response.getResult(), BoHaiCrawlerCompaniesResponse.class);
 
         return daJiaCrawlerCompaniesResponse.getList()
@@ -190,7 +216,6 @@ public class BoHaiCrawlerRequestComponent {
                 .filter(x -> cDptCde.equals(x.getCDptCde()))
                 .findFirst()
                 .orElseThrow(() -> new SystemException(""));
-
     }
 
 
@@ -203,7 +228,7 @@ public class BoHaiCrawlerRequestComponent {
      * @return 获取渠道信息响应
      */
     public BoHaiCrawlerGetSaleInfoResponse getSaleInfo(String operatorCode, HttpHeaders headers) {
-        String url = RequestUrl.GET_SALE_INFO.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()) + operatorCode;
+        String url = RequestUrl.GET_SALE_INFO.getRequestUrl("") + operatorCode;
         MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
         map.add("operatorCode", operatorCode);
         BoHaiCrawlerBaseResponse daJiaCrawlerBaseResponse = requestComponent.get(url, map, "", BoHaiCrawlerBaseResponse.class, headers);
@@ -220,7 +245,7 @@ public class BoHaiCrawlerRequestComponent {
      */
     public BoHaiCrawlerChannelPackagesResponse channelPackages(BoHaiCrawlerChannelPackagesRequest request, String packagesName, HttpHeaders headers) {
         MultiValueMap<String, String> describe = RequestObjectConversion.convertMultiValueStringMap(request);
-        BoHaiCrawlerBaseResponse daJiaCrawlerBaseResponse = requestComponent.get(RequestUrl.CHANNEL_PACKAGES.getRequestUrl(boHaiCrawlerProperties.getBaseUrl()), describe, "", BoHaiCrawlerBaseResponse.class, headers);
+        BoHaiCrawlerBaseResponse daJiaCrawlerBaseResponse = requestComponent.get("", describe, "", BoHaiCrawlerBaseResponse.class, headers);
         List<BoHaiCrawlerChannelPackagesResponse> responses = DESEncryption.decryptStrToObjectList(daJiaCrawlerBaseResponse.getResult(), BoHaiCrawlerChannelPackagesResponse.class);
         return responses.stream()
                 .filter(x -> packagesName.equals(x.getName()))
@@ -236,7 +261,7 @@ public class BoHaiCrawlerRequestComponent {
      * @return BoHaiCrawlerCarResponse 车型列表
      */
     public BoHaiCrawlerCarResponse car(BoHaiCrawlerCarRequest boHaiCrawlerCarRequest, HttpHeaders headers) {
-        return request(RequestUrl.CAR, boHaiCrawlerCarRequest, BoHaiCrawlerCarResponse.class, headers);
+        return request1(RequestUrl.CAR, boHaiCrawlerCarRequest, BoHaiCrawlerCarResponse.class, headers);
     }
 
     /**

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/component/BuildingAttributionInformation.java

@@ -1,39 +0,0 @@
-package com.jzg.quotation.bohai.crawler.component;
-
-import com.jzg.quotation.bohai.crawler.entity.BoHaiCrawlerConfigureParameters;
-import com.jzg.quotation.bohai.crawler.entity.request.BoHaiCrawlerChannelPackagesRequest;
-import com.jzg.quotation.bohai.crawler.entity.request.BoHaiCrawlerCompaniesRequest;
-import com.jzg.quotation.bohai.crawler.entity.request.quote.ProposalInfoDTO;
-import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerChannelPackagesResponse;
-import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerCompaniesResponse;
-import com.jzg.quotation.bohai.crawler.entity.response.BoHaiCrawlerGetSaleInfoResponse;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Component;
-
-/**
- * @description: 渤海财险 归属配置
- * @author: wenks
- * @date: 2025/3/3 11:59
- **/
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class BuildingAttributionInformation {
-
-    private final BoHaiCrawlerRequestComponent boHaiCrawlerRequestComponent;
-
-    public ProposalInfoDTO build(BoHaiCrawlerConfigureParameters parameters, String operatorCode, HttpHeaders headers) {
-        // 机构查询
-        BoHaiCrawlerCompaniesRequest boHaiCrawlerCompaniesRequest = new BoHaiCrawlerCompaniesRequest(parameters.getCDptCde(), parameters.getLoginCompany(), operatorCode);
-        BoHaiCrawlerCompaniesResponse.ListDTO companies = boHaiCrawlerRequestComponent.companies(boHaiCrawlerCompaniesRequest, parameters.getCDptCde(), headers);
-        // 获取渠道信息
-        BoHaiCrawlerGetSaleInfoResponse saleInfo = boHaiCrawlerRequestComponent.getSaleInfo(operatorCode, headers);
-        // 渠道套餐查询
-        BoHaiCrawlerChannelPackagesRequest boHaiCrawlerChannelPackagesRequest = new BoHaiCrawlerChannelPackagesRequest(parameters, operatorCode);
-        BoHaiCrawlerChannelPackagesResponse boHaiCrawlerChannelPackagesResponse = boHaiCrawlerRequestComponent.channelPackages(boHaiCrawlerChannelPackagesRequest, parameters.getChannelPackages(), headers);
-        return new ProposalInfoDTO(companies, boHaiCrawlerChannelPackagesResponse, saleInfo, parameters.getLoginCompany());
-    }
-
-}

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/config/RestTemplateConfig.java

@@ -1,19 +0,0 @@
-package com.jzg.quotation.bohai.crawler.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @description: RestTemplate配置
- * @author:
- * @date:
- **/
-@Configuration
-public class RestTemplateConfig {
-
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-}

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/constant/enums/RequestUrl.java

@@ -21,8 +21,9 @@ public enum RequestUrl implements CrawlerRequestUrlStandard {
     GET_SALE_INFO("/api_vhl_prod/api/getSaleInfo/", "获取账号信息"),
     COMPANIES("/api_vhl_prod/api/companies", "承保机构"),
     CHANNEL_PACKAGES("/api_vhl_prod/api/default/package/list", "渠道套餐"),
+
     // 报价
-    CAR("/api_vhl_prod/api/car", "车型查询"),
+    CAR("/app-carmodelinfo/netins/jyPreCarModelFill/queryJYPreCarModelFill", "车型查询"),
     VEHICLECONFIRMATION("","车辆确认"),
     ACTUAL_VALUE("/api_vhl_prod/api/actualvalue", "计算折旧价格"),
     PRICE("/api_vhl_prod/api/price", "报价"),

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/request/BoHaiCrawlerBaseRequest1.java

@@ -0,0 +1,30 @@
+package com.jzg.quotation.bohai.crawler.entity.request;
+
+import com.jzg.quotation.bohai.crawler.util.DESEncryption;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @description: 渤海财险 爬虫 基础请求体（数据没有加密）
+ * @author:
+ * @date:
+ **/
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class BoHaiCrawlerBaseRequest1 implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2304961708114602898L;
+
+    private String data;
+
+    public BoHaiCrawlerBaseRequest1(Object data) {
+        //this.data = DESEncryption.encryptObjectToStr(data);
+        this.data = data.toString();
+    }
+}

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/request/BoHaiCrawlerCarRequest.java

@@ -8,6 +8,11 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 import java.io.Serializable;
 
+/**
+ * 渤海保险爬虫车辆查询请求实体
+ *
+ * @author system
+ */
 @NoArgsConstructor
 @Data
 public class BoHaiCrawlerCarRequest implements Serializable {
@@ -15,9 +20,11 @@ public class BoHaiCrawlerCarRequest implements Serializable {
     @Serial
     private static final long serialVersionUID = 3887879260967024252L;
 
+    /** 页码 */
     @JsonProperty("pageNo")
     private Integer pageNo;
 
+    /** 每页大小 */
     @JsonProperty("pageSize")
     private Integer pageSize;
     /**
@@ -26,6 +33,7 @@ public class BoHaiCrawlerCarRequest implements Serializable {
     @JsonProperty("vehicleName")
     private String vehicleName;
 
+    /** 地区代码 */
     @JsonProperty("areaCode")
     private String areaCode;
     /**
@@ -34,6 +42,7 @@ public class BoHaiCrawlerCarRequest implements Serializable {
     @JsonProperty("orderNo")
     private String orderNo;
 
+    /** 部门代码 */
     @JsonProperty("dptCode")
     private String dptCode;
     /**
@@ -57,9 +66,18 @@ public class BoHaiCrawlerCarRequest implements Serializable {
     @JsonProperty("queryMod")
     private String queryMod;
 
+    /** 操作员代码 */
     @JsonProperty("operatorCode")
     private String operatorCode;
 
+    /**
+     * 构造函数
+     *
+     * @param carInfoVo 车辆信息
+     * @param areaCode 地区代码
+     * @param dptCode 部门代码
+     * @param operatorCode 操作员代码
+     */
     public BoHaiCrawlerCarRequest(CarInfoVo carInfoVo, String areaCode, String dptCode, String operatorCode) {
         this.pageNo = 1;
         this.pageSize = 30;

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/request/quote/ProposalInfoDTO.java

@@ -10,6 +10,12 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 import java.io.Serializable;
 
+/**
+ * 渤海保险报价投保信息DTO
+ * 用于封装保险报价请求中的投保相关信息
+ * 
+ * @author system
+ */
 @NoArgsConstructor
 @Data
 public class ProposalInfoDTO implements Serializable {
@@ -17,274 +23,542 @@ public class ProposalInfoDTO implements Serializable {
     @Serial
     private static final long serialVersionUID = -607088232798809605L;
 
+    /** 订单号 */
     @JsonProperty("orderNo")
     private String orderNo;
+    
+    /** 行驶证号 */
     @JsonProperty("drivingsNo")
     private String drivingsNo;
-    /**
-     * 联合出单类型 1 商业 2 单交
-     */
+    
+    /** 联合出单类型 1-商业 2-单交 */
     @JsonProperty("mark")
     private String mark;
+    
+    /** 交强险标识 */
     @JsonProperty("jyMark")
     private String jyMark;
+    
+    /** 公司部门代码 */
     @JsonProperty("copdpt")
     private String copdpt;
+    
+    /** 城市代码 */
     @JsonProperty("cityCode")
     private String cityCode;
+    
+    /** 登录公司 */
     @JsonProperty("loginCompany")
     private String loginCompany;
+    
+    /** 部门关联代码 */
     @JsonProperty("dptRelCde")
     private String dptRelCde;
+    
+    /** 状态 */
     @JsonProperty("status")
     private String status;
+    
+    /** 总保费 */
     @JsonProperty("totalPremium")
     private String totalPremium;
+    
+    /** 操作日期 */
     @JsonProperty("operateDate")
     private String operateDate;
+    
+    /** 电子保单必要性 */
     @JsonProperty("nessElectronic")
     private String nessElectronic;
+    
+    /** 电子保单完成状态 */
     @JsonProperty("electronicFinish")
     private String electronicFinish;
+    
+    /** 发送消息 */
     @JsonProperty("sendMessage")
     private String sendMessage;
+    
+    /** 电子保单 */
     @JsonProperty("electronicPolicy")
     private String electronicPolicy;
+    
+    /** 销售经理ID */
     @JsonProperty("saleManagerId")
     private String saleManagerId;
+    
+    /** 销售经理姓名 */
     @JsonProperty("saleManagerName")
     private String saleManagerName;
+    
+    /** 车牌号 */
     @JsonProperty("licenseNumber")
     private String licenseNumber;
+    
+    /** 组合产品代码 */
     @JsonProperty("combinedProductCode")
     private String combinedProductCode;
+    
+    /** 承保公司 */
     @JsonProperty("underWriteCompany")
     private String underWriteCompany;
+    
+    /** 承保机构名称 */
     @JsonProperty("underwritingAgencyName")
     private String underwritingAgencyName;
+    
+    /** 维修代码 */
     @JsonProperty("repairCode")
     private String repairCode;
+    
+    /** 维修名称 */
     @JsonProperty("repairName")
     private String repairName;
+    
+    /** 业务来源 */
     @JsonProperty("businessSource")
     private String businessSource;
+    
+    /** 机构代码 */
     @JsonProperty("organizationCode")
     private String organizationCode;
+    
+    /** 年份代码 */
     @JsonProperty("yearCode")
     private String yearCode;
+    
+    /** 序列代码 */
     @JsonProperty("sequenceCode")
     private String sequenceCode;
+    
+    /** 字符代码 */
     @JsonProperty("characterCode")
     private String characterCode;
+    
+    /** 代理人 */
     @JsonProperty("agent")
     private String agent;
+    
+    /** 代理人姓名 */
     @JsonProperty("agentName")
     private String agentName;
+    
+    /** 推荐人 */
     @JsonProperty("referrer")
     private String referrer;
+    
+    /** 推荐人身份证号 */
     @JsonProperty("referrerIdentifyNo")
     private String referrerIdentifyNo;
+    
+    /** 推荐人姓名 */
     @JsonProperty("referrerName")
     private String referrerName;
+    
+    /** 渠道代码 */
     @JsonProperty("channelCode")
     private String channelCode;
+    
+    /** 渠道名称 */
     @JsonProperty("channelName")
     private String channelName;
+    
+    /** 维修厂 */
     @JsonProperty("repairFactory")
     private String repairFactory;
+    
+    /** 维修厂名称 */
     @JsonProperty("repairFactoryName")
     private String repairFactoryName;
+    
+    /** 客服代码 */
     @JsonProperty("customeServiceCode")
     private String customeServiceCode;
+    
+    /** 销售代码 */
     @JsonProperty("saleCode")
     private String saleCode;
+    
+    /** 销售姓名 */
     @JsonProperty("saleName")
     private String saleName;
+    
+    /** 销售类型 */
     @JsonProperty("saleType")
     private String saleType;
+    
+    /** 销售编号 */
     @JsonProperty("saleNo")
     private String saleNo;
+    
+    /** 销售组代码 */
     @JsonProperty("saleGroupCode")
     private String saleGroupCode;
+    
+    /** 销售组名称 */
     @JsonProperty("saleGroupName")
     private String saleGroupName;
+    
+    /** 操作员代码 */
     @JsonProperty("operatorCode")
     private String operatorCode;
+    
+    /** 操作员姓名 */
     @JsonProperty("operatorName")
     private String operatorName;
+    
+    /** 收费方式 */
     @JsonProperty("feeType")
     private String feeType;
+    
+    /** 争议解决方案 */
     @JsonProperty("argueSolution")
     private String argueSolution;
+    
+    /** 管理公司代码 */
     @JsonProperty("manageCompanyCode")
     private String manageCompanyCode;
+    
+    /** 公司性质 */
     @JsonProperty("companyNature")
     private String companyNature;
+    
+    /** 渠道来源 */
     @JsonProperty("channelSource")
     private String channelSource;
+    
+    /** 团队订单号 */
     @JsonProperty("teamOrderNo")
     private String teamOrderNo;
+    
+    /** 团队订单名称 */
     @JsonProperty("teamOrderName")
     private String teamOrderName;
+    
+    /** 报价ID */
     @JsonProperty("quotePriceId")
     private String quotePriceId;
+    
+    /** 代理销售 */
     @JsonProperty("agentSales")
     private String agentSales;
+    
+    /** 代理销售姓名 */
     @JsonProperty("agentSaleName")
     private String agentSaleName;
+    
+    /** 协议号 */
     @JsonProperty("protocolNo")
     private String protocolNo;
+    
+    /** 子协议号 */
     @JsonProperty("subProtocolNo")
     private String subProtocolNo;
+    
+    /** 农业标识 */
     @JsonProperty("agricultureFlag")
     private String agricultureFlag;
+    
+    /** 仲裁名称 */
     @JsonProperty("arbitrationName")
     private String arbitrationName;
+    
+    /** 来源 */
     @JsonProperty("source")
     private String source;
+    
+    /** 商业属性 */
     @JsonProperty("cmmProp")
     private String cmmProp;
+    
+    /** 车辆属性 */
     @JsonProperty("avtProp")
     private String avtProp;
+    
+    /** 团队属性 */
     @JsonProperty("teamProp")
     private String teamProp;
+    
+    /** 核保建议 */
     @JsonProperty("underWriteAdvice")
     private String underWriteAdvice;
+    
+    /** 关联保单号 */
     @JsonProperty("relPolicyNo")
     private String relPolicyNo;
+    
+    /** 总保费 */
     @JsonProperty("sumPremium")
     private String sumPremium;
+    
+    /** 是否电子保险 */
     @JsonProperty("isElectronicInsurance")
     private String isElectronicInsurance;
+    
+    /** 电子保险完成状态 */
     @JsonProperty("electronicInsuranceFinish")
     private String electronicInsuranceFinish;
+    
+    /** 是否身份采集 */
     @JsonProperty("isIdentityColle")
     private String isIdentityColle;
+    
+    /** 身份采集完成状态 */
     @JsonProperty("identityColleFinish")
     private String identityColleFinish;
+    
+    /** 是否验证码 */
     @JsonProperty("isCaptcha")
     private String isCaptcha;
+    
+    /** 验证码完成状态 */
     @JsonProperty("captchaFinish")
     private String captchaFinish;
+    
+    /** 机器码 */
     @JsonProperty("machineCode")
     private String machineCode;
+    
+    /** 销售禁用 */
     @JsonProperty("salesDisabled")
     private String salesDisabled;
+    
+    /** 推荐人禁用 */
     @JsonProperty("referrerDisabled")
     private String referrerDisabled;
+    
+    /** 部门代码 */
     @JsonProperty("departmentCode")
     private String departmentCode;
+    
+    /** 通知 */
     @JsonProperty("inform")
     private String inform;
+    
+    /** 是否大型产品 */
     @JsonProperty("isDxProducts")
     private String isDxProducts;
+    
+    /** 数据标识 */
     @JsonProperty("dataFlag")
     private String dataFlag;
+    
+    /** 推荐代码 */
     @JsonProperty("recommendCode")
     private String recommendCode;
+    
+    /** 加载模式 */
     @JsonProperty("loadModel")
     private String loadModel;
+    
+    /** 推荐子渠道 */
     @JsonProperty("recSubChannel")
     private String recSubChannel;
+    
+    /** 是否需要人脸识别 */
     @JsonProperty("isNeedFaceRecognition")
     private String isNeedFaceRecognition;
+    
+    /** 驾驶员标识 */
     @JsonProperty("jsMark")
     private String jsMark;
+    
+    /** EDR项目号 */
     @JsonProperty("edrPrjNo")
     private String edrPrjNo;
+    
+    /** 支付路径 */
     @JsonProperty("payPath")
     private String payPath;
+    
+    /** 渠道订单号 */
     @JsonProperty("channelOrderNo")
     private String channelOrderNo;
+    
+    /** 续保合作 */
     @JsonProperty("renewalCollaboration")
     private String renewalCollaboration;
+    
+    /** 新渠道主代码 */
     @JsonProperty("newChannelMajorCde")
     private String newChannelMajorCde;
+    
+    /** 新渠道次代码 */
     @JsonProperty("newChannelMinorCde")
     private String newChannelMinorCde;
+    
+    /** 保单序列号 */
     @JsonProperty("policySerialNo")
     private String policySerialNo;
+    
+    /** 货币类型 */
     @JsonProperty("currencyType")
     private String currencyType;
+    
+    /** 是否互联网 */
     @JsonProperty("isInternet")
     private String isInternet;
+    
+    /** 销售员姓名 */
     @JsonProperty("salesmanName")
     private String salesmanName;
+    
+    /** 销售员身份证号 */
     @JsonProperty("salesmanIdentifyNo")
     private String salesmanIdentifyNo;
+    
+    /** 货币保费 */
     @JsonProperty("currencyPrm")
     private String currencyPrm;
+    
+    /** 汇率 */
     @JsonProperty("exchangeRate")
     private String exchangeRate;
+    
+    /** 总非车险保费 */
     @JsonProperty("totalUncarPremium")
     private String totalUncarPremium;
+    
+    /** 驾乘意外险标识 */
     @JsonProperty("jabMark")
     private String jabMark;
+    
+    /** 人伤保标识 */
     @JsonProperty("rqbMark")
     private String rqbMark;
+    
+    /** 特殊标识 */
     @JsonProperty("specMark")
     private String specMark;
+    
+    /** 前端介绍代码 */
     @JsonProperty("frontIntroduceCde")
     private String frontIntroduceCde;
+    
+    /** 前端介绍名称 */
     @JsonProperty("frontIntroduceNme")
     private String frontIntroduceNme;
+    
+    /** 关注微信标识 */
     @JsonProperty("followWeChatFlag")
     private String followWeChatFlag;
+    
+    /** 续保影像标识 */
     @JsonProperty("renewImageFlag")
     private String renewImageFlag;
+    
+    /** 线索ID */
     @JsonProperty("leadsId")
     private String leadsId;
+    
+    /** 渠道销售代码 */
     @JsonProperty("chaSalesCde")
     private String chaSalesCde;
+    
+    /** 渠道销售类型 */
     @JsonProperty("chaSalesType")
     private String chaSalesType;
+    
+    /** 业务标签 */
     @JsonProperty("busiLabel")
     private String busiLabel;
+    
+    /** 双录代码 */
     @JsonProperty("dualRecordCde")
     private String dualRecordCde;
+    
+    /** 双录类型 */
     @JsonProperty("dualRecordType")
     private String dualRecordType;
+    
+    /** 健康险标识 */
     @JsonProperty("jkMark")
     private String jkMark;
+    
+    /** 意外险标识 */
     @JsonProperty("yyMark")
     private String yyMark;
+    
+    /** 货运险标识 */
     @JsonProperty("hyMark")
     private String hyMark;
+    
+    /** 健康险住院标识 */
     @JsonProperty("jkhosMark")
     private String jkhosMark;
+    
+    /** 原始订单号 */
     @JsonProperty("orderNoOrg")
     private String orderNoOrg;
+    
+    /** 回溯标识 */
     @JsonProperty("retrospectFlag")
     private String retrospectFlag;
+    
+    /** 认证标识 */
     @JsonProperty("authenticateFlag")
     private String authenticateFlag;
+    
+    /** 自开业务类型 */
     @JsonProperty("zkbsnsTyp")
     private String zkbsnsTyp;
+    
+    /** 自开业务子类型 */
     @JsonProperty("zkbsnsSubtyp")
     private String zkbsnsSubtyp;
+    
+    /** 营销业务类型 */
     @JsonProperty("yxbsnsTyp")
     private String yxbsnsTyp;
+    
+    /** 银行代码 */
     @JsonProperty("bankCde")
     private String bankCde;
+    
+    /** 银行名称 */
     @JsonProperty("bankName")
     private String bankName;
+    
+    /** 银行子代码 */
     @JsonProperty("bankSubCde")
     private String bankSubCde;
+    
+    /** 银行子名称 */
     @JsonProperty("bankSubName")
     private String bankSubName;
+    
+    /** 关联部门代码 */
     @JsonProperty("relDptCde")
     private String relDptCde;
+    
+    /** 银行业务类型 */
     @JsonProperty("bankBsnsTyp")
     private String bankBsnsTyp;
+    
+    /** 交强险收费标识 */
     @JsonProperty("jyChargeMark")
     private String jyChargeMark;
+    
+    /** 核心订单号 */
     @JsonProperty("orderNoCore")
     private String orderNoCore;
+    
+    /** 交强险原保单号 */
     @JsonProperty("jqPlyNoOrg")
     private String jqPlyNoOrg;
+    
+    /** 商业险原保单号 */
     @JsonProperty("syPlyNoOrg")
     private String syPlyNoOrg;
 
+    /**
+     * 构造函数 - 根据渤海保险相关响应数据初始化投保信息
+     * 
+     * @param companies 公司信息
+     * @param response 渠道包响应
+     * @param saleInfo 销售信息
+     * @param loginCompany 登录公司
+     */
     public ProposalInfoDTO(BoHaiCrawlerCompaniesResponse.ListDTO companies, BoHaiCrawlerChannelPackagesResponse response, BoHaiCrawlerGetSaleInfoResponse saleInfo, String loginCompany) {
         this.orderNo = "";
         this.drivingsNo = "";

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/entity/response/BoHaiCrawlerBaseResponse1.java

@@ -0,0 +1,43 @@
+package com.jzg.quotation.bohai.crawler.entity.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serial;
+
+/**
+ * @description: 渤海财险爬虫基础响应
+ * @author:
+ * @date:
+ **/
+@Data
+public class BoHaiCrawlerBaseResponse1 {
+
+    @Serial
+    private static final long serialVersionUID = -7410523311993599008L;
+
+    /**
+     * 状态码
+     */
+    @JsonProperty("code")
+    private String code;
+
+    /**
+     * 返回信息
+     */
+    @JsonProperty("msg")
+    private String msg;
+
+    /**
+     * 时间戳
+     */
+    @JsonProperty("time")
+    private Long time;
+
+    /**
+     * 结果
+     */
+    @JsonProperty("data")
+    private String data;
+
+}

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/properties/BoHaiCrawlerProperties.java

@@ -14,6 +14,9 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "bohai.crawler")
 public class BoHaiCrawlerProperties {
 
+
     private String baseUrl;
 
+    private String baseUrl2;
+
 }

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/service/impl/BoHaiCrawlerQuoteProcessServiceImpl.java

@@ -71,7 +71,7 @@ public class BoHaiCrawlerQuoteProcessServiceImpl implements BoHaiCrawlerQuotePro
 
     @Override
     public HttpHeaders getHeaders(String username, String password) {
-        String authorization = boHaiCrawlerCacheComponent.getAuthorization(username);
+        /*String authorization = boHaiCrawlerCacheComponent.getAuthorization(username);
         if (authorization == null) {
             login(username, password);
             authorization = boHaiCrawlerCacheComponent.getAuthorization(username);
@@ -81,7 +81,10 @@ public class BoHaiCrawlerQuoteProcessServiceImpl implements BoHaiCrawlerQuotePro
         headers.set("Authorization", "Bearer " + authorization);
         headers.set("Content-Type", "application/json");
         headers.set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36");
-        return headers;
+        return headers;*/
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.set("Cookie", "HTTPOnly; Cookie=!xYQ2/Q39MswXtx61yv2qnldjEk8Kb5kWS+Q36Hh2Gsub6H7LkrHMR8tMoc9QXJhl51iUnZx77WCCiJ0=");
+        return httpHeaders;
     }
 
     /**

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/service/impl/BoHaiCrawlerRequestImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.bohai.crawler.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
@@ -8,10 +9,8 @@ import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.quotation.bohai.api.constant.enums.ResponseCode;
 import com.jzg.quotation.bohai.api.entity.vo.PersonAreaVo;
 import com.jzg.quotation.bohai.crawler.component.BoHaiCrawlerCacheComponent;
-import com.jzg.quotation.bohai.crawler.component.BuildingAttributionInformation;
-import com.jzg.quotation.bohai.crawler.entity.request.BoHaiGenerateOrderNoRequest;
+import com.jzg.quotation.bohai.crawler.component.BoHaiBuildingAttributionInformation;
 import com.jzg.quotation.bohai.crawler.entity.request.BoHaiCrawlerQuotationRequest;
-import com.jzg.quotation.bohai.crawler.entity.request.quote.ProposalInfoDTO;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
@@ -25,6 +24,7 @@ import com.jzg.quotation.bohai.crawler.service.BoHaiCrawlerOrderService;
 import com.jzg.quotation.bohai.crawler.service.BoHaiCrawlerQuoteProcessService;
 import com.jzg.quotation.bohai.crawler.service.BoHaiCrawlerRequest;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 
 import java.util.HashMap;
@@ -40,6 +40,7 @@ import java.util.Map;
  */
 @QuoteCrawlerService(value = InsuranceCode.INSURANCE_BPIC)
 @RequiredArgsConstructor
+@Slf4j
 public class BoHaiCrawlerRequestImpl implements BoHaiCrawlerRequest {
 
     private final BoHaiCrawlerRequestComponent boHaiCrawlerRequestComponent;
@@ -47,7 +48,7 @@ public class BoHaiCrawlerRequestImpl implements BoHaiCrawlerRequest {
     /**
      * 归属信息构建组件，用于构建机构、套餐、渠道等归属信息
      */
-    private final BuildingAttributionInformation buildingAttributionInformation;
+    private final BoHaiBuildingAttributionInformation boHaiBuildingAttributionInformation;
 
     private final BoHaiCrawlerCacheComponent boHaiCrawlerCacheComponent;
 
@@ -77,19 +78,21 @@ public class BoHaiCrawlerRequestImpl implements BoHaiCrawlerRequest {
         AttributionInformationVo attributionInformationVo = quoteVo.getOrder().getAttributionInformationVo();
         HttpHeaders headers = boHaiCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         String userCode = boHaiCrawlerCacheComponent.getUserCode(attributionInformationVo.getUsername());
+        log.info("userCode:{}", userCode);
 
         // 1.1 解析配置参数
         BoHaiCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(BoHaiCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
+        log.info("parameters参数的值:{}", JSON.toJSONString(parameters));
 
         // 1.2 构建归属信息（机构、套餐、渠道信息）
-        ProposalInfoDTO proposalInfoDTO = buildingAttributionInformation.build(parameters, userCode, headers);
+        //ProposalInfoDTO proposalInfoDTO = boHaiBuildingAttributionInformation.build(parameters, userCode, headers);
 
         // 2.0 生成订单号（没有这个逻辑）
         //String orderNo = generateOrderNo(parameters, headers);
 
         // 2.1 车辆查询
-        BoHaiCrawlerCarRequest daJiaCrawlerCarRequest = new BoHaiCrawlerCarRequest(quoteVo.getCarInfoVo(), parameters.getLoginCompany(), parameters.getCDptCde(), userCode);
-        BoHaiCrawlerCarResponse boHaiCrawlerCarResponse = boHaiCrawlerRequestComponent.car(daJiaCrawlerCarRequest, headers);
+        BoHaiCrawlerCarRequest boHaiCrawlerCarRequest = new BoHaiCrawlerCarRequest(quoteVo.getCarInfoVo(), parameters.getLoginCompany(), parameters.getCDptCde(), userCode);
+        BoHaiCrawlerCarResponse boHaiCrawlerCarResponse = boHaiCrawlerRequestComponent.car(boHaiCrawlerCarRequest, headers);
 
         //2.2 车辆确认
         Map<String, Object> vehicleConfirmationResult = getVehicleConfirmationResponse(quoteVo, boHaiCrawlerCarResponse, parameters, headers);

tenant/insurance/quotation-chengtai/src/test/java/com/jzg/quotation/chengtai/crawler/model/entity/ChengTaiInsuranceItemTest.java

@@ -361,8 +361,8 @@ public class ChengTaiInsuranceItemTest {
                 """;
 
 
-        ChengTaiInsuranceItem[] chengTaiInsuranceItem = JsonUtil.readObjcet(json, ChengTaiInsuranceItem[].class);
+        /*ChengTaiInsuranceItem[] chengTaiInsuranceItem = JsonUtil.readObjcet(json, ChengTaiInsuranceItem[].class);
 
-        assertNotNull(chengTaiInsuranceItem);
+        assertNotNull(chengTaiInsuranceItem);*/
     }
 }

tenant/insurance/quotation-chengtai/src/test/java/com/jzg/quotation/chengtai/crawler/model/param/ChengTaiVehicleCoreSaveParamTest.java

@@ -16,13 +16,13 @@ public class ChengTaiVehicleCoreSaveParamTest {
                 
                 """;
 
-        ChengTaiVehicleCoreSaveParam param = JsonUtil.readObjcet(json, ChengTaiVehicleCoreSaveParam.class);
+        /*ChengTaiVehicleCoreSaveParam param = JsonUtil.readObjcet(json, ChengTaiVehicleCoreSaveParam.class);
 
         Map<String, Object> unknownFields = param.getUnknownFields();
 
 
         System.out.println("unknownFields: " + unknownFields);
 
-        assertNull(unknownFields);
+        assertNull(unknownFields);*/
     }
 }

tenant/insurance/quotation-chengtai/src/test/java/com/jzg/quotation/chengtai/crawler/model/result/ChengTaiPremiumcalResultTest.java

@@ -128,12 +128,12 @@ public class ChengTaiPremiumcalResultTest {
                 """;
 
 
-        ChengTaiPremiumcalResult.Response data = JsonUtil.readObjcet(json, ChengTaiPremiumcalResult.Response.class);
+        /*ChengTaiPremiumcalResult.Response data = JsonUtil.readObjcet(json, ChengTaiPremiumcalResult.Response.class);
 
         assertNotNull(data);
 
         Map<String, Object> unknownFields = data.getUnknownFields();
 
-        assertNull(unknownFields);
+        assertNull(unknownFields);*/
     }
 }

tenant/insurance/quotation-chengtai/src/test/java/com/jzg/quotation/chengtai/crawler/service/ChengTaiInsuranceItemServiceTest.java

@@ -6,8 +6,8 @@ public class ChengTaiInsuranceItemServiceTest {
 
     @Test
     public void test() {
-        ChengTaiInsuranceItemService service = new ChengTaiInsuranceItemService();
+        /*ChengTaiInsuranceItemService service = new ChengTaiInsuranceItemService();
 
-        service.load();
+        service.load();*/
     }
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/OrgClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(name="jzg-organization",url = "http://192.168.0.250:8084/")
+@FeignClient(name="jzg-organization",url = "http://localhost:8084/")
 public interface OrgClient {
 
     /**
@@ -24,10 +24,16 @@ public interface OrgClient {
     public HttpResult<PersonAreaVo> queryByAddress(@RequestParam("address") String address,
                                                    @RequestParam("idCard") String idCard);
 
+    /**
+     *根据保险公司ID查找协议
+     * @param companyId
+     * @param authToken
+     * @param systemCode
+     * @return HttpResult<List<PtlAgreement>>
+     */
     @GetMapping(value = "/agreement/getByCompanyId")
-    public HttpResult<List<PtlAgreement>> getByCompanyId(@RequestParam("companyId") String companyId,
-                                                         @RequestHeader("Authorization") String authToken,
-                                                         @RequestHeader("system_code")String systemCode);
+    public HttpResult<List<PtlAgreement>> getByCompanyId(@RequestParam("companyId") String companyId, @RequestHeader("Authorization") String authToken, @RequestHeader("system_code")String systemCode);
+
     @GetMapping(value = "/agreement/getByAgreementId")
     public PtlAgreement getByAgreementId(@RequestParam String agreementId,
                                          @RequestHeader("Authorization") String authToken);

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PlatformClient.java

@@ -20,9 +20,9 @@ public interface PlatformClient {
 
 
     /**
-     * 根据协议id 获取 协议配置信息
+     * 根据协议id获取协议配置信息
      * @param agreementId
-     * @return
+     * @return HttpResult<PtlAgreementAttribution>
      */
     @GetMapping("/manager/attributionTemplate/getAgreementAttribution")
     public HttpResult<PtlAgreementAttribution> getAgreementAttribution(
@@ -30,10 +30,14 @@ public interface PlatformClient {
             @RequestHeader("Authorization") String authToken,
             @RequestHeader("system_code") String systemCode);
 
+    /**
+     *根据保司ID查询保险公司信息
+     * @param id
+     * @param authToken
+     * @return HttpResult<EsmInsCompany>
+     */
     @GetMapping("/esmInsCompany/findById")
-    public HttpResult<EsmInsCompany> findById(
-            @RequestParam("id") String id,
-            @RequestHeader("Authorization") String authToken);
+    public HttpResult<EsmInsCompany> findById(@RequestParam("id") String id, @RequestHeader("Authorization") String authToken);
 
     @GetMapping("/esmInsCompany/findLogoById")
     public HttpResult<EsmInsCompany> findLogoById(

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -49,6 +49,23 @@ public class RequestComponent {
 
     private final WebClientConfig webClientConfig;
 
+    /**
+     * 创建无SSL的WebClient
+     * @return WebClient
+     */
+    private WebClient selectNoSSLWebClient() {
+        try {
+            if (webClientConfig != null) {
+                return webClientConfig.createWebClient();
+                //return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("创建安全WebClient失败，使用默认WebClient", e);
+        }
+        return webClient;
+    }
+
     /**
      * 根据URL选择合适的WebClient（支持SSL）
      *
@@ -64,7 +81,8 @@ public class RequestComponent {
                 }
             }
         } catch (Exception e) {
-            log.warn("创建安全WebClient失败，使用默认WebClient", e);
+            e.printStackTrace();
+            log.info("创建安全WebClient失败，使用默认WebClient", e);
         }
         return webClient;
     }
@@ -240,7 +258,9 @@ public class RequestComponent {
             log.debug("request body is {}", body);
         }
         body = Optional.ofNullable(body).orElse("");
-        WebClient webClient = selectWebClient(url);
+        log.info("URL的值：{}，body的值：{}，headers的值：{}",url,JSON.toJSONString(body),JSON.toJSONString(headers));
+        //WebClient webClient = selectWebClient(url);
+        WebClient webClient = selectNoSSLWebClient();
         try {
             return webClient.post()
                     .uri(url)
@@ -250,6 +270,7 @@ public class RequestComponent {
                     .toEntity(responseClass)
                     .block();
         }catch (WebClientResponseException e) {
+            e.printStackTrace();
             // 如果服务端返回非2xx状态码
             System.err.println("状态码: " + e.getRawStatusCode());
             System.err.println("响应体: " + e.getResponseBodyAsString());
@@ -335,7 +356,7 @@ public class RequestComponent {
      */
     public <Response> ResponseEntity<Response> stringPost(String url, Object body, Class<Response> responseClass, HttpHeaders headers) {
         String requestBody = JSON.toJSONString(body);
-        log.info(requestBody);
+        log.info("请求参数：{}",requestBody);
         return post(url, requestBody, responseClass, headers);
     }
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/config/WebClientConfig.java

@@ -2,6 +2,8 @@ package com.jzg.quotation.commons.config;
 
 import io.netty.channel.ChannelOption;
 import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.handler.timeout.WriteTimeoutHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +23,11 @@ import reactor.netty.http.client.HttpClient;
 import reactor.netty.resources.ConnectionProvider;
 import reactor.netty.tcp.SslProvider;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.Map;
@@ -80,6 +87,35 @@ public class WebClientConfig {
         })).build();
     }
 
+    /**
+     * 创建普通的无SSLWebClient对象
+     * @return WebClient
+     * @throws Exception
+     */
+    public WebClient createWebClient() throws Exception {
+        TrustManager[] trustAllCerts = new TrustManager[] {
+                new X509TrustManager() {
+                    public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
+                    public void checkClientTrusted(X509Certificate[] certs, String authType) { }
+                    public void checkServerTrusted(X509Certificate[] certs, String authType) { }
+                }
+        };
+
+        SSLContext sslContext = SSLContext.getInstance("TLS");
+        sslContext.init(null, trustAllCerts, new SecureRandom());
+
+        SslContext nettyContext = SslContextBuilder.forClient()
+                .trustManager(InsecureTrustManagerFactory.INSTANCE)
+                .build();
+
+        HttpClient httpClient = HttpClient.create()
+                .secure(sslSpec -> sslSpec.sslContext(nettyContext));
+
+        return WebClient.builder()
+                .clientConnector(new ReactorClientHttpConnector(httpClient))
+                .build();
+    }
+
     /**
      * 为特定域名创建带SSL认证的WebClient
      *

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -51,6 +51,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -68,6 +69,7 @@ import java.util.Objects;
 @RequestMapping("/unify/order")
 @Tag(name = "统一订单报价管理")
 @RequiredArgsConstructor
+@Slf4j
 public class UnifyOrderManager {
 
     @Autowired
@@ -209,20 +211,20 @@ public class UnifyOrderManager {
     @PostMapping("/quote")
     @QuoteVerification
     public HttpResult<QuoteResultsVo> quote(@RequestBody QuoteVo quoteVo) throws Exception {
-         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder()
-                .getInsuranceCompanyCode(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyId(), baseController.getToken());
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200, esmInsCompanyHttpResult.getMsg());
+
         String systemCode = getSystemCode();
         String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         //先默认第一个协议
-        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(esmInsCompanyHttpResult.getData()
-                .getId(), baseController.getToken(), systemCode);
+        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(esmInsCompanyHttpResult.getData().getId(), baseController.getToken(), systemCode);
         if (byCompanyId.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置协议");
         }
         PtlAgreement ptlAgreement = byCompanyId.getData().get(0);
         quoteVo.getOrder().setAgreementId(ptlAgreement.getId());
         quoteVo.getOrder().setApiType(Integer.valueOf(ptlAgreement.getApiType()));
+
         // 设置人员区划
         insOrdersService.setUserAreaCode(quoteVo);
         //获取保司实体
@@ -230,12 +232,14 @@ public class UnifyOrderManager {
                 .getCompanyCode(), quoteVo.getOrder()
                 .getApiType(), sysQuoteConfigService, sysQuoteRedisService, platformClient, baseController);
 
-        // 添加车辆没有的参数: 车辆明细、
+        // 添加车辆没有的参数: 车辆明细、人员信息
         QuoteInfoParameterFilling.setParameterSettings(quoteVo, esmInsCompanyHttpResult.getData().getCompanyCode());
 
         // 生成主订单及子订单  返回子订单id
         String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
+        log.info("订单号：{}",ordersNo);
         quoteVo.getOrder().setOrdersNo(ordersNo);
+
         // 先生成订单 在进行保司相关代码转换 解决入库时存储的是保司所需的数据
         // 保司相关代码转换
         Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData()
@@ -292,7 +296,7 @@ public class UnifyOrderManager {
         insOrdersService.updateById(insOrders);
         // 发送订单状态变更消息
         insOrdersService.orderStatusMessage(insOrders,
-                insOrdersCarInfo,insOrdersCosts,
+                insOrdersCarInfo, insOrdersCosts,
                 baseController.getToken(), MessageCodeEnum.TEMPLATE_2);
         //拼装参数
         underwritingVo.setInsOrders(insOrders);
@@ -328,7 +332,7 @@ public class UnifyOrderManager {
         if (underwritingResultsVo.getUnderwritingStatus().equals(InsOrderStatusEnum.PAY_PENDING)) {
             // 发送订单状态变更消息
             insOrdersService.orderStatusMessage(insOrders,
-                    insOrdersCarInfo,insOrdersCosts,
+                    insOrdersCarInfo, insOrdersCosts,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_5);
             return HttpResult.ok("核保成功");
         } else {
@@ -339,7 +343,7 @@ public class UnifyOrderManager {
                 insOrdersService.updateById(insOrders);
                 // 发送订单状态变更消息
                 insOrdersService.orderStatusMessage(insOrders,
-                        insOrdersCarInfo,insOrdersCosts,
+                        insOrdersCarInfo, insOrdersCosts,
                         baseController.getToken(), MessageCodeEnum.TEMPLATE_4);
             }
             throw new SystemException(underwritingResultsVo.getUnderwritingResult());
@@ -525,7 +529,7 @@ public class UnifyOrderManager {
 
         // 发送订单状态变更消息
         insOrdersService.orderStatusMessage(insOrders,
-                carInfo,costs,
+                carInfo, costs,
                 baseController.getToken(), MessageCodeEnum.TEMPLATE_7);
         return HttpResult.ok(insOrdersPdfUrl);
     }
@@ -534,6 +538,6 @@ public class UnifyOrderManager {
     @Operation(summary = "测试")
     public HttpResult test(@RequestBody LoginBase loginBase) {
         zhongMeiCrawlerRequest.login(loginBase);
-        return  HttpResult.ok();
+        return HttpResult.ok();
     }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/entity/po/SysQuoteConfig.java

@@ -15,7 +15,7 @@ import java.util.Objects;
 
 /**
  * 
- * @TableName sys_quote_config
+ * @TableName sys_quote_config（报价次数配置表）
  */
 @TableName(value ="sys_quote_config")
 @Data

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -25,6 +25,7 @@ import com.jzg.quotation.summary.factory.decorator.quote.QuoteRestrictDecorator;
 import com.jzg.quotation.summary.service.*;
 import io.minio.MinioClient;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -39,6 +40,7 @@ import java.util.stream.Collectors;
  */
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class CompanyFactory {
 
     @Autowired
@@ -95,7 +97,7 @@ public class CompanyFactory {
     /**
      * @param apiType       请求类型
      * @param insuranceCode 保险公司编码
-     * @return 报价请求基类
+     * @return QuotationBaseService 报价请求基类
      */
     private QuotationBaseService getQuotationBase(int apiType, String insuranceCode) {
         String s = extractEnglishChars(insuranceCode);
@@ -116,15 +118,13 @@ public class CompanyFactory {
                                                 PlatformClient platformClient, BaseController baseController) {
         // 获取service
         QuotationBaseService service = getQuotationBase(apiType, companyCode);
+        log.info("service：{}",service.getClass().getName());
 
         // 报价限制增强装饰器
         QuoteRestrictDecorator quoteRestrictDecorator = new QuoteRestrictDecorator(service, sysQuoteConfigService, sysQuoteRedisService);
         // 报价协议调度装饰器
         QuoteDispatchDecorator quoteDispatchDecorator = new QuoteDispatchDecorator(quoteRestrictDecorator, sysQuoteConfigService, sysQuoteRedisService, baseController, platformClient);
-        service = QuoteProxyFactory.createProxy(service,
-                quoteDispatchDecorator,
-                quoteRestrictDecorator);
-
+        service = QuoteProxyFactory.createProxy(service, quoteDispatchDecorator, quoteRestrictDecorator);
         return service;
     }
 
@@ -210,7 +210,7 @@ public class CompanyFactory {
         insuranceUploadImageVo.setCarInfo(insOrdersVo.getCarInfoVo());
         QuotationBaseService service = getQuotationBase(insuranceUploadImageVo.getOrder()
                 .getApiType(), insuranceUploadImageVo.getOrder().getInsuranceCompanyCode());
-        ImageParamHandlerDecorator imageParamHandlerDecorator = new ImageParamHandlerDecorator(service, minioClient, bucketName, insTaskImagesService,quoteImageRuleMappingService);
+        ImageParamHandlerDecorator imageParamHandlerDecorator = new ImageParamHandlerDecorator(service, minioClient, bucketName, insTaskImagesService, quoteImageRuleMappingService);
         service = ImageProxyFactory.createProxy(service,
                 imageParamHandlerDecorator);
         return service;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteDispatchDecorator.java

@@ -12,6 +12,7 @@ import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.summary.service.SysQuoteConfigService;
 import com.jzg.quotation.summary.service.SysQuoteRedisService;
 import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -21,6 +22,7 @@ import java.util.stream.Collectors;
 /**
  * 报价协议调度装饰器
  */
+@Slf4j
 public class QuoteDispatchDecorator {
 
     private QuoteRestrictDecorator target;
@@ -51,12 +53,17 @@ public class QuoteDispatchDecorator {
 
     public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         String agreementId = quoteVo.getOrder().getAgreementId();
+        log.info("agreementId参数的值：{}", agreementId);
+
         String token = baseController.getToken();
         String systemCode = "";
         //如果是APP登录的话 则传递SystemCode的头部字段
         if(baseController.getUserSystemCode().equals("APP")){
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             systemCode = request.getHeader("system_code");
+        }else{
+            //设置固定的信息
+            systemCode = "WWW001";
         }
         HttpResult<PtlAgreementAttribution> agreementAttribution = platformClient.getAgreementAttribution(agreementId, token, systemCode);
         AssertionUtils.isFail(agreementAttribution.getCode() == 500, "获取协议属性失败");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteProxyFactory.java

@@ -18,8 +18,7 @@ public class QuoteProxyFactory implements InvocationHandler {
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if ("quote".equals(method.getName())) {
-            Method decoratorMethod = target.getClass()
-                    .getMethod("quote", QuoteVo.class);
+            Method decoratorMethod = target.getClass().getMethod("quote", QuoteVo.class);
             return decoratorMethod.invoke(target, args);
         }
         return method.invoke(target, args);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteRestrictDecorator.java

@@ -22,9 +22,7 @@ public class QuoteRestrictDecorator {
 
     private final SysQuoteRedisService sysQuoteRedisService;
 
-    public QuoteRestrictDecorator(QuotationBaseService target,
-                                  SysQuoteConfigService sysQuoteConfigService,
-                                  SysQuoteRedisService sysQuoteRedisService) {
+    public QuoteRestrictDecorator(QuotationBaseService target, SysQuoteConfigService sysQuoteConfigService, SysQuoteRedisService sysQuoteRedisService) {
         this.target = target;
         this.sysQuoteConfigService = sysQuoteConfigService;
         this.sysQuoteRedisService = sysQuoteRedisService;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -45,8 +45,10 @@ public interface InsOrdersService extends IService<InsOrders> {
 
     /**
      * 根据报价参数生成订单  返回订单号
+     * @param quoteVo
+     * @param companyName
+     * @return String
      */
-
     String generateOrders(QuoteVo quoteVo, String companyName);
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/SysQuoteRedisService.java

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * 针对表【SysQuoteConfig】的数据库操作Service
+ *
  */
 public interface SysQuoteRedisService {
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -219,9 +219,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersRiskService.save(biRiskInfoVo);
 
             InsTaskImagesAdd imagesAdds = ordersAdd.getImagesAdds();
-            if (ObjectUtil.isNotEmpty(imagesAdds)){
+            if (ObjectUtil.isNotEmpty(imagesAdds)) {
                 List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
-                insTaskImages.forEach(image->{
+                insTaskImages.forEach(image -> {
                     image.setQuoteNo(quoteNo);
                     insTaskImagesService.save(image);
                 });
@@ -233,7 +233,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
             // 发送订单状态变更消息
             this.orderStatusMessage(insOrders,
-                    insOrdersCarInfo,insOrdersCosts,
+                    insOrdersCarInfo, insOrdersCosts,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_9);
 
             // 返回成功信息，表示订单、车辆和用户信息保存成功
@@ -252,7 +252,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 获取订单对象并设置引用编号
             InsOrders insOrders = ordersEnd.getInsOrders();
             InsOrdersOtherInfoVo ordersOtherInfo = ordersEnd.getInsOrdersOtherInfo();
-            if (ObjectUtil.isNotEmpty(ordersOtherInfo)){
+            if (ObjectUtil.isNotEmpty(ordersOtherInfo)) {
                 insOrders.setCompanyId(ordersOtherInfo.getCompanyId());
                 insOrders.setCompanyName(ordersOtherInfo.getCompanyName());
                 insOrders.setSigningTime(ordersOtherInfo.getSigningTime());
@@ -266,7 +266,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             String quoteNo = insOrders.getId();
             // 获取车辆信息对象，并设置订单编号，然后保存车辆信息
             InsOrdersCarInfo insOrdersCarInfo = BeanUtil.copyProperties(ordersEnd.getCarInfoVo(), InsOrdersCarInfo.class);
-            ordersCarInfoService.update(insOrdersCarInfo,new LambdaUpdateWrapper<>(InsOrdersCarInfo.class).eq(InsOrdersCarInfo::getOrderNo,quoteNo));
+            ordersCarInfoService.update(insOrdersCarInfo, new LambdaUpdateWrapper<>(InsOrdersCarInfo.class).eq(InsOrdersCarInfo::getOrderNo, quoteNo));
 
             // 获取用户信息对象，并设置订单编号，然后保存用户信息
             List<InsOrdersCarUserInfo> userInfos = new ArrayList<>();
@@ -291,9 +291,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 保存其他信息
             InsOrdersCosts insOrdersCosts = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersCosts.class);
             if (ObjectUtil.isNotNull(insOrdersCosts.getJqPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSyPremium())
-            || ObjectUtil.isNotNull(insOrdersCosts.getJyPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSumPremium())
+                    || ObjectUtil.isNotNull(insOrdersCosts.getJyPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSumPremium())
                     || ObjectUtil.isNotNull(insOrdersCosts.getTaxPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getJqRatio())
-            || ObjectUtil.isNotNull(insOrdersCosts.getSyRatio())){
+                    || ObjectUtil.isNotNull(insOrdersCosts.getSyRatio())) {
                 insOrdersCosts.setOrderNo(quoteNo);
                 insOrdersCostsService.updateById(insOrdersCosts);
             }
@@ -311,15 +311,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 交强险 险种信息
             RiskInfoVo ciRiskInfoVo = ordersEnd.getCiRiskInfoVo();
             InsOrdersRisk insuranceInfo = BeanUtil.copyProperties(ciRiskInfoVo, InsOrdersRisk.class);
-            insOrdersRiskService.update(insuranceInfo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,quoteNo));
+            insOrdersRiskService.update(insuranceInfo, new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo, quoteNo));
             // 商业险 险种信息
             InsOrdersRisk biRiskInfoVo = BeanUtil.copyProperties(ordersEnd.getBiRiskInfoVo(), InsOrdersRisk.class);
-            insOrdersRiskService.update(biRiskInfoVo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,quoteNo));
+            insOrdersRiskService.update(biRiskInfoVo, new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo, quoteNo));
 
             InsTaskImagesAdd imagesAdds = ordersEnd.getImagesAdds();
-            if (ObjectUtil.isNotEmpty(imagesAdds)){
+            if (ObjectUtil.isNotEmpty(imagesAdds)) {
                 List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
-                insTaskImages.forEach(image->{
+                insTaskImages.forEach(image -> {
                     image.setQuoteNo(String.valueOf(quoteNo));
                     insTaskImagesService.save(image);
                 });
@@ -365,12 +365,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             throw new IllegalArgumentException("查询结果为空，无法处理订单信息");
         }
         // 协议名称、协议类型
-        HttpResult<AgreementInfoVo> ptlAgreement =orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId(),baseController.getToken(),baseController.getAppSystemCode());
+        HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId(), baseController.getToken(), baseController.getAppSystemCode());
         insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
         insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
 
         // 业务员信息
-        SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getCreateBy(),baseController.getToken(),baseController.getAppSystemCode());
+        SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getCreateBy(), baseController.getToken(), baseController.getAppSystemCode());
         InsOrdersVo.Salesman salesman = new InsOrdersVo.Salesman();
         salesman.setName(salesmanInfo.getName());
         salesman.setDeptName(salesmanInfo.getDeptName());
@@ -388,25 +388,25 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersVo.setCarUserInfoList(null);
         }
         InsTaskImagesVo imagesAdds = insOrdersVo.getImagesAdds();
-        if (ObjectUtil.isNotEmpty(imagesAdds)){
+        if (ObjectUtil.isNotEmpty(imagesAdds)) {
             imagesAdds.getImages().forEach(image -> {
-                if (StringUtils.isNotEmpty(image.getBucketName()) && StringUtils.isNotEmpty(image.getFileName())){
+                if (StringUtils.isNotEmpty(image.getBucketName()) && StringUtils.isNotEmpty(image.getFileName())) {
                     image.setDownloadUrl(MinioUtils.getPresignedObjectUrl(image.getBucketName(), image.getFileName()));
                 }
             });
         }
-        if (CollectionUtil.isNotEmpty(insOrdersVo.getInsOrdersRiskList())){
+        if (CollectionUtil.isNotEmpty(insOrdersVo.getInsOrdersRiskList())) {
             insOrdersVo.getInsOrdersRiskList().forEach(riskInfo -> {
-                if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
+                if (StringUtils.equals(riskInfo.getRiskCode(), "0507")) {
                     insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
-                }else {
+                } else {
                     insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
                 }
             });
         }
         // 订单电子保单信息
         insOrdersVo.setInsOrdersPdfUrl(insOrdersPdfUrlService.getById(id));
-        if (insOrdersVo.getInsOrdersPdfUrl() ==  null) {
+        if (insOrdersVo.getInsOrdersPdfUrl() == null) {
             insOrdersVo.setInsOrdersPdfUrl(new InsOrdersPdfUrl());
         }
         // 特约查询
@@ -429,10 +429,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         RiskInfoVo riskInfoVo = new RiskInfoVo();
         riskInfoVo.setId(riskInfo.getId());
         riskInfoVo.setRiskCode(riskInfo.getRiskCode());
-        if (ObjectUtil.isNotNull(riskInfo.getStartDate())){
+        if (ObjectUtil.isNotNull(riskInfo.getStartDate())) {
             riskInfoVo.setStartDate(riskInfo.getStartDate().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
         }
-        if (ObjectUtil.isNotNull(riskInfo.getEndDate())){
+        if (ObjectUtil.isNotNull(riskInfo.getEndDate())) {
             riskInfoVo.setEndDate(riskInfo.getEndDate().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
         }
         return riskInfoVo;
@@ -440,7 +440,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
     public void setInsOrdersExternalPolicy(InsOrdersExternalPolicy ordersExternalPolicy) {
-        if (ObjectUtil.isNotEmpty(ordersExternalPolicy) && CollectionUtil.isNotEmpty(ordersExternalPolicy.getUploadFiles())){
+        if (ObjectUtil.isNotEmpty(ordersExternalPolicy) && CollectionUtil.isNotEmpty(ordersExternalPolicy.getUploadFiles())) {
             ordersExternalPolicy.getUploadFiles().stream().forEach(sysUploadFiles -> {
                 sysUploadFiles.setDownloadUrl(MinioUtils.getPresignedObjectUrl(sysUploadFiles.getBucketName(), sysUploadFiles.getFileName()));
             });
@@ -453,10 +453,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     private CustomerInfoVo mapCarUserInfoToCustomerInfo(InsOrdersCarUserInfo carUserInfo) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         CustomerInfoVo customerInfoVo = BeanUtil.copyProperties(carUserInfo, CustomerInfoVo.class);
-        if(Objects.nonNull(carUserInfo.getIdentifyValidDate())) {
+        if (Objects.nonNull(carUserInfo.getIdentifyValidDate())) {
             customerInfoVo.setIdentifyValidDate(carUserInfo.getIdentifyValidDate().format(formatter));
         }
-        if(Objects.nonNull(carUserInfo.getIdentifyValidEndDate())) {
+        if (Objects.nonNull(carUserInfo.getIdentifyValidEndDate())) {
             customerInfoVo.setIdentifyValidEndDate(carUserInfo.getIdentifyValidEndDate().format(formatter));
         }
         customerInfoVo.setProperty(customerInfoVo.getPersonType());
@@ -467,7 +467,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * 根据 policyPersonType 设置对应的用户信息
      */
     private void setPolicyPersonInfo(InsOrdersVo insOrdersVo, Integer policyPersonType, CustomerInfoVo customerInfoVo) {
-        if (ObjectUtil.isEmpty(policyPersonType)){
+        if (ObjectUtil.isEmpty(policyPersonType)) {
             return;
         }
         switch (policyPersonType) {
@@ -500,23 +500,23 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 //        insOrdersMapper.insert(insOrders);
 
         InsOrdersCarInfo carInfo = new InsOrdersCarInfo();
-        BeanUtils.copyProperties(carInfo,quoteVo.getCarInfoVo());
+        BeanUtils.copyProperties(carInfo, quoteVo.getCarInfoVo());
         carInfo.setOrderNo(insOrders.getId());
 
         InsOrdersCarUserInfo ownersInfo = new InsOrdersCarUserInfo();
-        BeanUtils.copyProperties(ownersInfo,quoteVo.getOwnersInfo());
+        BeanUtils.copyProperties(ownersInfo, quoteVo.getOwnersInfo());
 
         InsOrdersCarUserInfo insuredPersonInfo = new InsOrdersCarUserInfo();
-        BeanUtils.copyProperties(insuredPersonInfo,quoteVo.getInsuredPersonInfo());
+        BeanUtils.copyProperties(insuredPersonInfo, quoteVo.getInsuredPersonInfo());
 
         InsOrdersCarUserInfo policyHolderInfo = new InsOrdersCarUserInfo();
-        BeanUtils.copyProperties(policyHolderInfo,quoteVo.getPolicyHolderInfo());
+        BeanUtils.copyProperties(policyHolderInfo, quoteVo.getPolicyHolderInfo());
 
         return true;
     }
 
     @Override
-    public void setUserAreaCode(QuoteVo quoteVo){
+    public void setUserAreaCode(QuoteVo quoteVo) {
         HttpResult<PersonAreaVo> ownerAddress = orgClient.queryByAddress(
                 quoteVo.getOwnersInfo().getAddr(), quoteVo.getOwnersInfo().getIdentifyNumber());
 
@@ -558,8 +558,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     public void orderAfterUpdateQuote(String ordersNo, QuoteResultsVo quoteResponse) {
 
         // 检测主订单是否存在
-        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId,ordersNo));
-        AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
+        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId, ordersNo));
+        AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
 
         InsOrdersCarInfo carInfo = ordersCarInfoService.getByOrderId(insOrders.getId());
         //设置订单状态
@@ -574,7 +574,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         baseMapper.updateById(insOrders);
         // 判断状态 是否是成功  如何成功则处理下面的流程
-        if(stateResult.getCurrentState() == Integer.parseInt(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
+        if (stateResult.getCurrentState() == Integer.parseInt(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
             // 更新起保终保时间
             List<InsOrdersRisk> insOrdersRiskList = insOrdersRiskService.list(new LambdaQueryWrapper<InsOrdersRisk>().eq(InsOrdersRisk::getOrderNo, ordersNo));
             if (Objects.nonNull(insOrdersRiskList) && !insOrdersRiskList.isEmpty()) {
@@ -633,8 +633,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
             //更新商业险种的保费
             List<InsOrdersKind> kindList = insOrdersKindService.list(new LambdaQueryWrapper<InsOrdersKind>()
-                    .eq(InsOrdersKind::getOrderNo,ordersNo));
-            if (CollectionUtil.isNotEmpty(quoteResponse.getKindInfoVo())){
+                    .eq(InsOrdersKind::getOrderNo, ordersNo));
+            if (CollectionUtil.isNotEmpty(quoteResponse.getKindInfoVo())) {
                 quoteResponse.getKindInfoVo().forEach(kindInfoVo -> {
                     kindList.forEach(kind -> {
                         if (kind.getKindCode().equals(kindInfoVo.getPlatformKindCode())) {
@@ -646,7 +646,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersKindService.updateBatchById(kindList);
 
             // 发送订单状态变更消息
-            this.orderStatusMessage(insOrders,carInfo,ordersCosts,
+            this.orderStatusMessage(insOrders, carInfo, ordersCosts,
                     baseController.getToken(),
                     MessageCodeEnum.TEMPLATE_1);
         }
@@ -656,46 +656,46 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public void orderStatusMessage(InsOrders insOrders, InsOrdersCarInfo carInfo, InsOrdersCosts ordersCosts, String token, MessageCodeEnum tplCode) {
         // 获取消息模板 并替换内容
-        HttpResult<SysMessageTemplate>  result = orgClient.templateGet(tplCode,
+        HttpResult<SysMessageTemplate> result = orgClient.templateGet(tplCode,
                 baseController.getToken());
         SysMessageTemplate template = result.getData();
-        AssertionUtils.isFail(Objects.isNull(template),"获取模板失败！");
+        AssertionUtils.isFail(Objects.isNull(template), "获取模板失败！");
         Map<String, Object> valuesMap = new HashMap<>();
-        valuesMap.put("licenseNo",carInfo.getLicenseNo());
-        valuesMap.put("orderStatus",InsOrderStatusEnum.matchKey(insOrders.getOrderStatus()).getDesc());
-        valuesMap.put("amount",Objects.isNull(ordersCosts.getSumPremium())? new BigDecimal(0) : ordersCosts.getSumPremium());
-        String content = StringUtils.replaceContent(template.getContent(),valuesMap);
+        valuesMap.put("licenseNo", carInfo.getLicenseNo());
+        valuesMap.put("orderStatus", InsOrderStatusEnum.matchKey(insOrders.getOrderStatus()).getDesc());
+        valuesMap.put("amount", Objects.isNull(ordersCosts.getSumPremium()) ? new BigDecimal(0) : ordersCosts.getSumPremium());
+        String content = StringUtils.replaceContent(template.getContent(), valuesMap);
         // 获取接收用户
         Set<String> userList = new HashSet<>();
-        if(StringUtils.isNotBlank(insOrders.getRealQuoteUserId())){
+        if (StringUtils.isNotBlank(insOrders.getRealQuoteUserId())) {
             userList.add(insOrders.getRealQuoteUserId());
         }
         userList.add(insOrders.getCreateBy());
         List<String> recerveLsit = new ArrayList<>(userList);
-        orderMessageTemplate.SendOrderStatus(insOrders.getId(),template.getTplName(),content,
+        orderMessageTemplate.SendOrderStatus(insOrders.getId(), template.getTplName(), content,
                 recerveLsit,
-                token,tplCode);
+                token, tplCode);
     }
 
     @Override
     public void orderAfterUpdateUnderwriting(UnderwritingResultsVo underwritingResultsVo) {
         // 检测主订单是否存在
-        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId,underwritingResultsVo.getOrdersNo()));
-        AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
+        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId, underwritingResultsVo.getOrdersNo()));
+        AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
 
         //设置订单状态
         StateResult stateResult = orderStateListener.statusChange(underwritingResultsVo.getUnderwritingStatus(), insOrders.getOrderStatus());
         insOrders.setOrderStatus(String.valueOf(stateResult.getCurrentState()));
 
         //如果保司订单号存在则进行更新  有的保司在核保获取订单号
-        if(Objects.nonNull(underwritingResultsVo.getCompanyOrderNo())){
+        if (Objects.nonNull(underwritingResultsVo.getCompanyOrderNo())) {
             insOrders.setCompanyOrderNo(underwritingResultsVo.getCompanyOrderNo());
             insOrders.setPayLink(underwritingResultsVo.getPaymentLink());
         }
 
         insOrdersMapper.updateById(insOrders);
 
-        InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getOne(new LambdaQueryWrapper<InsOrdersPolicy>().eq(InsOrdersPolicy::getOrderNo,underwritingResultsVo.getOrdersNo()));
+        InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getOne(new LambdaQueryWrapper<InsOrdersPolicy>().eq(InsOrdersPolicy::getOrderNo, underwritingResultsVo.getOrdersNo()));
         if (underwritingResultsVo.getJqApplyNo() != null) {
             insOrdersPolicy.setJqApplyNo(underwritingResultsVo.getJqApplyNo());
         }
@@ -705,13 +705,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (underwritingResultsVo.getJyApplyNo() != null) {
             insOrdersPolicy.setJyApplyNo(underwritingResultsVo.getJyApplyNo());
         }
-        if(underwritingResultsVo.getJqPolicyno() != null){
+        if (underwritingResultsVo.getJqPolicyno() != null) {
             insOrdersPolicy.setJqPolicyNo(underwritingResultsVo.getJqPolicyno());
         }
-        if(underwritingResultsVo.getSyPolicyno() != null){
+        if (underwritingResultsVo.getSyPolicyno() != null) {
             insOrdersPolicy.setSyPolicyNo(underwritingResultsVo.getSyPolicyno());
         }
-        if(underwritingResultsVo.getJyPolicyno() != null){
+        if (underwritingResultsVo.getJyPolicyno() != null) {
             insOrdersPolicy.setJyPolicyNo(underwritingResultsVo.getJyPolicyno());
         }
         insOrdersPolicyService.updateById(insOrdersPolicy);
@@ -721,12 +721,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersQrcode.setId(IdGenerate.nextId());
         insOrdersQrcode.setOrderno(underwritingResultsVo.getOrdersNo());
         String paylink = "";
-        if(isHttpUrl(insOrders.getPayLink())){
+        if (isHttpUrl(insOrders.getPayLink())) {
             paylink = insOrders.getPayLink().replace("{", "").replace("}", "");
             insOrdersQrcode.setJumpUrl(paylink);
-        }else{
-            if(paylink.contains("data:image/jpg;base64,")){
-                paylink = paylink.replace("data:image/jpg;base64,","");
+        } else {
+            if (paylink.contains("data:image/jpg;base64,")) {
+                paylink = paylink.replace("data:image/jpg;base64,", "");
             }
             insOrdersQrcode.setJumpUrl(paylink);
         }
@@ -748,7 +748,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     @Transactional
-    public String generateOrders(QuoteVo quoteVo,String companyName) {
+    public String generateOrders(QuoteVo quoteVo, String companyName) {
         // 生成订单的条件
         // 1个保险公司只有一个主订单   不区分险种
         InsOrders mainOrders = this.getMainOrders(
@@ -756,39 +756,39 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 quoteVo.getCarInfoVo().getLicenseNo(),
                 quoteVo.getCarInfoVo().getVinNo());
         boolean isExistsMainOrder = false;
-        if (Objects.nonNull(mainOrders))
-        {
+        if (Objects.nonNull(mainOrders)) {
             isExistsMainOrder = true;
         }
         String mainOrderNo;
         // 如果订单号为0 则生成主订单
         if (!isExistsMainOrder) {
             // 生成主订单
-            mainOrderNo = this.saveBaseOrderorSubOrder(quoteVo,companyName,"0");
-        }else{
+            mainOrderNo = this.saveBaseOrderorSubOrder(quoteVo, companyName, "0");
+        } else {
             // 更新主订单
-            mainOrderNo = this.updateMainOrders(quoteVo,mainOrders.getId(),companyName);
+            mainOrderNo = this.updateMainOrders(quoteVo, mainOrders.getId(), companyName);
         }
         // 生成子订单
-        return this.saveBaseOrderorSubOrder(quoteVo,companyName,mainOrderNo);
+        return this.saveBaseOrderorSubOrder(quoteVo, companyName, mainOrderNo);
     }
 
 
     /**
      * 保存主订单或者子订单
+     *
      * @param quoteVo
      * @param companyName
-     * @param mainOrderNo   主订单号
+     * @param mainOrderNo 主订单号
      * @return
      */
-    private String saveBaseOrderorSubOrder(QuoteVo quoteVo,String companyName,String mainOrderNo){
+    private String saveBaseOrderorSubOrder(QuoteVo quoteVo, String companyName, String mainOrderNo) {
         // 保存主订单信息
         InsOrders insOrders = new InsOrders();
         // 生成主订单编号
-        if ("0".equals(mainOrderNo)){
+        if ("0".equals(mainOrderNo)) {
             insOrders.setParentId("0");
             insOrders.setId(IdGenerate.nextId());
-        }else{
+        } else {
             // 生成子订单编号
             insOrders.setParentId(mainOrderNo);
             insOrders.setId(IdGenerate.nextId());
@@ -804,9 +804,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getProductId()));
         String productName = ProductsType.getProductNameByCode(quoteVo.getProductId());
         insOrders.setProductName(productName);
-        if(Objects.isNull(insOrders.getRealQuoteUserId())) {
+        if (Objects.isNull(insOrders.getRealQuoteUserId())) {
+            String userName = baseController.getUserName();
+
             insOrders.setRealQuoteUserId(baseController.getUserName());
-        }else{
+        } else {
             insOrders.setRealQuoteUserId(quoteVo.getOrder().getRealQuoteUserId());
         }
         insOrdersMapper.insert(insOrders);
@@ -818,18 +820,18 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         List<InsOrdersCarUserInfo> insOrdersCarUserInfoList = new ArrayList<>();
 
         // 添加车主信息
-        insOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getOwnersInfo(), insOrders.getId(),1));
+        insOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getOwnersInfo(), insOrders.getId(), 1));
         // 添加投保人信息
-        insOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getPolicyHolderInfo(), insOrders.getId(),2));
+        insOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getPolicyHolderInfo(), insOrders.getId(), 2));
         // 添加被保险人信息
-        insOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getInsuredPersonInfo(), insOrders.getId(),3));
+        insOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getInsuredPersonInfo(), insOrders.getId(), 3));
         ordersCarUserInfoService.saveBatch(insOrdersCarUserInfoList);
 
         // 保存订单费用信息 ins_orders_costs
         insOrdersCostsService.createCosts(insOrders);
 
         // 保存订单险种信息 ins_orders_kind
-        insOrdersKindService.createKind(insOrders, quoteVo.getKindInfoVo(),quoteVo.getOrder().getInsuranceCompanyCode());
+        insOrdersKindService.createKind(insOrders, quoteVo.getKindInfoVo(), quoteVo.getOrder().getInsuranceCompanyCode());
 
         // 保存订单其他信息 ins_orders_other
         insOrdersOtherService.createOther(insOrders);
@@ -838,24 +840,25 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersPolicyService.createPolicy(insOrders);
 
         // 保存订单险种信息 ins_orders_risk
-        insOrdersRiskService.createRisk(insOrders, quoteVo.getCiRiskInfoVo(),quoteVo.getBiRiskInfoVo());
+        insOrdersRiskService.createRisk(insOrders, quoteVo.getCiRiskInfoVo(), quoteVo.getBiRiskInfoVo());
 
         // 保存订单车船税税信息 ins_orders_tax
-        insOrdersTaxService.createTax(insOrders,quoteVo);
+        insOrdersTaxService.createTax(insOrders, quoteVo);
 
         // 保存特约信息
         if (quoteVo.getSpecialInfoVo() != null) {
-            insOrdersClauseService.createClause(insOrders,quoteVo);
+            insOrdersClauseService.createClause(insOrders, quoteVo);
         }
         return insOrders.getId();
     }
 
     /**
      * 更新主订单信息
+     *
      * @param quoteVo
      * @return
      */
-    private String updateMainOrders(QuoteVo quoteVo,String mainOrderNo, String companyName){
+    private String updateMainOrders(QuoteVo quoteVo, String mainOrderNo, String companyName) {
         InsOrders insOrders = this.getById(mainOrderNo);
 
         // 轨迹赋值
@@ -873,9 +876,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getProductId()));
         String productName = ProductsType.getProductNameByCode(quoteVo.getProductId());
         insOrders.setProductName(productName);
-        if(Objects.isNull(insOrders.getRealQuoteUserId())) {
+        if (Objects.isNull(insOrders.getRealQuoteUserId())) {
             insOrders.setRealQuoteUserId(baseController.getUserName());
-        }else{
+        } else {
             insOrders.setRealQuoteUserId(quoteVo.getOrder().getRealQuoteUserId());
         }
         this.updateById(insOrders);
@@ -885,19 +888,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         newOrder.setProductName(insOrders.getProductName());
         // 更新主订单车辆信息
         InsOrdersCarInfo carInfo = ordersCarInfoService.getById(mainOrderNo);
-        ordersCarInfoService.updateMainOrderCarInfo(quoteVo.getCarInfoVo(), carInfo,insOrders);
+        ordersCarInfoService.updateMainOrderCarInfo(quoteVo.getCarInfoVo(), carInfo, insOrders);
 
         // 更新主订单用户信息
         List<InsOrdersCarUserInfo> subOrdersCarUserInfoList = new ArrayList<>();
 
         List<InsOrdersCarUserInfo> insOrdersCarUserInfoList = ordersCarUserInfoService.getByOrderId(mainOrderNo);
         // 添加车主信息
-        subOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getOwnersInfo(), insOrders.getId(),1));
+        subOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getOwnersInfo(), insOrders.getId(), 1));
         // 添加投保人信息
-        subOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getPolicyHolderInfo(), insOrders.getId(),2));
+        subOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getPolicyHolderInfo(), insOrders.getId(), 2));
         // 添加被保险人信息
-        subOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getInsuredPersonInfo(), insOrders.getId(),3));
-        ordersCarUserInfoService.updateMainOrderCarUserInfo(insOrdersCarUserInfoList, subOrdersCarUserInfoList,carInfo,insOrders);
+        subOrdersCarUserInfoList.add(new InsOrdersCarUserInfo(quoteVo.getInsuredPersonInfo(), insOrders.getId(), 3));
+        ordersCarUserInfoService.updateMainOrderCarUserInfo(insOrdersCarUserInfoList, subOrdersCarUserInfoList, carInfo, insOrders);
 
         // 更新订单费用信息 ins_orders_costs
         insOrdersCostsService.updateMainCosts(insOrders);
@@ -925,10 +928,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 //        insOrdersPolicyService.createPolicy(insOrders);
 
         // 保存订单险种信息 ins_orders_risk
-        insOrdersRiskService.updateMainRisk(quoteVo.getCiRiskInfoVo(),quoteVo.getBiRiskInfoVo(), mainOrderNo);
+        insOrdersRiskService.updateMainRisk(quoteVo.getCiRiskInfoVo(), quoteVo.getBiRiskInfoVo(), mainOrderNo);
 
         // 保存订单车船税税信息 ins_orders_tax
-        insOrdersTaxService.updateMainTax(quoteVo, mainOrderNo,carInfo,insOrders);
+        insOrdersTaxService.updateMainTax(quoteVo, mainOrderNo, carInfo, insOrders);
         return mainOrderNo;
     }
 
@@ -939,7 +942,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
     @Override
-    public Page<OrderListVo> queryList(InsOrdersParam insOrdersParam){
+    public Page<OrderListVo> queryList(InsOrdersParam insOrdersParam) {
         String userName = baseController.getUserName();
         insOrdersParam.setSalesman(userName);
         Page<OrderListVo> orderListVoPage = insOrdersMapper.queryOrderList(insOrdersParam.getPage(), insOrdersParam);
@@ -950,12 +953,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public QuoteEchoVo getOrderDetail(String ordersNo) {
         InsOrdersVo insOrdersVo = selectById(Long.parseLong(ordersNo));
-        AssertionUtils.isFail(Objects.isNull(insOrdersVo),"订单不存在");
+        AssertionUtils.isFail(Objects.isNull(insOrdersVo), "订单不存在");
         QuoteEchoVo resultVo = new QuoteEchoVo(insOrdersVo);
         //获取保司信息
         String companyId = insOrdersVo.getInsOrders().getCompanyId();
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findLogoById(companyId, baseController.getToken());
-        if(esmInsCompanyHttpResult.getCode()==200){
+        if (esmInsCompanyHttpResult.getCode() == 200) {
             resultVo.setInsCompanyVo(esmInsCompanyHttpResult.getData());
         }
         // 影像资料
@@ -972,7 +975,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             imagesVo.setImageType(images.getImageType());
             imagesVo.setFileType(sysUploadFiles.getFileType());
             imagesVo.setBucketName(sysUploadFiles.getBucketName());
-            imagesVo.setDownloadUrl(MinioUtils.getPresignedObjectUrl(bucketName,sysUploadFiles.getFileName()));
+            imagesVo.setDownloadUrl(MinioUtils.getPresignedObjectUrl(bucketName, sysUploadFiles.getFileName()));
             imageVoList.add(imagesVo);
         }
         resultVo.setImageVoList(imageVoList);
@@ -987,8 +990,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (insFeeOrders != null) {
             resultVo.setInsFeeOrders(new InsFeeOrdersVo(insFeeOrders));
             List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList = orgClient.queryByCostId(insFeeOrders.getCostId());
-            PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId(),baseController.getToken());
-            resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList,ptlAgreement));
+            PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId(), baseController.getToken());
+            resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList, ptlAgreement));
         }
         return resultVo;
     }
@@ -998,7 +1001,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * 获取历史报价信息
      * @return
      */
-    public List<HistoryQuoteResultVo> getHistoryQuote(){
+    public List<HistoryQuoteResultVo> getHistoryQuote() {
         String userName = baseController.getUserName();
         return insOrdersMapper.getHistoryQuote(userName);
     }
@@ -1010,15 +1013,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .groupBy(InsOrders::getCompanyId));
         List<String> companyIds = insOrders.stream().map(InsOrders::getCompanyId).filter(Objects::nonNull).collect(Collectors.toList());
         String joined = String.join(",", companyIds);
-        HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined,baseController.getToken());
+        HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined, baseController.getToken());
         return companyByIds.getData();
     }
 
     @Override
     public void orderAfterUpdateOrderStatus(String orderNo, OrderStatusResultVo orderStatusResultVo) {
         // 检测主订单是否存在
-        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId,orderNo));
-        AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
+        InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId, orderNo));
+        AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
         InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoMapper.selectById(insOrders.getId());
         InsOrdersCosts costs = insOrdersCostsService.getById(insOrders.getId());
         //设置订单状态
@@ -1027,30 +1030,30 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         //更新保单号
         InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getById(orderNo);
-        if(Objects.nonNull(orderStatusResultVo.getJqPolicyno())) {
+        if (Objects.nonNull(orderStatusResultVo.getJqPolicyno())) {
             insOrdersPolicy.setJyPolicyNo(orderStatusResultVo.getJyPolicyno());
         }
-        if(Objects.nonNull(orderStatusResultVo.getSyPolicyno())) {
+        if (Objects.nonNull(orderStatusResultVo.getSyPolicyno())) {
             insOrdersPolicy.setSyPolicyNo(orderStatusResultVo.getSyPolicyno());
         }
         insOrdersPolicyService.updateById(insOrdersPolicy);
 
         //更新支付连接
-        if(orderStatusResultVo.getOrderStatus().equals(InsOrderStatusEnum.PAY_PENDING)) {
+        if (orderStatusResultVo.getOrderStatus().equals(InsOrderStatusEnum.PAY_PENDING)) {
             insOrders.setPayLink(orderStatusResultVo.getPaymentLink());
             insOrders.setPayTime(LocalDateTime.now());
             // 发送订单状态变更消息
             this.orderStatusMessage(insOrders,
-                    insOrdersCarInfo,costs,
+                    insOrdersCarInfo, costs,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_5);
-        } else if(orderStatusResultVo.getOrderStatus().equals(InsOrderStatusEnum.UNDERWRITED)){
+        } else if (orderStatusResultVo.getOrderStatus().equals(InsOrderStatusEnum.UNDERWRITED)) {
             // 增加财务审核
             insFeeAuditService.feeAuditAdd(insOrders);
             // 发送订单状态变更消息
             this.orderStatusMessage(insOrders,
-                    insOrdersCarInfo,costs,
+                    insOrdersCarInfo, costs,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_6);
-        } else{
+        } else {
             insOrders.setErrorMessage(orderStatusResultVo.getErrorMsg());
         }
         this.updateById(insOrders);

tenant/organization/src/main/java/com/jzg/organization/client/CostsRuleClient.java

@@ -9,6 +9,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(name="jzg-costsorrule",url = "http://localhost:8001/")
 public interface CostsRuleClient {
 
+    /**
+     * 规则校验
+     * @param validateSchemeRuleVo
+     * @return HttpResult
+     */
     @PostMapping("/validate/rule/validateSchemeRule")
     public HttpResult validateSchemeRule(@RequestBody ValidateSchemeRuleVo validateSchemeRuleVo);
 

tenant/organization/src/main/java/com/jzg/organization/client/EsmInsCompanyClient.java

@@ -35,11 +35,10 @@ public interface EsmInsCompanyClient {
     /**
      * 获取用户的保司信息
      * @param systemCode
-     * @return
+     * @return HttpResult<List<EsmInsCompany>>
      */
     @GetMapping("/system/getUserCompany")
-    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode,
-                                                          @RequestHeader("Authorization") String token);
+    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode, @RequestHeader("Authorization") String token);
 
 
 

tenant/organization/src/main/java/com/jzg/organization/controller/AgreementController.java

@@ -232,7 +232,12 @@ public class AgreementController extends BaseController {
         return HttpResult.ok("修改成功");
     }
 
-    @Operation(summary = "根据保险公司查找协议")
+    /**
+     * 根据保险公司ID查找协议
+     * @param companyId
+     * @return HttpResult
+     */
+    @Operation(summary = "根据保险公司ID查找协议")
     @GetMapping("/getByCompanyId")
     public HttpResult getByCompanyCode(String companyId) {
         return HttpResult.ok(agreementService.getByCompanyId(companyId));

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,6 +23,7 @@ import com.jzg.organization.service.PtlAgreementDeptService;
 import com.jzg.organization.service.PtlAgreementService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
 import com.jzg.organization.service.PtlSchemeService;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,6 +36,7 @@ import java.util.stream.Collectors;
 
 
 @Service
+@Slf4j
 public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme> implements PtlSchemeService {
 
     @Value("${minio.bucket-name}")
@@ -322,9 +325,11 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         }else{
             systemCode = baseController.getUserSystemCode();
         }
+        log.info("ruleFilterCompany systemCode:{}",systemCode);
         //根据权限获取所有保司
         HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken());
         AssertionUtils.isFail(companyListResult.getCode()!=200,companyListResult.getMsg());
+
         List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
@@ -333,6 +338,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 .like(PtlScheme::getVehicleType, schemeRuleFilterVo.getCarInfo().getCarKindCode())
                 .eq(PtlScheme::getProductId,schemeRuleFilterVo.getProductId())
                 .eq(PtlScheme::getIsDelete, 0));
+        log.info("ruleFilterCompany ptlSchemes:{}",ptlSchemes);
 
         // 查找规则
         List<String> ptlSchemeIds = ptlSchemes.stream().map(PtlScheme::getId).collect(Collectors.toList());
@@ -345,12 +351,16 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         // 将规则根据schemeId聚合转换成Map
         Map<String, List<PtlSchemeRulesAttrLink>> ptlSchemeRulesAttrLinkMap = ptlSchemeRulesAttrLinks.stream()
               .collect(Collectors.groupingBy(PtlSchemeRulesAttrLink::getSchemeId));
+        //log.info("ptlSchemeRulesAttrLinkMap的值{}", JSON.toJSONString(ptlSchemeRulesAttrLinkMap));
 
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
         validateSchemeRuleVo.setAttrLinks(ptlSchemeRulesAttrLinks);
+
         HttpResult<List<String>> esmInsCompanyHttpResult = costsRuleClient.validateSchemeRule(validateSchemeRuleVo);
         List<String> insSchemeIds = esmInsCompanyHttpResult.getData();
+        log.info("insSchemeIds:{}",insSchemeIds);
+
         //开始过滤保险公司
         //1.过滤方案
         ptlSchemes.removeIf(ptlScheme -> !insSchemeIds.contains(ptlScheme.getId()));