diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 6b893819c..83ab25855 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -58,6 +58,23 @@ public class WxMerchantController extends BaseController { } + @UserDataRuleAnnotation("merchant_list") + @ApiOperation("分页列表接口") + @GetMapping("listVo2") + @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 listVo2(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + final PageInfo page = wxMerchantService.listVoAsPage2(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 24f92f6f3..9abd85f68 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -34,4 +34,6 @@ public interface WxMerchantMapper extends CommonMapper { List userTradeDetailList(WxMerchant wxMerchant); WxMerchant findByTrade(HashMap params); + + List findListVo2(WxMerchant record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 15baea659..c2eb0bb85 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -143,4 +143,6 @@ public interface WxMerchantService { List findMerchantVoList(Map paramMap); + PageInfo listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 6db5a2720..2cac7183e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -795,4 +795,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { public List findMerchantVoList(Map paramMap) { return wxCouponMerchantMapper.findMerchantVoList(paramMap); } + + @Override + public PageInfo listVoAsPage2(WxMerchant record, Integer pageIndex, Integer pageSize) { + PageHelper.startPage(pageIndex, pageSize); + List merchants = wxMerchantMapper.findListVo2(record); + PageInfo pageInfo = new PageInfo<>(merchants); + return pageInfo; + } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0ac6e6dca..ff153e1cf 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -193,6 +193,29 @@ + +