fix: 学习端bug

hjl

2024-06-18 a7d177dd48ca8c8a7e154573f7306e2b86dd1a77

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java

@@ -58,20 +58,35 @@
    public GoodDetailVO redeemNow(String goodId, Recipient recipient) {
        // 商品详情
        TGoods goods = lambdaQuery().eq(TGoods::getId, goodId).one();
        // 库存预热，redisson分布式锁
        String key = String.format(RedisConstants.GOOD_STOCK, goods.getId());
        RSemaphore semaphore = redissonClient.getSemaphore(key);
        semaphore.trySetPermits(goods.getSurplus());
        semaphore.expire(Constants.SIXTY, TimeUnit.MINUTES);
        if (null == goods) {
            throw new GlobalException("商品不存在！");
        }
        // 商品总数量为 null，可无限兑换，不需要分布式锁进行控制
        if (null != goods.getTotal()) {
            // 库存预热，redisson分布式锁
            String key = String.format(RedisConstants.GOOD_STOCK, goods.getId());
            List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getGoodsId, goodId)
                    .eq(TOrder::getDisabled, 0).list();
            int sum = orderList.stream().map(TOrder::getCount).mapToInt(Integer::intValue).sum();
            // 计算商品剩余可兑换数量
            int number = goods.getTotal() - sum;
            if (number <= 0) {
                throw new GlobalException("商品可兑换数量不足！");
            }
            // redisson分布式锁
            RSemaphore semaphore = redissonClient.getSemaphore(key);
            semaphore.trySetPermits(goods.getSurplus());
            semaphore.expire(Constants.SIXTY, TimeUnit.MINUTES);
        }
        return new GoodDetailVO(goods, recipient);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R goodExchange(GoodExchangeDTO goodExchange, Recipient recipient) {
    public R<String> goodExchange(GoodExchangeDTO goodExchange, Recipient recipient) {
        Integer number = goodExchange.getNumber();
        Integer goodId = goodExchange.getGoodId();
        TGoods good = this.getById(goodId);
        TGoods good = lambdaQuery().eq(TGoods::getId, goodId).one();
        if (null == good) {
            return R.exchangeError("商品不存在，请稍后重试！");
        }
@@ -85,29 +100,50 @@
        if (user.getIntegral() < needIntegral) {
            return R.exchangeError("兑换失败，当前剩余积分不足！");
        }
        // 检查用户兑换数量是否超过单用户最大兑换数量
        List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getUserId, user.getId())
                .eq(TOrder::getGoodsId, goodId).list();
        // 该商品订单为空、订单数量未超过商品的单个用户兑换上限数量时，可以进行兑换
        int totalNumber = orderList.stream().map(TOrder::getCount).collect(Collectors.toList())
                .stream().mapToInt(Integer::intValue).sum();
        boolean canExchange = orderList.isEmpty() || null == good.getUserCount() ||
                (totalNumber + number) <= good.getUserCount();
        if (!canExchange) {
            return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
                    (good.getUserCount() - totalNumber) + "！");
        if (null != good.getTotal()) {
            // 检查用户兑换数量是否超过单用户最大兑换数量
            List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getUserId, user.getId())
                    .eq(TOrder::getGoodsId, goodId).list();
            // 该商品订单为空、订单数量未超过商品的单个用户兑换上限数量时，可以进行兑换
            int totalNumber = orderList.stream().map(TOrder::getCount).collect(Collectors.toList())
                    .stream().mapToInt(Integer::intValue).sum();
            boolean canExchange = orderList.isEmpty() || null == good.getUserCount() ||
                    (totalNumber + number) <= good.getUserCount();
            if (!canExchange) {
                return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
                        (good.getUserCount() - totalNumber) + "！");
            }
            // redisson分布式锁，防止超卖
            String key = String.format(RedisConstants.GOOD_STOCK, good.getId());
            RSemaphore semaphore = redissonClient.getSemaphore(key);
            // 请求超时时间 单位：毫秒
            semaphore.trySetPermits(1000);
            boolean tried = semaphore.tryAcquire(number);
            // 兑换失败，库存不足
            if (!tried) {
                semaphore.release(number);
                return R.exchangeError("当前商品库存不足");
            }
            // 兑换成功，生成订单信息、生成积分明细(积分明细需要远程调用rouyi-study服务)
            boolean result = exchangeGood(goodExchange, recipient, number, goodId, needIntegral);
            // 扣除库存
            result = result && this.lambdaUpdate().set(TGoods::getTotal, good.getTotal() - number)
                    .eq(TGoods::getId, good.getId()).update();
            if (!result) {
                semaphore.release(number);
                return R.exchangeError("商品兑换失败！");
            }
        } else {
            boolean result = exchangeGood(goodExchange, recipient, number, goodId, needIntegral);
            if (!result) {
                return R.exchangeError("商品兑换失败！");
            }
        }
        // redisson分布式锁，防止超卖
        String key = String.format(RedisConstants.GOOD_STOCK, good.getId());
        RSemaphore semaphore = redissonClient.getSemaphore(key);
        // 请求超时时间 单位：毫秒
        semaphore.trySetPermits(1000);
        boolean tried = semaphore.tryAcquire(number);
        // 兑换失败，库存不足
        if (!tried) {
            semaphore.release(number);
            return R.exchangeError("当前商品库存不足");
        }
        return R.ok();
    }

    private Boolean exchangeGood(GoodExchangeDTO goodExchange, Recipient recipient, Integer number,
                                 Integer goodId, int needIntegral) {
        // 兑换成功，生成订单信息、生成积分明细(积分明细需要远程调用rouyi-study服务)
        TOrder order = orderInfo(goodExchange, recipient, number, goodId, needIntegral);
        boolean result = orderService.save(order);
@@ -115,14 +151,7 @@
        result = result && studyClient.addIntegralDetail(Constants.BURDEN + needIntegral, Constants.SHOPPING_CONSUME).getData();
        // 扣除用户积分
        result = result && studyClient.exchangeIntegral(needIntegral, Constants.BURDEN).getData();
        // 扣除库存
        result = result && this.lambdaUpdate().set(TGoods::getSurplus, good.getSurplus() - number)
                .eq(TGoods::getId, good.getId()).update();
        if (!result) {
            semaphore.release(number);
            return R.exchangeError("商品兑换失败！");
        }
        return R.ok();
        return result;
    }

    @Override