From 242bc96e8b1d97067088aab1c532deb1c3c2f359 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Fri, 16 May 2025 10:40:12 +0800 Subject: [PATCH] refactor(mallMember): 优化资金流水列表页面 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 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 65821e6..46e9608 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 @@ -208,13 +208,13 @@ } 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("无法重复领取同一个商品"); - } - } + // todo 纯积分商品一个账号限制购买一次 +// 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() + "已下架"); @@ -621,7 +621,7 @@ ScoreFlowTypeEnum.PAY_BALANCE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(), - StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getScoreAmount()), + StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getAmount()), 2 ); agentProducer.sendOrderCoupon(orderInfo.getId()); @@ -724,13 +724,13 @@ if (ObjectUtil.isNull(orderInfo)) { throw new FebsException("订单不存在"); } - List<MallOrderItem> items = orderInfo.getItems(); - if(CollUtil.isNotEmpty(items)){ - for(MallOrderItem mallOrderItem : items){ - mallOrderItem.setItemAmount(mallOrderItemMapper.selectById(mallOrderItem.getId()).getAmount()); - mallOrderItem.setScoreAmount(mallOrderItemMapper.selectById(mallOrderItem.getId()).getScoreAmount()); - } - } +// List<MallOrderItem> items = orderInfo.getItems(); +// if(CollUtil.isNotEmpty(items)){ +// for(MallOrderItem mallOrderItem : items){ +// mallOrderItem.setItemAmount(mallOrderItemMapper.selectById(mallOrderItem.getId()).getAmount()); +// mallOrderItem.setScoreAmount(mallOrderItemMapper.selectById(mallOrderItem.getId()).getScoreAmount()); +// } +// } OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo); -- Gitblit v1.9.1