From aa34f5b4a80eec408185cc36500149679e1a71c9 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 09:40:50 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 38 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
index 4eae5a5..8f7ad85 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.RedisConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.domain.Recipient;
import com.ruoyi.goods.domain.TGoods;
@@ -16,7 +17,7 @@
import com.ruoyi.goods.vo.TGoodsVO;
import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.feignClient.StudyClient;
-import com.ruoyi.system.api.model.LoginUserParent;
+import com.ruoyi.study.api.vo.UserPersonalCenterVO;
import org.redisson.api.RSemaphore;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -57,52 +58,92 @@
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("商品不存在，请稍后重试！");
}
// 校验用户积分是否足够兑换
- TUser user = studyClient.userInfo().getData();
- LoginUserParent loginUser1 = tokenService.getLoginUser1();
- if (user == null){
- user = studyClient.getUserById(loginUser1.getUserid()).getData();
+ UserPersonalCenterVO userPersonalCenter = studyClient.userInfo().getData();
+ if (null == userPersonalCenter) {
+ throw new GlobalException("用户信息获取失败！");
}
+ TUser user = userPersonalCenter.getUser();
int needIntegral = good.getIntegral() * number;
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);
@@ -110,13 +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
@@ -129,7 +164,7 @@
return R.exchangeError("商品不存在，请稍后重试！");
}
// 校验用户积分是否足够兑换
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
TUser user = studyClient.getUserById(tokenService.getLoginUser1().getUserid()).getData();
@@ -188,6 +223,7 @@
order.setDisabled(Boolean.FALSE);
return order;
}
+
private TOrder orderInfo1(GoodExchangeDTO goodExchange, Recipient recipient, Integer number, Integer goodId, int needIntegral) {
TOrder order = new TOrder();
order.setOrderNumber(goodExchange.getOrderNumber());
--
Gitblit v1.7.1