新增永城费用匹配，调整费用表存储逻辑

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1245,7 +1245,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         OrderFeeVo fcOrderFeeVo = new OrderFeeVo();
 
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
-        InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getInsOrderNo());
+        InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getId());
 
         if(insFeeOrder!=null){
             if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()>0  && insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()==0){//当为单交业务时

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

@@ -112,6 +112,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             throw new SystemException(response.getMessage());
         }
         QuoteRespVo quoteRespVo = getQuoteRespVo(response, quoteInfoVo);
+        //处理订单信息
+        QuoteRespVo responseVo= responseOrder(response, quoteRespVo, ptlAgreementAttribution);
         //添加调用费用匹配功能
         String insCom = "";
         if (ptlAgreementAttribution.getInsCompanyId() != null && ptlAgreementAttribution.getInsCompanyId().length() > 4) {
@@ -119,10 +121,9 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         }
         //(先开启众安的)
         if ("ZAPA".equals(insCom)) {
-            feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), response.getOrderNo());
+            feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), responseVo.getCompanyId());
         }
-
-        return responseOrder(response, quoteRespVo, ptlAgreementAttribution);
+        return HttpResult.ok("成功", responseVo);
     }
 
     @Override
@@ -313,7 +314,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         return quoteRespVo;
     }
 
-    private HttpResult<QuoteRespVo> responseOrder(CrawlerQuoteResponse response, QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
+    private QuoteRespVo responseOrder(CrawlerQuoteResponse response, QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
         //保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
 
@@ -329,7 +330,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         insAreaCompany.setInsOrderNo(response.getOrderNo());
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(insAreaCompany.getId());
-        return HttpResult.ok("成功", quoteRespVo);
+        return quoteRespVo;
     }
 
     @Override

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

@@ -21,6 +21,7 @@ import com.ydtech.modules.esm.model.EsmInsAttachInsure;
 import com.ydtech.modules.esm.model.EsmInsAttachInsureDetails;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
+import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.dto.CarInsDateDto;
 import com.ydtech.modules.ins.model.dto.CarInsPolicyDto;
@@ -133,6 +134,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     private final VerificationCodeIdentification verificationCodeIdentification;
 
+    private final  FeeRuleSchemeService feeRuleSchemeService;
     //==============================API 方式
     //
     public void gainVehicleModel(YcConfigureParameters ycConfigureParameters, CarInfoVo carInfo) {
@@ -348,7 +350,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         if (CollUtil.isNotEmpty(requestInfoList)) {
             quoteRespVo.getWarnMessageList().addAll(requestInfoList);
         }
-
+        //添加调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(yaQuoteInfoVo, quoteRespVo, quoteVo.getAgreementId(), iac.getId());
         return HttpResult.ok("报价成功", quoteRespVo);
 
     }

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

@@ -216,9 +216,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
             quotedPriceResponse = zhongmeiRepeatInsuranceComponents.dealRepeatDate(quotedPriceRequest, quotedPriceResponse, quoteInfo);
             quoteRespVo = getQuoteRespVo(quotedPriceResponse, quoteInfo);
         }
-        //这里调用费用匹配功能
-        feeRuleSchemeService.dealFeeOrderInfo(quoteInfo, quoteRespVo, ptlAgreementAttribution.getId(), quotedPriceResponse.getBusinessNo());
-        return responseOrder(quotedPriceResponse, quoteRespVo, ptlAgreementAttribution);
+
+        return responseOrder(quotedPriceResponse, quoteRespVo, ptlAgreementAttribution,quoteInfo);
     }
 
 
@@ -509,7 +508,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         return quoteRespVo;
     }
 
-    public HttpResult<QuoteRespVo> responseOrder(QuotedPriceResponse quotedPriceResponse, QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
+    public HttpResult<QuoteRespVo> responseOrder(QuotedPriceResponse quotedPriceResponse, QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution,BaseQuoteInfoVo quoteInfo) {
         //保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         insAreaCompany.setId(quotedPriceResponse.getBusinessNo());
@@ -522,6 +521,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(insAreaCompany.getId());
         quoteRespVo.setTaxArrears(taxArrearsList);
+        //这里调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfo, quoteRespVo, ptlAgreementAttribution.getId(), insAreaCompany.getId());
         return HttpResult.ok(quotedPriceResponse.getHead().getReturnMessage(), quoteRespVo);
     }
 

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

@@ -170,11 +170,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());
+                calculatePremiumRequest.getOrderId(), calculatePremiumRequest.getOrderNo(),quoteInfoVo);
     }
 
     @Override
@@ -511,7 +508,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     public HttpResult<QuoteRespVo> responseOrder(CalculatePremiumResponse calculatePremiumResponse,
                                                  QuoteRespVo quoteRespVo,
                                                  PtlAgreementAttribution ptlAgreementAttribution, String orderId,
-                                                 String orderNo) {
+                                                 String orderNo,BaseQuoteInfoVo quoteInfoVo) {
         // 保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         // 协议id
@@ -527,6 +524,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(taxArrearsList)));
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(orderNo);
+        //添加调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(),insAreaCompany.getId());
         return HttpResult.ok("报价成功", quoteRespVo);
     }