提交 eb4556e6 authored 作者: 艾庆国's avatar 艾庆国

承运与无车承运对接

上级 0fc188e6
...@@ -20,8 +20,8 @@ public class SettlementCommonServiceImpl implements SettlementCommonService { ...@@ -20,8 +20,8 @@ public class SettlementCommonServiceImpl implements SettlementCommonService {
@Override @Override
public BigDecimal invoiceServiceFeeCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) { public BigDecimal invoiceServiceFeeCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
return settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight()) return settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight())
.divide(BigDecimal.ONE.subtract(settlementOwnerDetail.getInvoiceServiceFeeRate()), 0, RoundingMode.HALF_UP) .divide(BigDecimal.ONE.subtract(settlementOwnerDetail.getInvoiceServiceFeeRate().movePointLeft(2)), 0, RoundingMode.HALF_UP)
.multiply(settlementOwnerDetail.getInvoiceServiceFeeRate()).setScale(0, RoundingMode.HALF_UP); .multiply(settlementOwnerDetail.getInvoiceServiceFeeRate().movePointLeft(2)).setScale(0, RoundingMode.HALF_UP);
} }
/** /**
......
...@@ -73,8 +73,8 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai ...@@ -73,8 +73,8 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai
: orderChild.getPlatformServiceFeeRate()); : orderChild.getPlatformServiceFeeRate());
settlementDriverDetail.setPlatformServiceFee( settlementDriverDetail.setPlatformServiceFee(
settlementDriverDetail.getSettlementFreight() settlementDriverDetail.getSettlementFreight()
.multiply(settlementDriverDetail.getPlatformServiceFeeRate() .multiply(settlementDriverDetail.getPlatformServiceFeeRate().movePointLeft(2))
.setScale(0, RoundingMode.HALF_UP))); .setScale(0, RoundingMode.HALF_UP));
settlementDriverDetailDao.saveEntity(settlementDriverDetail); settlementDriverDetailDao.saveEntity(settlementDriverDetail);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论