Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

This commit is contained in:
Chopper 2021-08-19 17:38:48 +08:00
commit 790dc53ad3

View File

@ -177,7 +177,10 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
seckillApply.setOriginalPrice(goodsSku.getPrice()); seckillApply.setOriginalPrice(goodsSku.getPrice());
seckillApply.setPromotionApplyStatus(PromotionApplyStatusEnum.PASS.name()); seckillApply.setPromotionApplyStatus(PromotionApplyStatusEnum.PASS.name());
seckillApply.setSalesNum(0); seckillApply.setSalesNum(0);
//过滤掉已经新增过的秒杀商品
if (seckillApply.getId() == null) {
originList.add(seckillApply); originList.add(seckillApply);
}
//获取促销商品 //获取促销商品
PromotionGoods promotionGoods = this.setSeckillGoods(goodsSku, seckillApply, seckill); PromotionGoods promotionGoods = this.setSeckillGoods(goodsSku, seckillApply, seckill);
promotionGoodsList.add(promotionGoods); promotionGoodsList.add(promotionGoods);