Procházet zdrojové kódy

调整费用 0.00001的bug

785834757 před 3 měsíci
rodič
revize
ec061ee530

+ 11 - 7
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -360,20 +360,24 @@ public class QuoteVerificationAspect {
 
         // 计算应收金额(保费 * 税率因子 * (入口比例 + 加投比例 + 跟单比例))
         BigDecimal taxablePremium = premium.multiply(taxFactor);
-        BigDecimal receivable = taxablePremium.multiply(inletPercent)
-                .add(taxablePremium.multiply(addThrowPercent))
-//                .add(taxablePremium.multiply(followRatio))
-                .setScale(5, RoundingMode.HALF_EVEN);
 
         // 计算应付金额(保费 * 出口比例,保留2位小数)
         BigDecimal payable = premium.multiply(exportPercent.setScale(5, RoundingMode.DOWN));
 
         // 计算各类费用并设置到订单对象
-        setReceivable.accept(insFeeOrders, receivable);
         setPayable.accept(insFeeOrders, payable);
-        setCommission.accept(insFeeOrders, taxablePremium.multiply(commissionRatio).setScale(5, RoundingMode.HALF_EVEN));
-        setFollow.accept(insFeeOrders, taxablePremium.multiply(followRatio).setScale(5, RoundingMode.HALF_EVEN));
+        BigDecimal commission = taxablePremium.multiply(commissionRatio).setScale(5, RoundingMode.HALF_EVEN);
+        BigDecimal follow = taxablePremium.multiply(followRatio).setScale(5, RoundingMode.HALF_EVEN);
+        setCommission.accept(insFeeOrders, commission);
+        setFollow.accept(insFeeOrders, commission);
         setAdditional.accept(insFeeOrders, taxablePremium.multiply(addThrowPercent).setScale(5, RoundingMode.HALF_EVEN));
+
+        BigDecimal receivable = taxablePremium.add(commission)
+                .add(follow)
+//                .add(taxablePremium.multiply(addThrowPercent))
+//                .add(taxablePremium.multiply(followRatio))
+                .setScale(5, RoundingMode.HALF_EVEN);
+        setReceivable.accept(insFeeOrders, receivable);
     }
 
     /**