From e15c348bc992de7331d14d76451032358aae9289 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 09 Jan 2025 15:44:14 +0800 Subject: [PATCH] feat(mall): 商品列表增加活动筛选功能 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 8 +++++++- 1 files changed, 7 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 d1f7617..00ba3cf 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 @@ -435,7 +435,13 @@ // } BigDecimal refundAmount = mallRefundEntity.getAmount(); if(agreeType == 1){ - refundAmount = refundAmount.add(mallOrderInfo.getCarriage()); + List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId); + if(CollUtil.isNotEmpty(mallOrderItemListOnly)){ + if(1==mallOrderItemListOnly.size()){ + refundAmount = refundAmount.add(mallOrderInfo.getCarriage()); + log.info("退款订单编号为{},订单金额:{},待退款订单:{},退款金额:{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount); + } + } }else if(agreeType == 2){ List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId); List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId); -- Gitblit v1.9.1