|
|
@@ -116,28 +116,6 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
|
|
|
// 获取费用信息
|
|
|
InsFeeOrders insFeeOrders = insFeeOrdersMapper.selectById(insOrders.getId());
|
|
|
|
|
|
- // add by lipf, 2026年6月23日18:32:24 按照财务和田智沟通后的结果,当入口手续费比例大于入口比例的时候,强制设置入口手续费比例为入口比例。
|
|
|
-// BigDecimal jqInletRatio = insFeeOrders.getJqInletRatio();
|
|
|
-// BigDecimal syInletRatio = insFeeOrders.getSyInletRatio();
|
|
|
-// BigDecimal jyInletRatio = insFeeOrders.getJyInletRatio();
|
|
|
-//
|
|
|
-// BigDecimal jqCommissionRatio = insFeeOrders.getJqCommissionRatio();
|
|
|
-// BigDecimal syCommissionRatio = insFeeOrders.getSyCommissionRatio();
|
|
|
-// BigDecimal jyCommissionRatio = insFeeOrders.getJyCommissionRatio();
|
|
|
-//
|
|
|
-// if(BigDecimalUtil.subtract(jqCommissionRatio,jqInletRatio).compareTo(BigDecimal.ZERO)>0){
|
|
|
-// insFeeOrders.setJqCommissionRatio(jqInletRatio);
|
|
|
-// insFeeOrders.setJqFollowRatio(BigDecimal.ZERO);
|
|
|
-// }
|
|
|
-// if(BigDecimalUtil.subtract(syCommissionRatio,syInletRatio).compareTo(BigDecimal.ZERO)>0){
|
|
|
-// insFeeOrders.setSyCommissionRatio(syInletRatio);
|
|
|
-// insFeeOrders.setSyFollowRatio(BigDecimal.ZERO);
|
|
|
-// }
|
|
|
-// if(BigDecimalUtil.subtract(jyCommissionRatio,jyInletRatio).compareTo(BigDecimal.ZERO)>0){
|
|
|
-// insFeeOrders.setJyCommissionRatio(jyInletRatio);
|
|
|
-// insFeeOrders.setJyFollowRatio(BigDecimal.ZERO);
|
|
|
-// }
|
|
|
-
|
|
|
// 关键:获取是否含税标识
|
|
|
Integer withTax = ptlAgreement.getWithTax(); // 0-否 1-是
|
|
|
|
|
|
@@ -234,7 +212,8 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
|
|
|
// log.info("分销总费用:distributionFee=【{}】",distributionFee);
|
|
|
// BigDecimal keepPoint = BigDecimalUtil.subtract(BigDecimalUtil.add(inlet,addThrow),BigDecimalUtil.add(export, distributionFee));
|
|
|
// log.info("留点费用:inlet=[{}],addThrow=[{}],export=[{}], distributionFee=[{}]mkeepPoint=[{}]", inlet, addThrow, export, distributionFee, keepPoint);
|
|
|
- BigDecimal exportContainDistribute = premium.multiply(exportRatioContainDistribution).setScale(scale, RoundingMode.HALF_DOWN);
|
|
|
+ // modify by lipf 财务要求,计算留点的时候,出口费用,按照两位进行截断
|
|
|
+ BigDecimal exportContainDistribute = premium.multiply(exportRatioContainDistribution).setScale(2, RoundingMode.DOWN);
|
|
|
BigDecimal keepPoint = BigDecimalUtil.subtract(BigDecimalUtil.add(inlet,addThrow),exportContainDistribute);
|
|
|
log.info("计算留点:inlet=[{}],addThrow=[{}].exportContainDistribute=[{}]", inlet, addThrow, exportContainDistribute);
|
|
|
|