From 1c60a046df1cc379364926616756eb227f8ea468 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 29 Nov 2022 16:33:14 +0800 Subject: [PATCH] //app test --- .../basic/WxMerchantController.java | 20 +++++++++++++++++++ .../controller/WxMerchantController.java | 17 ---------------- 2 files changed, 20 insertions(+), 17 deletions(-) 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 c19975d8d..c9eced3e8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -107,6 +107,26 @@ public class WxMerchantController extends BaseController { return new ResultData(page); } + @TenantIgnore + @ApiOperation("分页列表接口") + @GetMapping("parentList") + @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 parentList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::parentList"); + if (null == wxMerchant) wxMerchant = new WxMerchant(); + String tenantId = getUser().getTenantId(); +// wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setParentTenantId(tenantId); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("获取商管商户") @GetMapping("adminMerchantOne") @SystemControllerLog(description = "商户-列表") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index d28f550e8..e7f84647b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -49,23 +49,6 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize,true)); } - @TenantIgnore - @ApiOperation("分页列表接口") - @GetMapping("parentList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData parentList(@ModelAttribute WxMerchantDto wxMerchantDto, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); - if (null == wxMerchantDto) wxMerchantDto = new WxMerchantDto(); -// wxMerchantDto.updateTenantInfo(getTenantInfo()); - wxMerchantDto.setParentTenantId(getTenantInfo().getTenantId()); - wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); - wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); - wxMerchantDto.setIsPrivate(EnumYesOrNo.NO.getCode()); - return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize,true)); - } - @ApiOperation("查询资质信息") @GetMapping("/findCorp") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)