Merge branch 'test' of http://www.baoxianzhanggui.com:8090/sxzgd/java-insagent-pc into test

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

@@ -247,11 +247,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
 
                 //保费计算接口返回
                 QuoteRespVo quoteRespVo = getQuoteRespVo(odr1009Response, quoteInfoVo, nvhlodr1001Response);
-                //添加调用费用匹配功能
-//                feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, t.getAgreementId(),
-//                        odr1009Request.getBody().getOrderNo());
                 HttpResult<QuoteRespVo> quoteRespVoHttpResult = responseOrder(odr1009Response, quoteRespVo, ptlAgreementAttribution,
-                        orderNo, quoteInfoVo.getOrderNo(), busiId, nvhlodr1001Response);
+                        orderNo, quoteInfoVo, busiId, nvhlodr1001Response);
                 return quoteRespVoHttpResult;
             } else {
                 if(Message.M0003.getCode().equals(odr1009Response.getStatus())){
@@ -354,7 +351,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
     public HttpResult<QuoteRespVo> responseOrder(ODR1009Response odr1009Response,
                                                  QuoteRespVo quoteRespVo,
                                                  PtlAgreementAttribution ptlAgreementAttribution, String orderId,
-                                                 String orderNo, String busiId,
+                                                 BaseQuoteInfoVo quoteInfoVo, String busiId,
                                                  NVHLODR1001Response nvhlodr1001Response) {
         // 保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
@@ -362,7 +359,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
         //子订单id
         String companyId = IdGenerate.nextId();
         insAreaCompany.setId(companyId);
-        insAreaCompany.setOrderno(orderNo);
+        insAreaCompany.setOrderno(quoteInfoVo.getOrderNo());
         JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(odr1009Response.getResult()));
         jsonObject.put("busiId",busiId);
         insAreaCompany.setReptxt(jsonObject);
@@ -384,7 +381,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
         }
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(companyId);
-        quoteRespVo.setOrderno(orderNo);
+        quoteRespVo.setOrderno(quoteInfoVo.getOrderNo());
         // 车船税
         ODR1009Response.ResultDTO.VehicleTaxationDTO carShipTax = odr1009Response.getResult().getVehicleTaxation();
         if(!Objects.isNull(carShipTax)) {
@@ -393,7 +390,9 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             List<TaxArrears> taxArrearsList = Collections.singletonList(taxArrears);
             insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(taxArrearsList)));
         }
-
+        //添加调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(),
+                insAreaCompany.getId());
         return HttpResult.ok("报价成功", quoteRespVo);
     }
 

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

@@ -12,6 +12,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 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.model.guoren.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
@@ -105,6 +106,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
+    private final FeeRuleSchemeService feeRuleSchemeService;
+
     /**
      * 获取渠道信息
      *
@@ -225,6 +228,10 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         responseOrderExtend(iac, quoteRespVo, premiumResult, carPriceResult.getInputvo());
         insAreaCompanyService.insertCompanyAndOrders(iac);
         quoteRespVo.setCompanyId(iac.getId());
+
+        //这里调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(yaQuoteInfoVo, quoteRespVo, quoteVo.getAgreementId(), iac.getId());
+
         log.debug("--------报价结束，车牌：{}，vin：{}--------------", carInfo.getLicenseNo(), carInfo.getVinNo());
         return HttpResult.ok("报价成功", quoteRespVo);
 

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

@@ -148,10 +148,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         }
 
         QuoteRespVo quoteRespVo = getQuoteRespVo(quotedPriceResponse, quoteInfo, warnMessageList);
-        //这里调用费用匹配功能
-        //feeRuleSchemeService.dealFeeOrderInfo(quoteInfo,quoteRespVo,ptlAgreementAttribution.getId(),
-        // quotedPriceResponse.getBusinessNo());
-        return responseOrder(quotedPriceResponse, quoteRespVo, ptlAgreementAttribution);
+        return responseOrder(quotedPriceResponse, quoteRespVo, ptlAgreementAttribution,quoteInfo);
     }
 
     /**
@@ -589,7 +586,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
     private HttpResult<QuoteRespVo> responseOrder(HuaTaiQuotedPriceResponse quotedPriceResponse,
                                                   QuoteRespVo quoteRespVo,
-                                                  PtlAgreementAttribution ptlAgreementAttribution) {
+                                                  PtlAgreementAttribution ptlAgreementAttribution,BaseQuoteInfoVo quoteInfo) {
         //保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
         //华泰没有总订单号，使用自定义订单号
@@ -621,6 +618,9 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         insAreaCompany.setInsOrderNo(jqQuerySequenceNo + "-" + syQuerySequenceNo);
         quoteRespVo.setCompanyId(insAreaCompany.getId());
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
+        //这里调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfo,quoteRespVo,ptlAgreementAttribution.getId(),
+                insAreaCompany.getId());
         return HttpResult.ok(quotedPriceResponse.getHead().getReturnMessage(), quoteRespVo);
     }
 

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

@@ -118,10 +118,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         if (ptlAgreementAttribution.getInsCompanyId() != null && ptlAgreementAttribution.getInsCompanyId().length() > 4) {
             insCom = ptlAgreementAttribution.getInsCompanyId().substring(0, 4);
         }
-        //(先开启众安的)
-        if ("ZAPA".equals(insCom)) {
-            feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), responseVo.getCompanyId());
-        }
+        //这里调用费用匹配功能
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), responseVo.getCompanyId());
         return HttpResult.ok("成功", responseVo);
     }
 

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

@@ -10,6 +10,7 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
+import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
@@ -76,6 +77,8 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
 
     private final InsOrdersService insOrdersService;
 
+    private final FeeRuleSchemeService feeRuleSchemeService;
+
     private final InsTaskImagesService insTaskImagesService;
 
     private final EsmInsCompanyService esmInsCompanyService;
@@ -329,7 +332,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             QuoteRespVo quoteRespVo = getQuoteRespVo(orderNo, carDTO, responseBodyC2);
             quoteRespVo.setExtendInfo(yaExtendInfoDto);
             //8 生成订单
-            return responseOrder(quoteRespVo, requestData, responseDataC2, ptlAgreementAttribution);
+            return responseOrder(quoteRespVo, requestData, responseDataC2, ptlAgreementAttribution,quoteInfoVo);
         } catch (SystemException e) {
             return HttpResult.error(e.getMessage());
         } catch (Exception e) {
@@ -1156,7 +1159,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     }
 
     private HttpResult<QuoteRespVo> responseOrder(QuoteRespVo quoteRespVo, RequestData requestData, ResponseDataC2 responseDataC2,
-                                                  PtlAgreementAttribution ptlAgreementAttribution) {
+                                                  PtlAgreementAttribution ptlAgreementAttribution,BaseQuoteInfoVo quoteInfoVo) {
         //保存订单信息
 
         if (responseDataC2.getResponseHead().getStatus() != null && responseDataC2.getResponseHead().getStatus().equals("0")) {
@@ -1167,11 +1170,11 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(quoteRespVo.getTaxArrears())));
             insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
             quoteRespVo.setCompanyId(insAreaCompany.getId());
-
+            //这里调用费用匹配功能
+            feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), insAreaCompany.getId());
         } else {
             return HttpResult.error(responseDataC2.getResponseHead().getAppMessage());
         }
-
         return HttpResult.ok("success", quoteRespVo);
     }