From f991c73f56f35665bcbe8ce2252c04ea82032b10 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期一, 27 五月 2024 18:06:31 +0800
Subject: [PATCH] feat: 修复登录bug;数据校验规则优化
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 b2c3d61..ab3061e 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
@@ -12,6 +12,7 @@
import com.ruoyi.goods.mapper.TGoodsMapper;
import com.ruoyi.goods.service.ITGoodsService;
import com.ruoyi.goods.service.ITOrderService;
+import com.ruoyi.goods.vo.GoodDetailVO;
import com.ruoyi.goods.vo.TGoodsVO;
import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.feignClient.StudyClient;
@@ -22,9 +23,8 @@
import javax.annotation.Resource;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -52,23 +52,19 @@
}
@Override
- public Map<String, Object> redeemNow(String goodId, Recipient recipient) {
+ public GoodDetailVO redeemNow(String goodId, Recipient recipient) {
// 商品详情
TGoods goods = lambdaQuery().eq(TGoods::getId, goodId).one();
- Map<String, Object> result = new HashMap<>(8);
- result.put("goodDetail", goods);
- // 用户收货地址
- result.put("address", recipient);
// 库存预热，redisson分布式锁
String key = String.format(RedisConstants.GOOD_STOCK, goods.getId());
RSemaphore semaphore = redissonClient.getSemaphore(key);
semaphore.trySetPermits(goods.getSurplus());
- return result;
+ return new GoodDetailVO(goods, recipient);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Object goodExchange(GoodExchangeDTO goodExchange, Recipient recipient) {
+ public Boolean goodExchange(GoodExchangeDTO goodExchange, Recipient recipient) {
Integer number = goodExchange.getNumber();
Integer goodId = goodExchange.getGoodId();
TGoods good = this.getById(goodId);
@@ -81,25 +77,39 @@
if (user.getIntegral() < needIntegral) {
throw new GlobalException("兑换失败，当前剩余积分不足！");
}
+ // 检查用户兑换数量是否超过单用户最大兑换数量
+ 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) {
+ throw new GlobalException("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " + (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);
throw new GlobalException("当前商品库存不足！");
}
// 兑换成功，生成订单信息、生成积分明细(积分明细需要远程调用rouyi-study服务)
TOrder order = orderInfo(goodExchange, recipient, number, goodId, needIntegral);
- if (!orderService.save(order)) {
- throw new GlobalException("订单生成失败！");
- }
+ boolean result = orderService.save(order);
// 远程调用，生成积分明细
- Boolean boo = studyClient.addIntegralDetail(Constants.BURDEN + needIntegral, Constants.SHOPPING_CONSUME).getData();
- if (!boo) {
- throw new GlobalException("生成积分明细失败，请稍后重试！");
+ 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);
+ throw new GlobalException("商品兑换失败！");
}
- return true;
+ return result;
}
private TOrder orderInfo(GoodExchangeDTO goodExchange, Recipient recipient, Integer number, Integer goodId, int needIntegral) {
--
Gitblit v1.7.1