caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!155 修复结算时，清空购物车问题

Browse Source 
Merge pull request !155 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-05-06 07:51:04 +00:00 committed by Gitee
commit 5b9fd139a3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
framework/src/main/java/cn/lili/common/aop/interceptor/PreventDuplicateSubmissionsInterceptor.java
View File

@ -1,13 +1,5 @@
package cn.lili.common.aop.interceptor;
/**
* 防重复提交业务
*
* @author Chopper
* @version v1.0
* 2022-01-25 09:20
*/
import cn.lili.cache.Cache;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultCode;
@ -23,6 +15,13 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 防重复提交业务
*
* @author Chopper
* @version v1.0
* 2022-01-25 09:20
*/
@Aspect
@Component
@Slf4j

39
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
View File

@ -306,13 +306,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
LambdaQueryWrapper<Goods> queryWrapper = this.getQueryWrapperByStoreAuthority();
queryWrapper.in(Goods::getId, goodsIds);
List<Goods> goodsList = this.list(queryWrapper);
for (Goods goods : goodsList) {
goodsSkuService.updateGoodsSkuStatus(goods);
}
if (GoodsStatusEnum.DOWN.equals(goodsStatusEnum)) {
this.deleteEsGoods(goodsIds);
}
this.updateGoodsStatus(goodsIds, goodsStatusEnum, goodsList);
return result;
}
@ -362,15 +356,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
LambdaQueryWrapper<Goods> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Goods::getId, goodsIds);
List<Goods> goodsList = this.list(queryWrapper);
for (Goods goods : goodsList) {
if (GoodsStatusEnum.DOWN.equals(goodsStatusEnum)) {
cache.remove(CachePrefix.GOODS.getPrefix() + goods.getId());
}
goodsSkuService.updateGoodsSkuStatus(goods);
}
if (GoodsStatusEnum.DOWN.equals(goodsStatusEnum)) {
this.deleteEsGoods(goodsIds);
}
this.updateGoodsStatus(goodsIds, goodsStatusEnum, goodsList);
return result;
}
@ -391,6 +377,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
for (Goods goods : goodsList) {
//修改SKU状态
goodsSkuService.updateGoodsSkuStatus(goods);
cache.remove(CachePrefix.GOODS.getPrefix() + goods.getId());
}
this.deleteEsGoods(goodsIds);
@ -479,6 +466,26 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
}
/**
* 更新商品状态
*
* @param goodsIds 商品ID
* @param goodsStatusEnum 商品状态
* @param goodsList 商品列表
*/
private void updateGoodsStatus(List<String> goodsIds, GoodsStatusEnum goodsStatusEnum, List<Goods> goodsList) {
for (Goods goods : goodsList) {
if (GoodsStatusEnum.DOWN.equals(goodsStatusEnum)) {
cache.remove(CachePrefix.GOODS.getPrefix() + goods.getId());
}
goodsSkuService.updateGoodsSkuStatus(goods);
}
if (GoodsStatusEnum.DOWN.equals(goodsStatusEnum)) {
this.deleteEsGoods(goodsIds);
}
}
/**
* 发送删除es索引的信息
*

2
framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
View File

@ -542,7 +542,7 @@ public class CartServiceImpl implements CartService {
}
//构建交易
Trade trade = tradeBuilder.createTrade(tradeDTO);
this.cleanChecked(tradeDTO);
this.cleanChecked(this.readDTO(cartTypeEnum));
return trade;
}