diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java index e90571213..555d3d435 100644 --- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java @@ -292,6 +292,9 @@ public class GoodsMessageListener implements RocketMQListener { searchParams.setCategoryPath(promotions.getScopeId()); searchParams.setPageNumber(i); searchParams.setPageSize(BATCH_SIZE); + if (CharSequenceUtil.isNotEmpty(promotions.getStoreId()) && !"0".equals(promotions.getStoreId())){ + searchParams.setStoreId(promotions.getStoreId()); + } IPage goodsSkuByPage = this.goodsSkuService.getGoodsSkuByPage(searchParams); if (goodsSkuByPage == null || goodsSkuByPage.getRecords().isEmpty()) { break; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java index b49b6be03..385cb38e0 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java @@ -231,11 +231,20 @@ public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl couponActivityItemVOS = new ArrayList<>(); //准备发放优惠券活动的列表 - couponActivities.stream().forEach(item -> couponActivityItemVOS.addAll(item.getCouponActivityItems())); + couponActivities.forEach(item -> couponActivityItemVOS.addAll(item.getCouponActivityItems())); AuthUser authUser = new AuthUser(); authUser.setId(couponActivityTrigger.getUserId());