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

确认收货处理相关借款逻辑

上级 7f8e0a5c
...@@ -136,7 +136,7 @@ public class OrderChildLoanComponent { ...@@ -136,7 +136,7 @@ public class OrderChildLoanComponent {
orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(size)); orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(size));
} }
BigDecimal ans = subtract.subtract(orderChildSum); BigDecimal ans = subtract.subtract(orderChildSum);
log.info("6.当前订单冻结的预付运费还有剩余, 查询查询未结算的运单(没有产生扣除流水的运单)总计{},账户剩余{}", orderChildSum, subtract); log.info("6.当前订单冻结的预付运费还有剩余, 查询查询未结算的运单(没有产生扣除流水的运单)总计{},订单冻结预付运费剩余{}", orderChildSum, subtract);
if (ans.compareTo(BigDecimal.ZERO) >= 0) { if (ans.compareTo(BigDecimal.ZERO) >= 0) {
//预付运费够 //预付运费够
......
...@@ -354,7 +354,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -354,7 +354,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
break; break;
} else { } else {
log.info("当前借款单的剩余金额不够抵扣借款金额,先进行扣除当前借款所有剩余"); log.info("当前借款单的剩余金额不够抵扣借款金额,先进行扣除当前借款所有剩余");
generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPriceTemp); generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, loanResidueBalance);
updateList.add(ownerLoanRecord.setLoanResidueBalance(BigDecimal.ZERO)); updateList.add(ownerLoanRecord.setLoanResidueBalance(BigDecimal.ZERO));
orderChildPriceTemp = orderChildPriceTemp.subtract(loanResidueBalance); orderChildPriceTemp = orderChildPriceTemp.subtract(loanResidueBalance);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论