Merge remote-tracking branch 'origin/master'

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

@@ -263,7 +263,7 @@ public class QuoteVerificationAspect {
         }
 
         if(Objects.nonNull(jyCostType)){
-            BigDecimal jyInlet = BigDecimalUtil.divide(jqCostType.getInlet(), new BigDecimal(100));
+            BigDecimal jyInlet = BigDecimalUtil.divide(jyCostType.getInlet(), new BigDecimal(100));
             if (BigDecimalUtil.subtract(jyEntranceFeeRatio, jyInlet).compareTo(BigDecimal.ZERO) > 0) {
                 jyEntranceFeeRatio = jyInlet;
             }
@@ -308,7 +308,7 @@ public class QuoteVerificationAspect {
         calculateTotalPremium(insFeeOrders);
 
         // 8. 计算分销费用
-//        calculateDistributionFee(insOrdersCosts,insFeeOrders, insOrders);
+        calculateDistributionFee(insOrdersCosts,insFeeOrders, insOrders);
 
         insFeeOrdersService.save(insFeeOrders);
         return insFeeOrders;
@@ -380,11 +380,14 @@ public class QuoteVerificationAspect {
             BiConsumer<InsFeeOrders, BigDecimal> keepPointRate,
             BiConsumer<InsFeeOrders, BigDecimal> keepPointPremium) {
         // 若险种配置为空，默认应收应付为0
-        if (costType == null || premium == null) {
+        if (costType == null) {
             setReceivable.accept(insFeeOrders, BigDecimal.ZERO);
             setPayable.accept(insFeeOrders, BigDecimal.ZERO);
             return;
         }
+        if(Objects.isNull(premium)){
+            premium = BigDecimal.ZERO;
+        }
 
         // 转换百分比（入口比例、加投比例、出口比例）
         BigDecimal inletPercent = convertPercent(costType.getInlet());