From bfcbb8f2d4e3c9bdc63412dde76bbf016c2c2aa2 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 15 May 2025 16:43:45 +0800 Subject: [PATCH] refactor(mall): 积分商品相关逻辑调整 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java index 98822cb..2dfbdb4 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java @@ -209,12 +209,12 @@ MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId()); // 零撸专区购买 - if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) { - List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId()); - if (CollUtil.isNotEmpty(items)) { - throw new FebsException("无法重复领取同一个商品"); - } - } +// if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) { +// List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId()); +// if (CollUtil.isNotEmpty(items)) { +// throw new FebsException("积分商品限制一件"); +// } +// } if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) { throw new FebsException(mallGoods.getGoodsName() + "已下架"); @@ -709,11 +709,11 @@ orderListDto.setMemberId(member.getId()); // IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto); IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectNewApiOrderListInPage(page, orderListDto); - if (CollUtil.isNotEmpty(mallOrderInfos.getRecords())) { - mallOrderInfos.getRecords().forEach(item -> { - item.setItems(mallOrderItemMapper.selectListByOrderId(item.getId())); - }); - } +// if (CollUtil.isNotEmpty(mallOrderInfos.getRecords())) { +// mallOrderInfos.getRecords().forEach(item -> { +// item.setItems(mallOrderItemMapper.selectListByOrderId(item.getId())); +// }); +// } return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords()); } -- Gitblit v1.9.1