|
|
|
@@ -131,12 +131,16 @@ public class WxMerchantController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation("子商户列表查询") |
|
|
|
@GetMapping("/subMerchantList") |
|
|
|
@ApiImplicitParam(name = "subName", value = "subName", dataType = "Long", paramType = "query", required = true) |
|
|
|
@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 subMerchantList(String subName) { |
|
|
|
public ResultData subMerchantList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList"); |
|
|
|
List<WxMerchant> merchants = wxMerchantService.subMerchantList(subName); |
|
|
|
return new ResultData(merchants); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
PageInfo<WxMerchant> pageInfo = wxMerchantService.subMerchantList(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(pageInfo); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("分页列表接口") |
|
|
|
|