1. 华泰添加警告信息

src/main/java/com/ydtech/modules/order/components/huatai/HuaTaiQuotationProcessorComponent.java

@@ -26,7 +26,7 @@ public class HuaTaiQuotationProcessorComponent {
 
     private final HuaTaiRepeatInsuranceComponents huaTaiRepeatInsuranceComponents;
 
-    public HuaTaiQuotedPriceResponse handler(HuaTaiQuotedPriceRequest quotedPriceRequest, BaseQuoteInfoVo quoteInfo) {
+    public HuaTaiQuotedPriceResponse handler(HuaTaiQuotedPriceRequest quotedPriceRequest, List<String> warnMessageList) {
         boolean b;
         HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiRequestApiComponents.quotedPrice(quotedPriceRequest,
                 HuaTaiQuotedPriceResponse.class);
@@ -39,27 +39,27 @@ public class HuaTaiQuotationProcessorComponent {
         }
 
         // 交强险重复投保
-        b = huaTaiRepeatInsuranceComponents.compulsoryInsurance(quotedPriceRequest, quotedPriceResponse);
+        b = huaTaiRepeatInsuranceComponents.compulsoryInsurance(quotedPriceRequest, quotedPriceResponse, warnMessageList);
         if (b) {
-            return handler(quotedPriceRequest, quoteInfo);
+            return handler(quotedPriceRequest, warnMessageList);
         }
 
         // 商业险重复投保
-        b = huaTaiRepeatInsuranceComponents.commercialInsurance(quotedPriceRequest, quotedPriceResponse);
+        b = huaTaiRepeatInsuranceComponents.commercialInsurance(quotedPriceRequest, quotedPriceResponse, warnMessageList);
         if (b) {
-            return handler(quotedPriceRequest, quoteInfo);
+            return handler(quotedPriceRequest, warnMessageList);
         }
 
         // 校验码
         b = huaTaiReinsuranceComponents.processor(quotedPriceResponse, quotedPriceRequest);
         if (b) {
-            return handler(quotedPriceRequest, quoteInfo);
+            return handler(quotedPriceRequest, warnMessageList);
         }
 
         // 校验码有误
         b = huaTaiReinsuranceComponents.processor(quotedPriceResponse);
         if (b) {
-            return handler(quotedPriceRequest, quoteInfo);
+            return handler(quotedPriceRequest, warnMessageList);
         }
 
 

src/main/java/com/ydtech/modules/order/components/huatai/HuaTaiRepeatInsuranceComponents.java

@@ -37,7 +37,8 @@ public class HuaTaiRepeatInsuranceComponents {
      * @return true 重新请求 false 跳过
      */
     public boolean compulsoryInsurance(HuaTaiQuotedPriceRequest huaTaiQuotedPriceRequest,
-                                       HuaTaiQuotedPriceResponse quotedPriceResponse) {
+                                       HuaTaiQuotedPriceResponse quotedPriceResponse,
+                                       List<String> warnMessageList) {
         HuaTaiBaseResponseHead head = quotedPriceResponse.getHead();
         if ("0".equals(head.getReturnCode())) {
             return false;
@@ -58,6 +59,7 @@ public class HuaTaiRepeatInsuranceComponents {
         if (StringUtils.isNotEmpty(returnMessage) && returnMessage.contains("重复投保")) {
             String jqEndDate = GuorenDuplicateInsuranceComponent.getEndDate(returnMessage,
                     GuorenDuplicateInsuranceComponent.THE_FIRST_REGEX);
+            warnMessageList.add(returnMessage);
             getPeriodDate(jqEndDate, contractMain);
             return true;
         }
@@ -73,7 +75,8 @@ public class HuaTaiRepeatInsuranceComponents {
      * @return true 重新请求 false 跳过
      */
     public boolean commercialInsurance(HuaTaiQuotedPriceRequest huaTaiQuotedPriceRequest,
-                                       HuaTaiQuotedPriceResponse quotedPriceResponse) {
+                                       HuaTaiQuotedPriceResponse quotedPriceResponse,
+                                       List<String> warnMessageList) {
 
         HuaTaiBaseResponseHead head = quotedPriceResponse.getHead();
         if ("-1".equals(head.getReturnCode())) {
@@ -103,7 +106,7 @@ public class HuaTaiRepeatInsuranceComponents {
         if (!ObjectUtils.isEmpty(contractResponse) && !ObjectUtils.isEmpty(platFormMessage) && !StringUtils.isEmpty(reInsureMsg)) {
             String syEndDate = GuorenDuplicateInsuranceComponent.getEndDate(reInsureMsg,
                     GuorenDuplicateInsuranceComponent.THE_FIRST_REGEX);
-
+            warnMessageList.add(reInsureMsg);
             getPeriodDate(syEndDate, contractMain);
             return true;
         }

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

@@ -138,15 +138,17 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 zmQuoteVo.getAccidentalDrivingVo(), huaTaiConfigureParameters);
         quotedPriceRequest.setHead(baseRequestHead);
 
+
         // 3.1 处理报价请求
+        List<String> warnMessageList = new ArrayList<>();
         HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiQuotationProcessorComponent.handler(quotedPriceRequest,
-                quoteInfo);
+                warnMessageList);
 
         if(!"0".equals(quotedPriceResponse.getHead().getReturnCode())){
             throw new SystemException(quotedPriceResponse.getHead().getReturnMessage());
         }
 
-        QuoteRespVo quoteRespVo = getQuoteRespVo(quotedPriceResponse, quoteInfo);
+        QuoteRespVo quoteRespVo = getQuoteRespVo(quotedPriceResponse, quoteInfo, warnMessageList);
         //这里调用费用匹配功能
         //feeRuleSchemeService.dealFeeOrderInfo(quoteInfo,quoteRespVo,ptlAgreementAttribution.getId(),
         // quotedPriceResponse.getBusinessNo());
@@ -488,7 +490,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         return huaTaiRequestApiComponents.submit(submitRequest, HuaTaiSubmitResponse.class);
     }
 
-    private QuoteRespVo getQuoteRespVo(HuaTaiQuotedPriceResponse quotedPriceResponse, BaseQuoteInfoVo yaQuoteInfoVo) {
+    private QuoteRespVo getQuoteRespVo(HuaTaiQuotedPriceResponse quotedPriceResponse, BaseQuoteInfoVo yaQuoteInfoVo,  List<String> warnMessageList) {
         double jqPremium = 0;
         double syPremium = 0;
         double jqDiscount = 0;
@@ -556,7 +558,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         quoteRespVo.setSyApplyNo(syApplyNo);
         quoteRespVo.setJqAdjustRate(String.valueOf(jqDiscount));
         quoteRespVo.setSyAdjustRate(String.valueOf(syDiscount));
-
+        quoteRespVo.setWarnMessageList(  warnMessageList);
         double sumPayTax = 0;
         if (!ObjectUtils.isEmpty(taxDto)) {
             sumPayTax = taxDto.getSumTax();

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

@@ -903,7 +903,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
             if (accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
                 //清空旧的存入表
-                LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
+                LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<>();
                 lqw.eq(EsmInsAttachInsure::getCompanyId, accidentalDrivingVo.getCompanyCode());
                 lqw.eq(EsmInsAttachInsure::getSeating, accidentalDrivingVo.getSeatNum());
                 esmInsAttachInsureMapper.delete(lqw);