|
|
|
@@ -3,6 +3,7 @@ package com.iformall.controller; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.dto.WxMerchantDto; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.vo.WxMerchantVo; |
|
|
|
import com.iformall.enums.EnumMerchantPublic; |
|
|
|
@@ -36,12 +37,12 @@ public class WxMerchantController extends BaseController { |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData list(@ModelAttribute WxMerchantVo wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
public ResultData list(@ModelAttribute WxMerchantDto wxMerchantDto, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchantVo(); |
|
|
|
wxMerchant.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
wxMerchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); |
|
|
|
return new ResultData(wxMerchantService.listAsPageCVo(wxMerchant, pageNum, pageSize)); |
|
|
|
if (null == wxMerchantDto) wxMerchantDto = new WxMerchantDto(); |
|
|
|
wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); |
|
|
|
return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize)); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("根据code查询接口") |
|
|
|
|