From a8f240400e1a632d67b7004b9f32e34609f42f60 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 10 May 2019 15:13:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=BE=85=E7=BC=B4=E5=95=86?= =?UTF-8?q?=E6=88=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxCouponController.java | 7 +++++-- .../java/com/iformall/controller/WxCouponController.java | 9 +++++++-- .../main/java/com/iformall/service/WxCouponService.java | 2 +- .../com/iformall/service/impl/WxCouponServiceImpl.java | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 708cc5c39..837f566e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -182,8 +182,11 @@ public class WxCouponController extends BaseController { @ApiOperation("商户活动列表信息") @GetMapping("findByMerchant") - public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) { - return new ResultData(wxCouponService.findByMerchant(wxCoupon)); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + return new ResultData(wxCouponService.findByMerchant(wxCoupon,pageNum,pageSize)); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 7dad77ab5..c67387398 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -80,10 +80,15 @@ public class WxCouponController extends BaseController { return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } + @ApiOperation("商户活动列表信息") @GetMapping("findByMerchant") - public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) { - return new ResultData(wxCouponService.findByMerchant(wxCoupon)); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + return new ResultData(wxCouponService.findByMerchant(wxCoupon,pageNum,pageSize)); } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 21728264a..d7ea01dd4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -204,5 +204,5 @@ public interface WxCouponService { * @param wxCoupon * @return */ - List findByMerchant(WxCoupon wxCoupon); + PageInfo findByMerchant(WxCoupon wxCoupon,Integer pageNum, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 3120601e3..fbe7053e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -538,7 +538,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public List findByMerchant(WxCoupon wxCoupon) { - return wxCouponMapper.findByMerchant(wxCoupon); + public PageInfo findByMerchant(WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findByMerchant(wxCoupon)); } }