|
|
|
@@ -248,13 +248,10 @@ public class WxMerchantController extends BaseController { |
|
|
|
@ApiOperation("获取商户ID,名称接口") |
|
|
|
@GetMapping("IdAndNamelist") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true) |
|
|
|
}) |
|
|
|
public ResultData IdAndNamelist(Integer type,Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
public ResultData IdAndNamelist(@ModelAttribute WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
@@ -267,6 +264,9 @@ public class WxMerchantController extends BaseController { |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
if (null == wxMerchant.getIsPrivate()) { |
|
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
|
} |
|
|
|
return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); |
|
|
|
} |
|
|
|
|
|
|
|
|