cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

拼团列表添加分页

Browse Source
This commit is contained in:
xuwenbo
2020-09-13 20:31:44 +08:00
parent c26eea118a
commit 0d5c1b1963
6 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java
View File

@ -20,6 +20,7 @@ import co.yixiang.modules.activity.param.PinkCancelParam;
import co.yixiang.modules.activity.param.PinkShareParam;
import co.yixiang.modules.activity.service.YxStoreCombinationService;
import co.yixiang.modules.activity.service.YxStorePinkService;
import co.yixiang.modules.activity.vo.CombinationQueryVo;
import co.yixiang.modules.activity.vo.PinkInfoVo;
import co.yixiang.modules.activity.vo.StoreCombinationVo;
import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo;
@ -80,8 +81,8 @@ public class StoreCombinationController {
@ApiImplicitParam(name = "limit", value = "页大小,默认为10", paramType = "query", dataType = "int")
})
@ApiOperation(value = "拼团产品列表",notes = "拼团产品列表")
public ApiResult<List<YxStoreCombinationQueryVo>> getList(@RequestParam(value = "page",defaultValue = "1") int page,
@RequestParam(value = "limit",defaultValue = "10") int limit){
public ApiResult<CombinationQueryVo> getList(@RequestParam(value = "page",defaultValue = "1") int page,
@RequestParam(value = "limit",defaultValue = "10") int limit){
return ApiResult.ok(storeCombinationService.getList(page, limit));
}

4
yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java
View File

@ -71,9 +71,9 @@ public class IndexController {
.banner(systemGroupDataService.getDatas(ShopConstants.YSHOP_HOME_BANNER))
.bastList(storeProductService.getList(1,6, ProductEnum.TYPE_1.getValue()))
.benefit(storeProductService.getList(1,10,ProductEnum.TYPE_4.getValue()))
.combinationList(storeCombinationService.getList(1,4))
.combinationList(storeCombinationService.getList(1,8).getStoreCombinationQueryVos())
.firstList(storeProductService.getList(1,6,ProductEnum.TYPE_3.getValue()))
.likeInfo(storeProductService.getList(1,4,ProductEnum.TYPE_2.getValue()))
.likeInfo(storeProductService.getList(1,8,ProductEnum.TYPE_2.getValue()))
.mapKey(RedisUtil.get(ShopKeyUtils.getTengXunMapKey()))
.menus(systemGroupDataService.getDatas(ShopConstants.YSHOP_HOME_MENUS))
.roll(systemGroupDataService.getDatas(ShopConstants.YSHOP_HOME_ROLL_NEWS))