diy查询接口逻辑修改
This commit is contained in:
parent
ede9a26810
commit
cb96775ee6
@ -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.modules.store.ShopStoreInfo;
|
||||||
import com.suisung.mall.common.utils.CheckUtil;
|
import com.suisung.mall.common.utils.CheckUtil;
|
||||||
import com.suisung.mall.common.utils.I18nUtil;
|
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.core.web.service.impl.BaseServiceImpl;
|
||||||
import com.suisung.mall.shop.base.service.AccountBaseConfigService;
|
import com.suisung.mall.shop.base.service.AccountBaseConfigService;
|
||||||
import com.suisung.mall.shop.base.service.ShopBaseCurrencyService;
|
import com.suisung.mall.shop.base.service.ShopBaseCurrencyService;
|
||||||
@ -1091,6 +1092,10 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
|
|||||||
params.put("product_name", getParameter("name"));
|
params.put("product_name", getParameter("name"));
|
||||||
|
|
||||||
QueryWrapper<ShopStoreActivityBase> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<ShopStoreActivityBase> 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);
|
queryWrapper.in("activity_state", StateCode.ACTIVITY_STATE_WAITING, StateCode.ACTIVITY_STATE_NORMAL);
|
||||||
|
|
||||||
// 拼团
|
// 拼团
|
||||||
@ -1128,6 +1133,11 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
|
|||||||
rows = getParameter("rows", 12);
|
rows = getParameter("rows", 12);
|
||||||
|
|
||||||
QueryWrapper<ShopStoreActivityItem> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<ShopStoreActivityItem> 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)
|
queryWrapper.in("activity_item_state", StateCode.ACTIVITY_STATE_NORMAL, StateCode.ACTIVITY_STATE_WAITING)
|
||||||
.eq("activity_type_id", StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT);
|
.eq("activity_type_id", StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT);
|
||||||
|
|
||||||
@ -1180,6 +1190,10 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
|
|||||||
rows = getParameter("rows", 6);
|
rows = getParameter("rows", 6);
|
||||||
|
|
||||||
QueryWrapper<ShopStoreActivityBase> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<ShopStoreActivityBase> 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)
|
queryWrapper.eq("activity_state", StateCode.ACTIVITY_STATE_NORMAL)
|
||||||
.eq("activity_type_id", StateCode.ACTIVITY_TYPE_VOUCHER);
|
.eq("activity_type_id", StateCode.ACTIVITY_TYPE_VOUCHER);
|
||||||
Page<ShopStoreActivityBase> basePage = shopStoreActivityBaseService.lists(queryWrapper, page, rows);
|
Page<ShopStoreActivityBase> basePage = shopStoreActivityBaseService.lists(queryWrapper, page, rows);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user