Просмотр исходного кода

修改bug:
订单审核,订单费用,入口费用和手续费计算不对,加投费用也不对,出口费用和留点比例没有计算

jiakai 4 месяцев назад
Родитель
Сommit
72f89290bb

+ 8 - 35
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeOrdersServiceImpl.java

@@ -88,52 +88,26 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         BigDecimal syPremium = insOrdersCosts.getSyPremium() == null ? BigDecimal.ZERO : insOrdersCosts.getSyPremium();
         BigDecimal jyPremium = insOrdersCosts.getJyPremium() == null ? BigDecimal.ZERO : insOrdersCosts.getJyPremium();
 
-        // 从页面获取【新比例】
-        BigDecimal newJqCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJqCommissionRatio());
-        BigDecimal newSyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getSyCommissionRatio());
-        BigDecimal newJyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJyCommissionRatio());
-
-        BigDecimal newJqInletRatio = covertPercent(ptlAgreementCostRatioVo.getJqInletRatio());
-        BigDecimal newSyInletRatio = covertPercent(ptlAgreementCostRatioVo.getSyInletRatio());
-        BigDecimal newJyInletRatio = covertPercent(ptlAgreementCostRatioVo.getJyInletRatio());
-
-        BigDecimal newJqFollowRatio = covertPercent(ptlAgreementCostRatioVo.getJqFollowRatio());
-        BigDecimal newSyFollowRatio = covertPercent(ptlAgreementCostRatioVo.getSyFollowRatio());
-        BigDecimal newJyFollowRatio = covertPercent(ptlAgreementCostRatioVo.getJyFollowRatio());
-
-        BigDecimal newJqAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getJqAdditionalRatio());
-        BigDecimal newSyAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getSyAdditionalRatio());
-        BigDecimal newJyAddThrowRatio = covertPercent(ptlAgreementCostRatioVo.getJyAdditionalRatio());
-
-        BigDecimal newJqKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJqKeepPointRatio());
-        BigDecimal newSyKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getSyKeepPointRatio());
-        BigDecimal newJyKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJyKeepPointRatio());
-
-        BigDecimal newJqExportRatio = covertPercent(ptlAgreementCostRatioVo.getJqExportRatio());
-        BigDecimal newSyExportRatio = covertPercent(ptlAgreementCostRatioVo.getSyExportRatio());
-        BigDecimal newJyExportRatio = covertPercent(ptlAgreementCostRatioVo.getJyExportRatio());
-
-        BigDecimal newJqExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJqExportKeepPointRatio());
-        BigDecimal newSyExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getSyExportKeepPointRatio());
-        BigDecimal newJyExportKeepPointRatio = covertPercent(ptlAgreementCostRatioVo.getJyExportKeepPointRatio());
+        // 更新对象中的比例字段
+        saveRatio(ptlAgreementCostRatioVo, insFeeOrders);
 
         // 核心:规则重新计算所有费用
         // 1. 交强险
         calculatePremiumByRule(insFeeOrders, "jq", jqPremium,
-                newJqCommissionRatio, newJqInletRatio, newJqFollowRatio,
-                newJqAddThrowRatio, newJqKeepPointRatio, newJqExportRatio, newJqExportKeepPointRatio,
+                insFeeOrders.getJqCommissionRatio(), insFeeOrders.getJqInletRatio(), insFeeOrders.getJqFollowRatio(),
+                insFeeOrders.getJqAdditionalRatio(), insFeeOrders.getJqKeepPointRatio(), insFeeOrders.getJqExportRatio(), insFeeOrders.getJqExportKeepPointRatio(),
                 withTax, TAX_RATE, SCALE);
 
         // 2. 商业险
         calculatePremiumByRule(insFeeOrders, "sy", syPremium,
-                newSyCommissionRatio, newSyInletRatio, newSyFollowRatio,
-                newSyAddThrowRatio, newSyKeepPointRatio, newSyExportRatio, newSyExportKeepPointRatio,
+                insFeeOrders.getSyCommissionRatio(), insFeeOrders.getSyInletRatio(), insFeeOrders.getSyFollowRatio(),
+                insFeeOrders.getSyAdditionalRatio(), insFeeOrders.getSyKeepPointRatio(), insFeeOrders.getSyExportRatio(), insFeeOrders.getSyExportKeepPointRatio(),
                 withTax, TAX_RATE, SCALE);
 
         // 3. 驾乘险
         calculatePremiumByRule(insFeeOrders, "jy", jyPremium,
-                newJyCommissionRatio, newJyInletRatio, newJyFollowRatio,
-                newJyAddThrowRatio, newJyKeepPointRatio, newJyExportRatio, newJyExportKeepPointRatio,
+                insFeeOrders.getJyCommissionRatio(), insFeeOrders.getJyInletRatio(), insFeeOrders.getJyFollowRatio(),
+                insFeeOrders.getJyAdditionalRatio(), insFeeOrders.getJyKeepPointRatio(), insFeeOrders.getJyExportRatio(), insFeeOrders.getJyExportKeepPointRatio(),
                 withTax, TAX_RATE, SCALE);
 
         // 重新统计总应收、总应付
@@ -144,7 +118,6 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         insFeeOrders.setTotalReceivablePremium(scale(totalReceivable, SCALE));
 
         // 保存比例
-        saveRatio(ptlAgreementCostRatioVo, insFeeOrders);
         this.updateById(insFeeOrders);
         return insFeeOrders;
     }