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

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

@@ -185,16 +185,16 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 if (insAreaCompany.getJqapplyno().equals(appliResult.getContractNo())) {
                     jqStatus = appliResult.getStatus();
                     for (HuaTaiSubmitResponse.Notion notion : appliResult.getNotion()) {
-                        jqNotion.append(notion.getUWNotion() + ",");
+                        jqNotion.append(notion.getUWNotion() + "</br>");
                     }
                 }
             }
-            if (StringUtils.isNotEmpty(insAreaCompany.getSyapplyno()) && insAreaCompany.getSyapplyno().equals(appliResult.getContractNo())) {
+            if (StringUtils.isNotEmpty(insAreaCompany.getSyapplyno())) {
                 haveSYFlag = true;
-                if (insAreaCompany.getJqapplyno().equals(appliResult.getContractNo())) {
+                if (insAreaCompany.getSyapplyno().equals(appliResult.getContractNo())) {
                     syStatus = appliResult.getStatus();
                     for (HuaTaiSubmitResponse.Notion notion : appliResult.getNotion()) {
-                        syNotion.append(notion.getUWNotion() + ",");
+                        syNotion.append(notion.getUWNotion() + "</br>");
                     }
                 }
             }

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

@@ -5,6 +5,7 @@ import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.InsCrawlerOrderComponents;
 import com.ydtech.modules.order.entity.InsAreaCompany;
@@ -56,6 +57,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
 
     private final InsTaskImagesService insTaskImagesService;
     private final InsOrdersService insOrdersService;
+    private final FeeRuleSchemeService feeRuleSchemeService;
 
     private final PtlAgreementService ptlAgreementService;
 
@@ -68,13 +70,14 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     @Value("${api.url}")
     private String apiUrl;
 
-    public InsCrawlerOrderServiceImpl(PtlCrawlerApiService ptlCrawlerApiService, InsCrawlerOrderComponents insCrawlerOrderComponents, PtlAgreementAttributionService ptlAgreementAttributionService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService, InsOrdersService insOrdersService, PtlAgreementService ptlAgreementService) {
+    public InsCrawlerOrderServiceImpl(PtlCrawlerApiService ptlCrawlerApiService, InsCrawlerOrderComponents insCrawlerOrderComponents, PtlAgreementAttributionService ptlAgreementAttributionService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService, InsOrdersService insOrdersService, PtlAgreementService ptlAgreementService,FeeRuleSchemeService feeRuleSchemeService) {
         this.ptlCrawlerApiService = ptlCrawlerApiService;
         this.insCrawlerOrderComponents = insCrawlerOrderComponents;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
         this.insAreaCompanyService = insAreaCompanyService;
         this.insTaskImagesService = insTaskImagesService;
         this.insOrdersService = insOrdersService;
+        this.feeRuleSchemeService = feeRuleSchemeService;
         this.ptlAgreementService = ptlAgreementService;
     }
 
@@ -109,6 +112,16 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             throw new SystemException(response.getMessage());
         }
         QuoteRespVo quoteRespVo = getQuoteRespVo(response, quoteInfoVo);
+        //添加调用费用匹配功能
+        String insCom="";
+        if(ptlAgreementAttribution.getInsCompanyId()!=null&&ptlAgreementAttribution.getInsCompanyId().length()>4){
+            insCom=ptlAgreementAttribution.getInsCompanyId().substring(0,4);
+        }
+        //(先开启众安的)
+        if("ZAPA".equals(insCom)){
+            feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), response.getOrderNo());
+        }
+
         return responseOrder(response, quoteRespVo, ptlAgreementAttribution);
     }
 

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

@@ -8,6 +8,7 @@ import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.zijin.ZijinRequestApiComponents;
@@ -68,6 +69,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
     private final ConfigureParametersComponents configureParametersComponents;
 
+    private final FeeRuleSchemeService feeRuleSchemeService;
+
     @Value("${upload.file.path}")
     private String uploadFilePath;
 
@@ -77,11 +80,12 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     @Value("${api.url}")
     private String apiUrl;
 
-    public ZijinOrderApiServiceImpl(ZijinRequestApiComponents zijinRequestApiComponents, InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService, InsTaskImagesService insTaskImagesService, PtlAgreementAttributionService ptlAgreementAttributionService, ConfigureParametersComponents configureParametersComponents) {
+    public ZijinOrderApiServiceImpl(ZijinRequestApiComponents zijinRequestApiComponents, InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService, InsTaskImagesService insTaskImagesService, PtlAgreementAttributionService ptlAgreementAttributionService, ConfigureParametersComponents configureParametersComponents,FeeRuleSchemeService feeRuleSchemeService) {
         this.zijinRequestApiComponents = zijinRequestApiComponents;
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insTaskImagesService = insTaskImagesService;
+        this.feeRuleSchemeService = feeRuleSchemeService;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
         this.configureParametersComponents = configureParametersComponents;
     }
@@ -141,6 +145,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             objects.add(message);
             quoteRespVo.setWarnMessageList(objects);
         }
+        //添加调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), calculatePremiumRequest.getOrderId());
         return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution, calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo());
     }