永诚修改和紫金修改

src/main/java/com/ydtech/modules/ins/model/guoren/PremiumReq.java

@@ -693,6 +693,8 @@ public class PremiumReq {
                 LocalDateTime end = start.plusYears(1L).minusDays(1L);
                 newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
                 newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
+                this.getPrpTmain().setImmeValidStartDate(null);
+                this.getPrpTmain().setImmeValidEndDate(null);
             }
 
             this.getPrpTmain().setStartDate(newStartDate);
@@ -1100,6 +1102,8 @@ public class PremiumReq {
                 LocalDateTime end = start.plusYears(1L).minusDays(1L);
                 newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
                 newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
+                this.getPrpTmain().setImmeValidStartDate(null);
+                this.getPrpTmain().setImmeValidEndDate(null);
             }
             this.getPrpTmain().setStartDate(newStartDate);
             this.getPrpTmain().setEndDate(newEndDate);

src/main/java/com/ydtech/modules/order/components/gouren/GuorenDuplicateInsuranceComponent.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.components.gouren;
 
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.Gson;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.ins.model.guoren.PremiumReq;
 import com.ydtech.modules.ins.model.guoren.PremiumResp;
@@ -13,10 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

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

@@ -861,13 +861,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
             FeeOrderNewVo feeOrderNewVo = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew, ptlAgreementProductCostsNew);
+
             feeOrderNewVo.setFeeId(insFeeOrderNew.getId());
             orderAndAreaCompany.setFeeOrderNewVo(feeOrderNewVo);
             //计算总和
 
             BigDecimal sum = feeOrderNewVo.getExportFee()
                     .stream()
-                    .filter(x -> BusinessConstant.FEE_INSURANCE_TYPE_4.equals(x.getInsuranceType()))
+                    .filter(x -> !BusinessConstant.FEE_INSURANCE_TYPE_4.equals(x.getInsuranceType()))
                     .map(FeeOrderNewVo.ExportFee::getTotalAmount)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             orderAndAreaCompany.setSumFee(sum.toString());
@@ -1524,7 +1525,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
             BigDecimal sum = feeOrderNewVo.getExportFee()
                     .stream()
-                    .filter(x -> BusinessConstant.FEE_INSURANCE_TYPE_4.equals(x.getInsuranceType()))
+                    .filter(x -> !BusinessConstant.FEE_INSURANCE_TYPE_4.equals(x.getInsuranceType()))
                     .map(FeeOrderNewVo.ExportFee::getTotalAmount)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             orderAndAreaCompany.setSumFee(sum.toString());
@@ -1910,7 +1911,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                     if (feeOrderNewVo != null && feeOrderNewVo.getExportFee() != null && feeOrderNewVo.getExportFee().size() > 0) {
                         sumyh = feeOrderNewVo.getExportFee()
                                 .stream()
-                                .filter(x -> BusinessConstant.FEE_INSURANCE_TYPE_4.equals(x.getInsuranceType()))
+                                .filter(x -> !BusinessConstant.FEE_INSURANCE_TYPE_4.equals(x.getInsuranceType()))
                                 .map(FeeOrderNewVo.ExportFee::getTotalAmount)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }

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

@@ -192,6 +192,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             queryClauseDataRequest.setRiskCode(RiskCodeEnum.RC_0590.getCode());
             QueryClauseDataResponse queryClauseDataResponse = zijinRequestApiComponents.queryClauseData(queryClauseDataRequest,
                     httpHeaders);
+            queryClauseDataResponse.getClauseInfoDtoList().forEach(x->x.setRiskCode(InsuranceRisk.TRAFFIC.getCode()));
             clauseInfoDtoList.addAll(queryClauseDataResponse.getClauseInfoDtoList());
         }
         // 2.2 获取商业险特约特约
@@ -199,6 +200,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             queryClauseDataRequest.setRiskCode(RiskCodeEnum.RC_050A.getCode());
             QueryClauseDataResponse queryClauseDataResponse = zijinRequestApiComponents.queryClauseData(queryClauseDataRequest,
                     httpHeaders);
+            queryClauseDataResponse.getClauseInfoDtoList().forEach(x->x.setRiskCode(InsuranceRisk.BUSINESS.getCode()));
             clauseInfoDtoList.addAll(queryClauseDataResponse.getClauseInfoDtoList());
         }
         return HttpResult.ok(clauseInfoDtoList);