|
|
|
@@ -106,6 +106,23 @@ public class WxMerchantController extends BaseController { |
|
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("获取商管商户") |
|
|
|
@GetMapping("adminMerchantOne") |
|
|
|
@SystemControllerLog(description = "商户-列表") |
|
|
|
public ResultData adminMerchantOne() { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::adminMerchantOne"); |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
wxMerchant.setIsAdmin(EnumYesOrNo.YES.getCode()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
List<WxMerchant> list = wxMerchantService.findList(wxMerchant); |
|
|
|
if(list == null || list.isEmpty()){ |
|
|
|
return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到商管商户"); |
|
|
|
} |
|
|
|
return new ResultData(list.get(0)); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("获取商户ID,名称接口") |
|
|
|
@GetMapping("IdAndNamelist") |
|
|
|
|