diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java index b256ac08d..b425751e5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractExtensionController.java @@ -37,9 +37,12 @@ public class WxPropertyContractExtensionController extends BaseController { @GetMapping("getMerchantList") @SystemControllerLog(description = "获取可续签商户列表") - public ResultData getMerchantList() throws Exception{ + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) + public ResultData getMerchantList(Integer shopType) throws Exception{ WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.updateTenantInfo(getTenantInfo()); + wxPropertyContract.setRentShopType(shopType); return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getMerchantList(wxPropertyContract)); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java index f14e20a26..ece13f08c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java @@ -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> result = wxRentContractService.searchMerchantByname(wxRentContract); return new ResultData(result); } diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 8169dd543..96638fc7d 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -398,6 +398,6 @@ and `parent_tenant_id` = #{parentTenantId} ) pc) - and rent_shop_type = 1 + and rent_shop_type = #{shopType} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 5e77c1df8..877a45dc8 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -652,7 +652,7 @@