保费计算优惠返回读库

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

@@ -16,6 +16,7 @@ import com.ydtech.modules.fee.dto.vo.EntranceFee;
 import com.ydtech.modules.fee.dto.vo.ExportFee;
 import com.ydtech.modules.fee.dto.vo.RetailStoreFee;
 import com.ydtech.modules.fee.service.CostsCalcService;
+import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
@@ -68,6 +69,9 @@ public class CostsCalServiceImpl implements CostsCalcService {
     @Autowired
     private FeeRuleSchemeService feeRuleSchemeService;
 
+    @Autowired
+    private FeeRuleSchemeNewService feeRuleSchemeNewService;
+
 
     @Override
     public EntranceFee getEntranceFee(String insuranceType, BigDecimal jqPremium, BigDecimal feeRadio, BigDecimal documentFeeRadio) {
@@ -194,47 +198,56 @@ public class CostsCalServiceImpl implements CostsCalcService {
         return exportFee;
     }
 
+//    @Override
+//    public SubOrderExportFeeVo getExportFee(InsFeeOrderNew insFeeOrderNew) {
+//        //查询协议是否包含税
+//        PtlAgreement ptlAgreement = ptlAgreementService.getById(insFeeOrderNew.getAgreementId());
+//        BigDecimal taxRadio = new BigDecimal("1.00");
+//        if(ptlAgreement.getWithTax().equals("否")){
+//            taxRadio = new BigDecimal("1.06");
+//        }
+//        SubOrderExportFeeVo subOrderExportFeeVo = new SubOrderExportFeeVo();
+//
+//        //计算出口费用
+//
+//        //分销管理比例总和
+//        BigDecimal retailStoreProportion = insFeeOrderNew.getFirstDetailProportion().add(insFeeOrderNew.getSecondDetailProportion()).
+//                add(insFeeOrderNew.getThirdDetailProportion());
+//
+//
+//        //交强机构管理费
+//        BigDecimal jqDeptProportion = insFeeOrderNew.getJqDeptProportionLevel1().add(insFeeOrderNew.getJqDeptProportionLevel2()).add(insFeeOrderNew.getJqDeptProportionLevel3()).add(insFeeOrderNew.getJqDeptProportionLevel4()).add(insFeeOrderNew.getJqDeptProportionLevel5());
+//        //商业部门管理比例总和
+//        BigDecimal syDeptProportion = insFeeOrderNew.getSyDeptProportionLevel1().add(insFeeOrderNew.getSyDeptProportionLevel2()).add(insFeeOrderNew.getSyDeptProportionLevel3()).add(insFeeOrderNew.getSyDeptProportionLevel4()).add(insFeeOrderNew.getSyDeptProportionLevel5());
+//        //非车部门比例总和
+//        BigDecimal noDeptProportion = insFeeOrderNew.getNoDeptProportionLevel1().add(insFeeOrderNew.getNoDeptProportionLevel2()).add(insFeeOrderNew.getNoDeptProportionLevel3()).add(insFeeOrderNew.getNoDeptProportionLevel4()).add(insFeeOrderNew.getNoDeptProportionLevel5());
+//
+//        //交强出口费用
+//        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+//                insFeeOrderNew.getJqCostsProportion(), jqDeptProportion, retailStoreProportion, taxRadio);
+//        subOrderExportFeeVo.setJqExportCosts(jqExportFee.getTotalAmount());
+//
+//        //商业出口费用
+//        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+//                insFeeOrderNew.getSyCostsProportion(), syDeptProportion, retailStoreProportion, taxRadio);
+//        subOrderExportFeeVo.setSyExportCosts(syExportFee.getTotalAmount());
+//
+//        //非车出口费用
+//        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+//                insFeeOrderNew.getNoCostsProportion(), noDeptProportion, retailStoreProportion, taxRadio);
+//        subOrderExportFeeVo.setNoExportCosts(noExportFee.getTotalAmount());
+//
+//
+//
+//        return subOrderExportFeeVo;
+//    }
+
     @Override
     public SubOrderExportFeeVo getExportFee(InsFeeOrderNew insFeeOrderNew) {
-        //查询协议是否包含税
-        PtlAgreement ptlAgreement = ptlAgreementService.getById(insFeeOrderNew.getAgreementId());
-        BigDecimal taxRadio = new BigDecimal("1.00");
-        if(ptlAgreement.getWithTax().equals("否")){
-            taxRadio = new BigDecimal("1.06");
-        }
         SubOrderExportFeeVo subOrderExportFeeVo = new SubOrderExportFeeVo();
-
-        //计算出口费用
-
-        //分销管理比例总和
-        BigDecimal retailStoreProportion = insFeeOrderNew.getFirstDetailProportion().add(insFeeOrderNew.getSecondDetailProportion()).
-                add(insFeeOrderNew.getThirdDetailProportion());
-
-
-        //交强机构管理费
-        BigDecimal jqDeptProportion = insFeeOrderNew.getJqDeptProportionLevel1().add(insFeeOrderNew.getJqDeptProportionLevel2()).add(insFeeOrderNew.getJqDeptProportionLevel3()).add(insFeeOrderNew.getJqDeptProportionLevel4()).add(insFeeOrderNew.getJqDeptProportionLevel5());
-        //商业部门管理比例总和
-        BigDecimal syDeptProportion = insFeeOrderNew.getSyDeptProportionLevel1().add(insFeeOrderNew.getSyDeptProportionLevel2()).add(insFeeOrderNew.getSyDeptProportionLevel3()).add(insFeeOrderNew.getSyDeptProportionLevel4()).add(insFeeOrderNew.getSyDeptProportionLevel5());
-        //非车部门比例总和
-        BigDecimal noDeptProportion = insFeeOrderNew.getNoDeptProportionLevel1().add(insFeeOrderNew.getNoDeptProportionLevel2()).add(insFeeOrderNew.getNoDeptProportionLevel3()).add(insFeeOrderNew.getNoDeptProportionLevel4()).add(insFeeOrderNew.getNoDeptProportionLevel5());
-
-        //交强出口费用
-        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
-                insFeeOrderNew.getJqCostsProportion(), jqDeptProportion, retailStoreProportion, taxRadio);
-        subOrderExportFeeVo.setJqExportCosts(jqExportFee.getTotalAmount());
-
-        //商业出口费用
-        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
-                insFeeOrderNew.getSyCostsProportion(), syDeptProportion, retailStoreProportion, taxRadio);
-        subOrderExportFeeVo.setSyExportCosts(syExportFee.getTotalAmount());
-
-        //非车出口费用
-        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
-                insFeeOrderNew.getNoCostsProportion(), noDeptProportion, retailStoreProportion, taxRadio);
-        subOrderExportFeeVo.setNoExportCosts(noExportFee.getTotalAmount());
-
-
-
+        subOrderExportFeeVo.setJqExportCosts(insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums()));
+        subOrderExportFeeVo.setSyExportCosts(insFeeOrderNew.getSyExportSuperviseCostsPremiums().add(insFeeOrderNew.getSyExportOtherCostsPremiums()));
+        subOrderExportFeeVo.setNoExportCosts(insFeeOrderNew.getNoExportSuperviseCostsPremiums().add(insFeeOrderNew.getNoExportOtherCostsPremiums()));
         return subOrderExportFeeVo;
     }
 }