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

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

...@@ -162,7 +162,7 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -162,7 +162,7 @@ public class SettlementServiceImpl implements SettlementService {
settlementDriverDetail.setInvoiceType(invoiceType); settlementDriverDetail.setInvoiceType(invoiceType);
// 结算金额 // 结算金额
settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail)); settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) == 0 if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) != 0
&& settlementOwnerDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode()) && settlementOwnerDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())
) { ) {
settlementOwnerDetail.setFinalPaymentStatus(2); settlementOwnerDetail.setFinalPaymentStatus(2);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论