mirrors/youlai-mall
1
0
Fork 0
mirror of https://gitee.com/youlaitech/youlai-mall.git synced 2024-12-22 12:48:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(PmsSkuService.java): 修复订单提交扣减库存锁定商品失败的时候没有释放锁的问题。

Browse Source
This commit is contained in:
郝先瑞 2022-02-25 21:30:14 +08:00
parent dff540b7c6
commit 4604c2e6bc
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/PmsSkuServiceImpl.java
View File

@ -61,30 +61,35 @@ public class PmsSkuServiceImpl extends ServiceImpl<PmsSkuMapper, PmsSku> impleme
@Override
@Transactional
public boolean lockStock(LockStockDTO lockStockDTO) {
log.info("锁定商品库存：{}", JSONUtil.toJsonStr(lockStockDTO));
log.info("锁定商品库存:{}", JSONUtil.toJsonStr(lockStockDTO));
List<LockStockDTO.LockedSku> lockedSkuList = lockStockDTO.getLockedSkuList();
Assert.isTrue(CollectionUtil.isNotEmpty(lockedSkuList), "锁定的商品为空");
// 锁定商品
// 循环遍历锁定商品
lockedSkuList.forEach(lockedSku -> {
RLock lock = redissonClient.getLock(PmsConstants.LOCK_SKU_PREFIX + lockedSku.getSkuId()); // 获取商品的分布式锁
RLock lock = redissonClient.getLock(PmsConstants.LOCK_SKU_PREFIX + lockedSku.getSkuId()); // 获取分布式锁
// 加锁
lock.lock();
boolean lockResult = this.update(new LambdaUpdateWrapper<PmsSku>()
.setSql("locked_stock_num = locked_stock_num + " + lockedSku.getCount())
.eq(PmsSku::getId, lockedSku.getSkuId())
.apply("stock_num - locked_stock_num >= {0}", lockedSku.getCount())
);
if (lockResult) {
try {
boolean lockResult = this.update(new LambdaUpdateWrapper<PmsSku>()
.setSql("locked_stock_num = locked_stock_num + " + lockedSku.getCount())
.eq(PmsSku::getId, lockedSku.getSkuId())
.apply("stock_num - locked_stock_num >= {0}", lockedSku.getCount())
);
log.error("锁定商品 {} 失败", lockedSku.getSkuId());
Assert.isTrue(lockResult, "锁定商品 {} 失败", lockedSku.getSkuId());
} finally {
// 释放锁
lock.unlock();
} else {
throw new BizException("锁定商品" + lockedSku.getSkuId() + "失败");
}
});
// 将锁定商品库存信息保存至Redis
// 将锁定的商品ID和对应购买数量持久化至Redis，后续使用场景: 1.订单取消归还库存;2.订单支付成功扣减库存。
String orderToken = lockStockDTO.getOrderToken();
redisTemplate.opsForValue().set(PmsConstants.LOCKED_STOCK_PREFIX + orderToken, JSONUtil.toJsonStr(lockedSkuList));
// 无异常直接返回true
return true;
}
@ -108,11 +113,11 @@ public class PmsSkuServiceImpl extends ServiceImpl<PmsSkuMapper, PmsSku> impleme
}
/**
* 扣减库存 - 支付成功
* 扣减库存 - 支付成功
*/
@Override
public boolean deductStock(String orderToken) {
log.info("扣减库存，orderToken:{}",orderToken);
log.info("扣减库存，orderToken:{}", orderToken);
String lockedSkuJsonStr = redisTemplate.opsForValue().get(PmsConstants.LOCKED_STOCK_PREFIX + orderToken);
List<LockStockDTO.LockedSku> lockedSkuList = JSONUtil.toList(lockedSkuJsonStr, LockStockDTO.LockedSku.class);