|
|
|
@@ -49,12 +49,14 @@ public class WxRentContractExtensionController extends BaseController { |
|
|
|
|
|
|
|
@GetMapping("searchMerchant") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "merchantName", value = "商户名称", dataType = "string", paramType = "query", required = true)}) |
|
|
|
@ApiImplicitParam(name = "merchantName", value = "商户名称", dataType = "string", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) |
|
|
|
@SystemControllerLog(description = "商户搜索") |
|
|
|
public ResultData searchMerchant(String merchantName) throws Exception{ |
|
|
|
public ResultData searchMerchant(String merchantName,Integer shopType) throws Exception{ |
|
|
|
WxRentContract wxRentContract = new WxRentContract(); |
|
|
|
wxRentContract.updateTenantInfo(getTenantInfo()); |
|
|
|
wxRentContract.setMerchantName(merchantName); |
|
|
|
wxRentContract.setRentShopType(shopType); |
|
|
|
List<Map<String,Object>> result = wxRentContractService.searchMerchantByname(wxRentContract); |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|