From fe2716618a3cb36d03844cf66fa09cd7f3117212 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 29 Nov 2022 16:01:20 +0800 Subject: [PATCH] //app test --- .../controller/WxMerchantController.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 3ae93e76f..d28f550e8 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; @@ -48,6 +49,23 @@ 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)