From 068fe86cffc98f31a0b83bee34fa2dce6b23b736 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 04 Jun 2024 10:10:47 +0800 Subject: [PATCH] 退款 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java index 44a7f30..67810c5 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java @@ -421,7 +421,8 @@ //退款退款金额 BigDecimal refundAmount = mallRefundEntity.getAmount(); List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId); - if(CollUtil.isEmpty(mallOrderItemListOnly)){ + List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId); + if(CollUtil.isEmpty(mallOrderItemListOnly) && CollUtil.isEmpty(mallOrderItemListIng) ){ refundAmount = refundAmount.add(mallOrderInfo.getCarriage()); log.info("退款订单编号为{},订单金额:{},待退款订单:{},退款金额:{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount); } -- Gitblit v1.9.1