Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinE...

无关风月

2024-07-02 64bb637143020ceef85ae724ac6ce70b28d455af

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

@@ -176,12 +176,14 @@
                            .stream().mapToInt(Integer::intValue).sum();
                }
                Integer userCount = good.getUserCount();
                if (good.getUserCount() > totalNumber) {
                if (userCount > totalNumber) {
                    int i = userCount - totalNumber;
                    if (number > i) {
                        return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
                                i + "！");
                    }
                } else {
                    return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量！");
                }
            }
            boolean result = exchangeGood(goodExchange, recipient, number, goodId, needIntegral);
@@ -320,6 +322,8 @@
                        return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
                                i + "！");
                    }
                } else {
                    return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量！");
                }
            }
            boolean result = exchangeGoodParent(goodExchange, recipient, number, goodId, needIntegral);