diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java index e47281e4..50e770ec 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java @@ -467,8 +467,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService throw new ServiceException(MessageUtils.message("price.bill.notFound")); } PrcOrderBill bill = list.get(0); - return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), - payBillFeeMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()))); + // 应付暂不在范围内:组装计费结果时不查 prc_pay_bill_fee + return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), null); } @@ -696,8 +696,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService { throw new ServiceException(MessageUtils.message("price.bill.notFound")); } - return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), - payBillFeeMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()))); + return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), null); } @Override @@ -1706,7 +1705,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService bill.setRefundStatus(refundStatus); orderBillMapper.updatePrcOrderBill(bill); orderBillMapper.refreshArBillStatusByBillIds(Arrays.asList(bill.getBillId())); - return toResult(bill, fees, payBillFeeMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()))); + return toResult(bill, fees, null); } private static String resolveRefundStatus(List fees) @@ -1882,8 +1881,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService orderBillMapper.updateCreditArrearsStatus(bill.getBillId(), normal, operator); bill.setCreditArrearsStatus(normal); saveManualArrearsUpdateEsLog(bill, true, null); - return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), - payBillFeeMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()))); + return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), null); } private void saveManualArrearsUpdateEsLog(PrcOrderBill bill, boolean success, String errorMessage) @@ -3078,8 +3076,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService { throw new ServiceException(MessageUtils.message("price.bill.notFound")); } - return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), - payBillFeeMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()))); + return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), null); } /** 存在上游 Oracle 行 => 同步/计费路径会同时覆盖 weight 与 charge_weight。 */