|
@@ -579,9 +579,9 @@ public class QuoteVerificationAspect {
|
|
|
? insFeeOrders.getJyKeepPointRatio() : BigDecimal.ZERO);
|
|
? insFeeOrders.getJyKeepPointRatio() : BigDecimal.ZERO);
|
|
|
|
|
|
|
|
// 出口比例 = 出口比例 - 分销比例
|
|
// 出口比例 = 出口比例 - 分销比例
|
|
|
- BigDecimal firstDistributionRatio = insFeeOrders.getFirstDistributionRatio();
|
|
|
|
|
- BigDecimal secondDistributionRatio = insFeeOrders.getSecondDistributionRatio();
|
|
|
|
|
- BigDecimal thirdDistributionRatio = insFeeOrders.getThirdDistributionRatio();
|
|
|
|
|
|
|
+ BigDecimal firstDistributionRatio = Optional.ofNullable(insFeeOrders.getFirstDistributionRatio()).orElse(BigDecimal.ZERO);
|
|
|
|
|
+ BigDecimal secondDistributionRatio = Optional.ofNullable(insFeeOrders.getSecondDistributionRatio()).orElse(BigDecimal.ZERO);
|
|
|
|
|
+ BigDecimal thirdDistributionRatio = Optional.ofNullable(insFeeOrders.getThirdDistributionRatio()).orElse(BigDecimal.ZERO);
|
|
|
insFeeOrders.setJqExportRatio(jqCostType == null ? BigDecimal.ZERO :
|
|
insFeeOrders.setJqExportRatio(jqCostType == null ? BigDecimal.ZERO :
|
|
|
(jqCostType.getExport() != null && jqCostType.getExport().compareTo(BigDecimal.ZERO) > 0
|
|
(jqCostType.getExport() != null && jqCostType.getExport().compareTo(BigDecimal.ZERO) > 0
|
|
|
? convertPercent(jqCostType.getExport()).subtract(firstDistributionRatio).subtract(secondDistributionRatio).subtract(thirdDistributionRatio)
|
|
? convertPercent(jqCostType.getExport()).subtract(firstDistributionRatio).subtract(secondDistributionRatio).subtract(thirdDistributionRatio)
|