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

src/main/java/com/ydtech/modules/fee/service/FeeRuleSchemeNewService.java

@@ -111,8 +111,8 @@ public interface FeeRuleSchemeNewService {
     /**
      * 电销计算费用
      *
-     * @param costsNew
+     * @param ptlAgreementProductCostsExport
      * @param insAreaCompany
      */
-    void calcCostsExternalTelemarketing(PtlAgreementProductCostsNew costsNew, InsAreaCompany insAreaCompany);
+    void calcCostsExternalTelemarketing( PtlAgreementProductCostsExport ptlAgreementProductCostsExport , InsAreaCompany insAreaCompany);
 }

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

@@ -1518,11 +1518,13 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     }
 
     @Override
-    public void calcCostsExternalTelemarketing(PtlAgreementProductCostsNew ptlAgreementProductCostsNew, InsAreaCompany insAreaCompany) {
+    public void calcCostsExternalTelemarketing(PtlAgreementProductCostsExport ptlAgreementProductCostsExport, InsAreaCompany insAreaCompany) {
         //获取协议信息
         PtlAgreement ptlAgreement = ptlAgreementService.getById(insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         SysUser sysUser = sysUserService.findByUserId(insOrders.getUserid());
+        //入口配置
+        PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.getById(ptlAgreementProductCostsExport.getCostsId());
 
         BigDecimal taxRadio = new BigDecimal("1.00");
         //如果是外部订单则 不含税
@@ -1530,9 +1532,6 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             taxRadio = new BigDecimal("1.06");
         }
 
-        //出口配置
-        PtlAgreementProductCostsExport ptlAgreementProductCostsExport =
-                ptlAgreementProductCostsExportService.getOne(new LambdaQueryWrapper<PtlAgreementProductCostsExport>().eq(PtlAgreementProductCostsExport::getCostsId, ptlAgreementProductCostsNew.getId()));
         InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
         insFeeOrderNew.setId(IdGenerate.nextId());
         insFeeOrderNew.setCostsId(ptlAgreementProductCostsNew.getId());
@@ -1980,7 +1979,6 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             throw new SystemException("非车比例异常");
 
         //endregion
-
         insFeeOrderNewService.saveOrUpdate(insFeeOrderNew);
     }
 

src/main/java/com/ydtech/modules/order/entity/vo/SubmitExportFeesVo.java

@@ -38,10 +38,10 @@ public class SubmitExportFeesVo {
     }
 
     public BigDecimal getSyExportProportion() {
-        return ObjectUtils.isEmpty(syExportProportion)  ? BigDecimal.ZERO : jqExportProportion;
+        return ObjectUtils.isEmpty(syExportProportion)  ? BigDecimal.ZERO : syExportProportion;
     }
 
     public BigDecimal getNoCarExportProportion() {
-        return ObjectUtils.isEmpty(noCarExportProportion)  ? BigDecimal.ZERO : jqExportProportion;
+        return ObjectUtils.isEmpty(noCarExportProportion)  ? BigDecimal.ZERO : noCarExportProportion;
     }
 }

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

@@ -17,8 +17,10 @@ import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsExport;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
+import com.ydtech.modules.protocols.service.PtlAgreementProductCostsExportService;
 import com.ydtech.modules.protocols.service.PtlAgreementProductCostsNewService;
 import com.ydtech.utils.BigDecimalUtils;
 import lombok.RequiredArgsConstructor;
@@ -46,6 +48,9 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
 
     private final InsFeeTelemarketingService insFeeTelemarketingService;
 
+    private final PtlAgreementProductCostsExportService ptlAgreementProductCostsExportService;
+
+
     @Override
     public BasePageResult<TelemarketingAuditOrderDTO> getOrderList(TelemarketingAuditOrderQueryVo telemarketingAuditOrderQueryVo) {
         return insOrdersService.getTelemarketingAudit(telemarketingAuditOrderQueryVo);
@@ -59,9 +64,9 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         // 费用信息
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
 
-        // 协议费用信息
-        PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.lambdaQuery()
-                .eq(PtlAgreementProductCostsNew::getId, insFeeOrderNew.getCostsId())
+        // 出口费用
+        PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.lambdaQuery()
+                .eq(PtlAgreementProductCostsExport::getCostsId, insFeeOrderNew.getCostsId())
                 .one();
 
         String state = submitExportFeesVo.getState();
@@ -72,22 +77,22 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         insFeeTelemarketingService.save(insFeeTelemarketing);
 
         // 交强一级管理比例
-        BigDecimal jqExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, ptlAgreementProductCostsNew.getJqExportRadioLevel1(), insFeeOrderNew.getJqDeptProportionLevel1());
+        BigDecimal jqExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, String.valueOf(ptlAgreementProductCostsExport.getJqExportRadioLevel1()), insFeeOrderNew.getJqDeptProportionLevel1());
         BigDecimal jq = jqExportRadioLevel1.add(submitExportFeesVo.getJqExportProportion());
-        ptlAgreementProductCostsNew.setJqExportRadioLevel1(String.valueOf(jq));
+        ptlAgreementProductCostsExport.setJqExportRadioLevel1(jq);
 
         // 商业一级管理比例
-        BigDecimal syExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, ptlAgreementProductCostsNew.getSyExportRadioLevel1(), insFeeOrderNew.getSyDeptProportionLevel1());
+        BigDecimal syExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, String.valueOf(ptlAgreementProductCostsExport.getSyExportRadioLevel1()), insFeeOrderNew.getSyDeptProportionLevel1());
         BigDecimal sy = syExportRadioLevel1.add(submitExportFeesVo.getSyExportProportion());
-        ptlAgreementProductCostsNew.setSyExportRadioLevel1(String.valueOf(sy));
+        ptlAgreementProductCostsExport.setSyExportRadioLevel1(sy);
 
         // 非车一级管理比例
-        BigDecimal noCarExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, ptlAgreementProductCostsNew.getNoCarExportRadioLevel1(), insFeeOrderNew.getNoDeptProportionLevel1());
+        BigDecimal noCarExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, String.valueOf(ptlAgreementProductCostsExport.getNoCarExportRadioLevel1()), insFeeOrderNew.getNoDeptProportionLevel1());
         BigDecimal no = noCarExportRadioLevel1.add(submitExportFeesVo.getNoCarExportProportion());
-        ptlAgreementProductCostsNew.setNoCarExportRadioLevel1(String.valueOf(no));
+        ptlAgreementProductCostsExport.setNoCarExportRadioLevel1(no);
 
         // 重新计算比例
-        feeRuleSchemeNewService.calcCostsExternalTelemarketing(ptlAgreementProductCostsNew, insAreaCompany);
+        feeRuleSchemeNewService.calcCostsExternalTelemarketing(ptlAgreementProductCostsExport, insAreaCompany);
         // 改完之后到待提交
         insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.TELEMARKETING_TO_BE_SUBMITTED.getCode(), null);
     }