diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 2ddf93b91..fa2f3bbaf 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -47,6 +47,21 @@ public class WxMerchantController extends BaseController { return new ResultData(page); } + @ApiOperation("商户会员消费分页列表接口") + @GetMapping("userTradeList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "商户-消费列表") + public ResultData userTradeList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("分页列表接口") @GetMapping("listVo") @ApiImplicitParams({