提交 b0a6bde8 authored 作者: huyufan's avatar huyufan

预付运费不够,但是通过风控也是网运单

上级 dab86edb
......@@ -128,7 +128,7 @@ public class SettlementServiceImpl implements SettlementService {
runningWaterRecord.setOrderChildNo(orderChild.getChildNo());
runningWaterRecord.setRelationId(null);
runningWaterRecord.setAlterationBalance(ans);
runningWaterRecord.setFrozenBalance(account.getFrozenBalance().subtract(ans));
runningWaterRecord.setFrozenBalance(subtract.subtract(ans));
runningWaterRecord.setUsableBalance(account.getUsableBalance());
runningWaterRecord.setTakeOutBalance(ans);
runningWaterRecord.setAccountBalance(account.getAccountBalance().subtract(ans));
......@@ -162,11 +162,7 @@ public class SettlementServiceImpl implements SettlementService {
settlementDriverDetail.setInvoiceType(invoiceType);
// 结算金额
settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) != 0
&& settlementOwnerDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())
) {
settlementOwnerDetail.setFinalPaymentStatus(2);
}
//设置司机预付运费标示
if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
settlementDriverDetail.setPrepayFreightFlag(1);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论