From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 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 ab3061e..4eae5a5 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
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.RedisConstants;
-import com.ruoyi.common.core.exception.GlobalException;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.domain.Recipient;
import com.ruoyi.goods.domain.TGoods;
@@ -16,6 +16,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 org.redisson.api.RSemaphore;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -24,6 +25,7 @@
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -59,23 +61,28 @@
String key = String.format(RedisConstants.GOOD_STOCK, goods.getId());
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 Boolean goodExchange(GoodExchangeDTO goodExchange, Recipient recipient) {
+ public R goodExchange(GoodExchangeDTO goodExchange, Recipient recipient) {
Integer number = goodExchange.getNumber();
Integer goodId = goodExchange.getGoodId();
TGoods good = this.getById(goodId);
if (null == good) {
- throw new GlobalException("商品不存在，请稍后重试！");
+ return R.exchangeError("商品不存在，请稍后重试！");
}
// 校验用户积分是否足够兑换
TUser user = studyClient.userInfo().getData();
+ LoginUserParent loginUser1 = tokenService.getLoginUser1();
+ if (user == null){
+ user = studyClient.getUserById(loginUser1.getUserid()).getData();
+ }
int needIntegral = good.getIntegral() * number;
if (user.getIntegral() < needIntegral) {
- throw new GlobalException("兑换失败，当前剩余积分不足！");
+ return R.exchangeError("兑换失败，当前剩余积分不足！");
}
// 检查用户兑换数量是否超过单用户最大兑换数量
List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getUserId, user.getId()).eq(TOrder::getGoodsId, goodId).list();
@@ -83,7 +90,7 @@
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) {
- throw new GlobalException("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " + (good.getUserCount() - totalNumber) + "！");
+ return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " + (good.getUserCount() - totalNumber) + "！");
}
// redisson分布式锁，防止超卖
String key = String.format(RedisConstants.GOOD_STOCK, good.getId());
@@ -94,7 +101,7 @@
// 兑换失败，库存不足
if (!tried) {
semaphore.release(number);
- throw new GlobalException("当前商品库存不足！");
+ return R.exchangeError("当前商品库存不足");
}
// 兑换成功，生成订单信息、生成积分明细(积分明细需要远程调用rouyi-study服务)
TOrder order = orderInfo(goodExchange, recipient, number, goodId, needIntegral);
@@ -107,9 +114,63 @@
result = result && this.lambdaUpdate().set(TGoods::getSurplus, good.getSurplus() - number).eq(TGoods::getId, good.getId()).update();
if (!result) {
semaphore.release(number);
- throw new GlobalException("商品兑换失败！");
+ return R.exchangeError("商品兑换失败！");
}
- return result;
+ return R.ok();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R goodExchange1(GoodExchangeDTO goodExchange, Recipient recipient) {
+ Integer number = goodExchange.getNumber();
+ Integer goodId = goodExchange.getGoodId();
+ TGoods good = this.getById(goodId);
+ if (null == good) {
+ return R.exchangeError("商品不存在，请稍后重试！");
+ }
+ // 校验用户积分是否足够兑换
+ if (tokenService.getLoginUser1() == null){
+ return R.tokenError("登录失效");
+ }
+ TUser user = studyClient.getUserById(tokenService.getLoginUser1().getUserid()).getData();
+
+ 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) + "！");
+ }
+ // 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服务)
+ TOrder order = orderInfo1(goodExchange, recipient, number, goodId, needIntegral);
+ boolean result = orderService.save(order);
+ // 远程调用，生成积分明细
+ result = result && studyClient.addIntegralDetail1(Constants.BURDEN + needIntegral, Constants.SHOPPING_CONSUME).getData();
+ // 扣除用户积分
+ result = result && studyClient.exchangeIntegral1(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();
}
private TOrder orderInfo(GoodExchangeDTO goodExchange, Recipient recipient, Integer number, Integer goodId, int needIntegral) {
@@ -127,4 +188,19 @@
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());
+ order.setUserId(tokenService.getLoginUser1().getUserid());
+ order.setInsertTime(new Date());
+ order.setGoodsId(goodId);
+ order.setCount(number);
+ order.setState(1);
+ order.setIntegral(needIntegral);
+ order.setConsigneeName(recipient.getRecipient());
+ order.setConsigneePhone(recipient.getRecipientPhone());
+ order.setConsigneeAddress(recipient.getAddress());
+ order.setDisabled(Boolean.FALSE);
+ return order;
+ }
}
--
Gitblit v1.7.1