From 2af997003d62997716f56f49a6d314f4889dea89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Thu, 11 Sep 2025 23:05:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FinanceBillServiceImpl.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java index 08ebb56c2..54558d5af 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java @@ -213,18 +213,21 @@ public class FinanceBillServiceImpl implements IFinanceBillService { Map refundPaymentBillDetailMap; if (CollUtil.isNotEmpty(afterSaleBillUks)) { refundPaymentBillMap = financeBillMapper.selectList( - Wrappers.lambdaQuery(FinanceBill.class) - .in(FinanceBill::getBusinessUniqueKey, afterSaleBillUks) - .eq(FinanceBill::getBillType, EFinBillType.PAYMENT.getValue()) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) + Wrappers.lambdaQuery(FinanceBill.class) + .in(FinanceBill::getBusinessUniqueKey, afterSaleBillUks) + .eq(FinanceBill::getBillType, EFinBillType.PAYMENT.getValue()) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) .stream() .collect(Collectors.toMap(SimpleEntity::getId, Function.identity())); - Assert.notEmpty(refundPaymentBillMap); - refundPaymentBillDetailMap = financeBillDetailMapper.selectList( - Wrappers.lambdaQuery(FinanceBillDetail.class) - .in(FinanceBillDetail::getFinanceBillId, refundPaymentBillMap.keySet()) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)).stream() - .collect(Collectors.toMap(FinanceBillDetail::getRelId, Function.identity())); + if (MapUtil.isEmpty(refundPaymentBillMap)) { + refundPaymentBillDetailMap = MapUtil.empty(); + } else { + refundPaymentBillDetailMap = financeBillDetailMapper.selectList( + Wrappers.lambdaQuery(FinanceBillDetail.class) + .in(FinanceBillDetail::getFinanceBillId, refundPaymentBillMap.keySet()) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)).stream() + .collect(Collectors.toMap(FinanceBillDetail::getRelId, Function.identity())); + } } else { refundPaymentBillMap = MapUtil.empty(); refundPaymentBillDetailMap = MapUtil.empty();