diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageBaseServiceImpl.java index 431ab06a..3b99f6ff 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageBaseServiceImpl.java @@ -34,6 +34,7 @@ import com.suisung.mall.common.modules.store.ShopStoreActivityItem; import com.suisung.mall.common.modules.store.ShopStoreInfo; import com.suisung.mall.common.utils.CheckUtil; import com.suisung.mall.common.utils.I18nUtil; +import com.suisung.mall.common.utils.StringUtils; import com.suisung.mall.core.web.service.impl.BaseServiceImpl; import com.suisung.mall.shop.base.service.AccountBaseConfigService; import com.suisung.mall.shop.base.service.ShopBaseCurrencyService; @@ -1091,6 +1092,10 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + String store_id=getParameter("store_id"); + if(StringUtils.isNotEmpty(store_id)){ + queryWrapper.eq("store_id", Integer.valueOf(store_id)); + } queryWrapper.in("activity_state", StateCode.ACTIVITY_STATE_WAITING, StateCode.ACTIVITY_STATE_NORMAL); // 拼团 @@ -1128,6 +1133,11 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + String store_id=getParameter("store_id"); + if(StringUtils.isNotEmpty(store_id)){ + queryWrapper.eq("store_id", Integer.valueOf(store_id)); + } + queryWrapper.in("activity_item_state", StateCode.ACTIVITY_STATE_NORMAL, StateCode.ACTIVITY_STATE_WAITING) .eq("activity_type_id", StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT); @@ -1180,6 +1190,10 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + String store_id=getParameter("store_id"); + if(StringUtils.isNotEmpty(store_id)){ + queryWrapper.eq("store_id", Integer.valueOf(store_id)); + } queryWrapper.eq("activity_state", StateCode.ACTIVITY_STATE_NORMAL) .eq("activity_type_id", StateCode.ACTIVITY_TYPE_VOUCHER); Page basePage = shopStoreActivityBaseService.lists(queryWrapper, page, rows);