修改 财务bug

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

@@ -512,12 +512,18 @@ public class QuoteVerificationAspect {
         insFeeOrders.setJyInletRatio(jyCostType != null
                 ? convertPercent(jyCostType.getInlet() != null ? jyCostType.getInlet() : BigDecimal.ZERO) : BigDecimal.ZERO);
         // 跟单比例
-        insFeeOrders.setJqFollowRatio(jqCostType != null ?
-                calculateFollowRatio(jqCostType, convertPercent(agreementInfoVo.getAgreement().getJqEntranceFeeRatio())) : BigDecimal.ZERO);
-        insFeeOrders.setSyFollowRatio(syCostType != null ?
-                calculateFollowRatio(syCostType, convertPercent(agreementInfoVo.getAgreement().getSyEntranceFeeRatio())) : BigDecimal.ZERO);
-        insFeeOrders.setJyFollowRatio(jyCostType != null ?
-                calculateFollowRatio(jyCostType, convertPercent(agreementInfoVo.getAgreement().getJyEntranceFeeRatio())) : BigDecimal.ZERO);
+        insFeeOrders.setJqFollowRatio(Objects.nonNull(insFeeOrders.getJqFollowRatio()) ?
+                insFeeOrders.getJqFollowRatio() : BigDecimal.ZERO);
+        insFeeOrders.setSyFollowRatio(Objects.nonNull(insFeeOrders.getSyFollowRatio()) ?
+                insFeeOrders.getSyFollowRatio() : BigDecimal.ZERO);
+        insFeeOrders.setJyFollowRatio(Objects.nonNull(insFeeOrders.getJyFollowRatio()) ?
+                insFeeOrders.getJyFollowRatio() : BigDecimal.ZERO);
+//        insFeeOrders.setJqFollowRatio(jqCostType != null ?
+//                calculateFollowRatio(jqCostType, convertPercent(agreementInfoVo.getAgreement().getJqEntranceFeeRatio())) : BigDecimal.ZERO);
+//        insFeeOrders.setSyFollowRatio(syCostType != null ?
+//                calculateFollowRatio(syCostType, convertPercent(agreementInfoVo.getAgreement().getSyEntranceFeeRatio())) : BigDecimal.ZERO);
+//        insFeeOrders.setJyFollowRatio(jyCostType != null ?
+//                calculateFollowRatio(jyCostType, convertPercent(agreementInfoVo.getAgreement().getJyEntranceFeeRatio())) : BigDecimal.ZERO);
         // 加投比例
         insFeeOrders.setJqAdditionalRatio(jqCostType != null
                 ? convertPercent(jqCostType.getAddThrow() != null ? jqCostType.getAddThrow() : BigDecimal.ZERO)
@@ -529,15 +535,14 @@ public class QuoteVerificationAspect {
                 ? convertPercent(jyCostType.getAddThrow() != null ? jyCostType.getAddThrow() : BigDecimal.ZERO)
                 : BigDecimal.ZERO);
         // 留点比例
-        insFeeOrders.setJqKeepPointRatio(jqCostType != null
-                ? convertPercent(jqCostType.getKeepPointRatio() != null ? jqCostType.getKeepPointRatio() : BigDecimal.ZERO)
-                : BigDecimal.ZERO);
-        insFeeOrders.setSyKeepPointRatio(syCostType != null
-                ? convertPercent(syCostType.getKeepPointRatio() != null ? syCostType.getKeepPointRatio() : BigDecimal.ZERO)
-                : BigDecimal.ZERO);
-        insFeeOrders.setJyKeepPointRatio(jyCostType != null
-                ? convertPercent(jyCostType.getKeepPointRatio() != null ? jyCostType.getKeepPointRatio() : BigDecimal.ZERO)
-                : BigDecimal.ZERO);
+        insFeeOrders.setJqKeepPointRatio(Objects.nonNull(insFeeOrders.getJqKeepPointRatio())
+                ? insFeeOrders.getJqKeepPointRatio() : BigDecimal.ZERO);
+
+        insFeeOrders.setSyKeepPointRatio(Objects.nonNull(insFeeOrders.getSyKeepPointRatio())
+                ? insFeeOrders.getSyKeepPointRatio() : BigDecimal.ZERO);
+
+        insFeeOrders.setJyKeepPointRatio(Objects.nonNull(insFeeOrders.getJyKeepPointRatio())
+                ? insFeeOrders.getJyKeepPointRatio() : BigDecimal.ZERO);
 
         // 出口比例
         insFeeOrders.setJqExportRatio(jqCostType != null