|
@@ -148,10 +148,13 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
|
|
|
BigDecimal commission = base.multiply(commissionRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
BigDecimal commission = base.multiply(commissionRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
BigDecimal inlet = base.multiply(inletRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
BigDecimal inlet = base.multiply(inletRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
BigDecimal follow = base.multiply(followRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
BigDecimal follow = base.multiply(followRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
- BigDecimal addThrow = base.multiply(addThrowRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
|
|
BigDecimal keepPoint = base.multiply(keepPointRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
BigDecimal keepPoint = base.multiply(keepPointRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
- BigDecimal export = base.multiply(exportRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
|
|
- BigDecimal exportKeepPoint = base.multiply(exportKeepPointRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 加投那块入口不分含不含税都是直接乘
|
|
|
|
|
+ BigDecimal addThrow = premium.multiply(addThrowRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
|
|
+ // 入口需要/1.06,出口直接乘
|
|
|
|
|
+ BigDecimal export = premium.multiply(exportRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
|
|
+ BigDecimal exportKeepPoint = premium.multiply(exportKeepPointRatio).setScale(scale, RoundingMode.HALF_EVEN);
|
|
|
|
|
|
|
|
// 赋值到实体(自动匹配 jq / sy / jy)
|
|
// 赋值到实体(自动匹配 jq / sy / jy)
|
|
|
if ("jq".equals(type)) {
|
|
if ("jq".equals(type)) {
|