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

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/dto/GuoRenBiDTO.java

@@ -127,7 +127,7 @@ public class GuoRenBiDTO {
             prpTmain.setEndDate(TimeUtils.extractDate(biRiskInfoVo.getEndDate()));
             prpTmain.setEndHour(24);
             prpTmain.setEndMinute(0);
-            this.prptitemkindList = GuoRenCrawlerCalculationPremiumRequest.PrptitemkindListDTO.getBiPrptitemkindList(kindInfoVo, prpTmain);
+            this.prptitemkindList = GuoRenCrawlerCalculationPremiumRequest.PrptitemkindListDTO.getBiPrptitemkindList(kindInfoVo, prpTmain, prpTitemCar.getNewEnergyFlag());
 
         }
         this.prpTitemCar = prpTitemCar;
@@ -160,7 +160,7 @@ public class GuoRenBiDTO {
         this.inputRisk0530 = 0;
         this.shortRate = 100;
         this.calculateFlagBI = "1";
-        this.termsSystem = "04";
+        this.termsSystem = "1".equals(prpTitemCar.getNewEnergyFlag()) ? "05" : "04";
     }
 
     @NoArgsConstructor

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerCalculationPremiumRequest.java

@@ -2,7 +2,8 @@ package com.jzg.quotation.guoren.crawler.entity.request;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.commons.entity.quote.vo.*;
+import com.jzg.commons.entity.quote.vo.KindInfoVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.commons.utils.TimeProcessing;
@@ -14,7 +15,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.util.ObjectUtils;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * @author wks
@@ -265,14 +266,22 @@ public class GuoRenCrawlerCalculationPremiumRequest {
         private Integer shareSumLimitSign;
 
 
-        public PrptitemkindListDTO(KindInfoVo kindInfoVo, GuoRenPrpTmainDTO prpTmain) {
-            InsuranceItem insuranceItem = InsuranceMap.INSURANCE_MAP.get(kindInfoVo.getKindCode());
+        public PrptitemkindListDTO(KindInfoVo kindInfoVo, GuoRenPrpTmainDTO prpTmain, String newEnergyFlag) {
+            String kindCode = kindInfoVo.getKindCode();
+            // 新能源汽车：普通条款险种(20X)切换为新能源条款险种(21X)
+            if ("1".equals(newEnergyFlag) && kindCode.startsWith("20")) {
+                String newEnergyCode = "21" + kindCode.substring(2);
+                if (InsuranceMap.INSURANCE_MAP.containsKey(newEnergyCode)) {
+                    kindCode = newEnergyCode;
+                }
+            }
+            InsuranceItem insuranceItem = InsuranceMap.INSURANCE_MAP.get(kindCode);
             if (ObjectUtils.isEmpty(insuranceItem)) {
                 throw new SystemException("未知险种");
             }
             this.checked = 1;
-            this.kindCode = kindInfoVo.getKindCode();
-            this.kindName = kindInfoVo.getKindName();
+            this.kindCode = kindCode;
+            this.kindName = kindCode.equals(kindInfoVo.getKindCode()) ? kindInfoVo.getKindName() : insuranceItem.getName();
             this.itemKindNo = Integer.parseInt(insuranceItem.getItemKindNo());
             this.shortRateFlag = "2";
             this.shortRate = "100.0000";
@@ -359,8 +368,8 @@ public class GuoRenCrawlerCalculationPremiumRequest {
             return List.of(prptitemkindListDTO);
         }
 
-        public static List<PrptitemkindListDTO> getBiPrptitemkindList(List<KindInfoVo> kindInfoVo, GuoRenPrpTmainDTO prpTmain) {
-            return kindInfoVo.stream().map(x -> new PrptitemkindListDTO(x, prpTmain)).toList();
+        public static List<PrptitemkindListDTO> getBiPrptitemkindList(List<KindInfoVo> kindInfoVo, GuoRenPrpTmainDTO prpTmain, String newEnergyFlag) {
+            return kindInfoVo.stream().map(x -> new PrptitemkindListDTO(x, prpTmain, newEnergyFlag)).toList();
         }
 
 

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

@@ -1849,30 +1849,36 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         } else {
             insOrdersVo = selectById(Long.parseLong(ordersNo));
         }
+        HttpResult<List<SysArea>> sysAreasResult;
+        try{
+            sysAreasResult = orgClient.queryAllParent(insOrdersVo.getOwnersInfo().getCountyCode());
+            if(sysAreasResult.getCode() == 200) {
+                List<SysArea> sysAreas = sysAreasResult.getData();
+                insOrdersVo.getOwnersInfo().setProvince(sysAreas.get(3).getAreaCname());
+                insOrdersVo.getOwnersInfo().setCity(sysAreas.get(2).getAreaCname());
+                insOrdersVo.getOwnersInfo().setCounty(sysAreas.get(1).getAreaCname());
+            }
+            HttpResult<List<SysArea>> sysPoliCyAreasResult = orgClient.queryAllParent(insOrdersVo.getPolicyHolderInfo().getCountyCode());
+            if(sysPoliCyAreasResult.getCode() == 200) {
+                List<SysArea> sysAreas = sysAreasResult.getData();
+                insOrdersVo.getPolicyHolderInfo().setProvince(sysAreas.get(3).getAreaCname());
+                insOrdersVo.getPolicyHolderInfo().setCity(sysAreas.get(2).getAreaCname());
+                insOrdersVo.getPolicyHolderInfo().setCounty(sysAreas.get(1).getAreaCname());
+            }
 
-        HttpResult<List<SysArea>> sysAreasResult = orgClient.queryAllParent(insOrdersVo.getOwnersInfo().getCountyCode());
-        if(sysAreasResult.getCode() == 200) {
-            List<SysArea> sysAreas = sysAreasResult.getData();
-            insOrdersVo.getOwnersInfo().setProvince(sysAreas.get(3).getAreaCname());
-            insOrdersVo.getOwnersInfo().setCity(sysAreas.get(2).getAreaCname());
-            insOrdersVo.getOwnersInfo().setCounty(sysAreas.get(1).getAreaCname());
+            HttpResult<List<SysArea>> sysInsuredAreasResult = orgClient.queryAllParent(insOrdersVo.getInsuredPersonInfo().getCountyCode());
+            if(sysInsuredAreasResult.getCode() == 200) {
+                List<SysArea> sysAreas = sysAreasResult.getData();
+                insOrdersVo.getInsuredPersonInfo().setProvince(sysAreas.get(3).getAreaCname());
+                insOrdersVo.getInsuredPersonInfo().setCity(sysAreas.get(2).getAreaCname());
+                insOrdersVo.getInsuredPersonInfo().setCounty(sysAreas.get(1).getAreaCname());
+            }
+        }catch (Exception e){
+            log.info("处理地址异常");
         }
 
-        HttpResult<List<SysArea>> sysPoliCyAreasResult = orgClient.queryAllParent(insOrdersVo.getPolicyHolderInfo().getCountyCode());
-        if(sysPoliCyAreasResult.getCode() == 200) {
-            List<SysArea> sysAreas = sysAreasResult.getData();
-            insOrdersVo.getPolicyHolderInfo().setProvince(sysAreas.get(3).getAreaCname());
-            insOrdersVo.getPolicyHolderInfo().setCity(sysAreas.get(2).getAreaCname());
-            insOrdersVo.getPolicyHolderInfo().setCounty(sysAreas.get(1).getAreaCname());
-        }
 
-        HttpResult<List<SysArea>> sysInsuredAreasResult = orgClient.queryAllParent(insOrdersVo.getInsuredPersonInfo().getCountyCode());
-        if(sysInsuredAreasResult.getCode() == 200) {
-            List<SysArea> sysAreas = sysAreasResult.getData();
-            insOrdersVo.getInsuredPersonInfo().setProvince(sysAreas.get(3).getAreaCname());
-            insOrdersVo.getInsuredPersonInfo().setCity(sysAreas.get(2).getAreaCname());
-            insOrdersVo.getInsuredPersonInfo().setCounty(sysAreas.get(1).getAreaCname());
-        }
+
 
         log.info("根据orderNo=[{}]查询到的订单明细[{}]", ordersNo, JSONUtil.toJsonStr(insOrdersVo));
         AssertionUtils.isFail(Objects.isNull(insOrdersVo), "订单不存在");

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -934,7 +934,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr !=3
+            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4,5)
             <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                 and io.real_quote_user_id in (select bbb.mobile from sys_user bbb where bbb.id in ( select ss.user_id
                 from sys_user_jzg_info ss where 1 =1 and (ss.leader_id = #{insOrdersParam.jzgInfoId} or ss.id
@@ -1123,7 +1123,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0 and sujis.type_attr !=3
+            and io.is_delete = 0 and sujis.type_attr NOT IN (1,2,3,4,5)
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND io.id = #{insOrdersParam.orderNo}
             </if>
@@ -1331,7 +1331,7 @@
         ) x WHERE x.rn = 1
         ) ioa1 ON io.id = ioa1.order_no
         <where>
-            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr !=3
+            and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4,5)
             <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                 and io.real_quote_user_id in (select bbb.mobile from sys_user bbb where bbb.id in ( select ss.user_id
                 from sys_user_jzg_info ss where 1 =1 and (ss.leader_id = #{insOrdersParam.jzgInfoId} or ss.id
@@ -1544,7 +1544,7 @@
             ) x WHERE x.rn = 1
             ) ioa1 ON io.id = ioa1.order_no
             <where>
-                and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr !=3
+                and io.is_delete = 0 and io.parent_id != '0' and sujis.type_attr NOT IN (1,2,3,4,5)
                 <if test="insOrdersParam.jzgInfoId != null and insOrdersParam.jzgInfoId != ''">
                     and io.real_quote_user_id in (select bbb.mobile from sys_user bbb where bbb.id in ( select ss.user_id
                     from sys_user_jzg_info ss where 1 =1 and (ss.leader_id = #{insOrdersParam.jzgInfoId} or ss.id