Sfoglia il codice sorgente

修改bug:
订单审核,调整费用之后,跟单比例又出现负数了

jiakai 3 mesi fa
parent
commit
4a3e69000b

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

@@ -379,20 +379,41 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
         BigDecimal jqCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJqCommissionRatio());
         BigDecimal jqCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJqCommissionRatio());
         BigDecimal syCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getSyCommissionRatio());
         BigDecimal syCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getSyCommissionRatio());
         BigDecimal jyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJyCommissionRatio());
         BigDecimal jyCommissionRatio = covertPercent(ptlAgreementCostRatioVo.getJyCommissionRatio());
-        insFeeOrders.setJqCommissionRatio(jqCommissionRatio);
-        insFeeOrders.setSyCommissionRatio(syCommissionRatio);
-        insFeeOrders.setJyCommissionRatio(jyCommissionRatio);
+
         // 入口比例
         // 入口比例
         BigDecimal jqInletRatio = covertPercent(ptlAgreementCostRatioVo.getJqInletRatio());
         BigDecimal jqInletRatio = covertPercent(ptlAgreementCostRatioVo.getJqInletRatio());
         BigDecimal syInletRatio = covertPercent(ptlAgreementCostRatioVo.getSyInletRatio());
         BigDecimal syInletRatio = covertPercent(ptlAgreementCostRatioVo.getSyInletRatio());
         BigDecimal jyInletRatio = covertPercent(ptlAgreementCostRatioVo.getJyInletRatio());
         BigDecimal jyInletRatio = covertPercent(ptlAgreementCostRatioVo.getJyInletRatio());
+
+        BigDecimal jqFollowRatio = BigDecimal.ZERO;
+        BigDecimal syFollowRatio = BigDecimal.ZERO;
+        BigDecimal jyFollowRatio = BigDecimal.ZERO;
+        // 跟单比例
+        if (jqInletRatio.compareTo(jqCommissionRatio) > 0){
+            jqFollowRatio = jqInletRatio.subtract(jqCommissionRatio);
+        }else{
+            jqCommissionRatio = jqInletRatio;
+        }
+        if (syInletRatio.compareTo(syCommissionRatio) > 0){
+            syFollowRatio = syInletRatio.subtract(syCommissionRatio);
+        }else{
+            syCommissionRatio = syInletRatio;
+        }
+        if (jyInletRatio.compareTo(jyCommissionRatio) > 0){
+            jyFollowRatio = jyInletRatio.subtract(jyCommissionRatio);
+        }else{
+            jyCommissionRatio = jyInletRatio;
+        }
+
+        // 手续费
+        insFeeOrders.setJqCommissionRatio(jqCommissionRatio);
+        insFeeOrders.setSyCommissionRatio(syCommissionRatio);
+        insFeeOrders.setJyCommissionRatio(jyCommissionRatio);
+        // 入口费用
         insFeeOrders.setJqInletRatio(jqInletRatio);
         insFeeOrders.setJqInletRatio(jqInletRatio);
         insFeeOrders.setSyInletRatio(syInletRatio);
         insFeeOrders.setSyInletRatio(syInletRatio);
         insFeeOrders.setJyInletRatio(jyInletRatio);
         insFeeOrders.setJyInletRatio(jyInletRatio);
-        // 跟单比例 
-        BigDecimal jqFollowRatio = jqInletRatio.subtract(jqCommissionRatio);
-        BigDecimal syFollowRatio = syInletRatio.subtract(syCommissionRatio);
-        BigDecimal jyFollowRatio = jyInletRatio.subtract(jyCommissionRatio);
+        // 跟单费
         insFeeOrders.setJqFollowRatio(jqFollowRatio);
         insFeeOrders.setJqFollowRatio(jqFollowRatio);
         insFeeOrders.setSyFollowRatio(syFollowRatio);
         insFeeOrders.setSyFollowRatio(syFollowRatio);
         insFeeOrders.setJyFollowRatio(jyFollowRatio);
         insFeeOrders.setJyFollowRatio(jyFollowRatio);