Przeglądaj źródła

报价 修改 跟单费计算 应收- 手续费 = 跟单费

785834757 3 miesięcy temu
rodzic
commit
192cf838cd

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

@@ -386,7 +386,7 @@ public class QuoteVerificationAspect {
         BigDecimal addThrowPercent = convertPercent(costType.getAddThrow());
         BigDecimal exportPercent = convertPercent(costType.getExport());
 
-        // 计算应收金额
+        // 去税保费金额
         BigDecimal taxablePremium = premium.divide(taxFactor,5,RoundingMode.HALF_EVEN);
 
         // 计算应付金额(保费 * 出口比例,保留2位小数)
@@ -395,20 +395,24 @@ public class QuoteVerificationAspect {
         // 计算各类费用并设置到订单对象
         setPayable.accept(insFeeOrders, payable);
         BigDecimal commission = taxablePremium.multiply(commissionRatio).setScale(5, RoundingMode.HALF_EVEN);
-        // 修改 应收-手续费 = 跟单费
-//        BigDecimal follow = taxablePremium.multiply(followRatio).setScale(5, RoundingMode.HALF_EVEN);
-        BigDecimal follow = taxablePremium.subtract(commission);
+
         setCommission.accept(insFeeOrders, commission);
-        setFollow.accept(insFeeOrders, follow);
+
         // modify by lipf, 2026年6月16日15:35:09  加投比例,不需要根据平台/私有进行1.06的计算
 
         BigDecimal addAmount = premium.multiply(addThrowPercent).setScale(5, RoundingMode.HALF_EVEN);
         setAdditional.accept(insFeeOrders,addAmount);
 
-        BigDecimal receivable = BigDecimalUtil.add(commission,follow);
+        //应付金额计算
+        BigDecimal receivableRadio = commissionRatio.add(followRatio);
+        BigDecimal receivable = taxablePremium.multiply(receivableRadio).setScale(5,RoundingMode.HALF_EVEN);
         receivable = receivable.setScale(5, RoundingMode.HALF_EVEN);
         setReceivable.accept(insFeeOrders, receivable);
 
+        // 修改 应收-手续费 = 跟单费
+        BigDecimal follow = receivable.subtract(commission);
+        setFollow.accept(insFeeOrders, follow);
+
         // 设置留点比例 入口比例/taxFactor+加投比例-出口比例
         BigDecimal keepPointRateCal  = BigDecimalUtil.subtract(BigDecimalUtil.add(BigDecimalUtil.divide(inletPercent,taxFactor),addThrowPercent),exportPercent)
                 .setScale(5,RoundingMode.HALF_EVEN);