| @@ -37,9 +37,12 @@ public class WxPropertyContractExtensionController extends BaseController { | |||||
| @GetMapping("getMerchantList") | @GetMapping("getMerchantList") | ||||
| @SystemControllerLog(description = "获取可续签商户列表") | @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 wxPropertyContract = new WxPropertyContract(); | ||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | wxPropertyContract.updateTenantInfo(getTenantInfo()); | ||||
| wxPropertyContract.setRentShopType(shopType); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getMerchantList(wxPropertyContract)); | return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getMerchantList(wxPropertyContract)); | ||||
| } | } | ||||
| } | } | ||||
| @@ -49,12 +49,14 @@ public class WxRentContractExtensionController extends BaseController { | |||||
| @GetMapping("searchMerchant") | @GetMapping("searchMerchant") | ||||
| @ApiImplicitParams({ | @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 = "商户搜索") | @SystemControllerLog(description = "商户搜索") | ||||
| public ResultData searchMerchant(String merchantName) throws Exception{ | |||||
| public ResultData searchMerchant(String merchantName,Integer shopType) throws Exception{ | |||||
| WxRentContract wxRentContract = new WxRentContract(); | WxRentContract wxRentContract = new WxRentContract(); | ||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | wxRentContract.updateTenantInfo(getTenantInfo()); | ||||
| wxRentContract.setMerchantName(merchantName); | wxRentContract.setMerchantName(merchantName); | ||||
| wxRentContract.setRentShopType(shopType); | |||||
| List<Map<String,Object>> result = wxRentContractService.searchMerchantByname(wxRentContract); | List<Map<String,Object>> result = wxRentContractService.searchMerchantByname(wxRentContract); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -398,6 +398,6 @@ | |||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| ) pc) | ) pc) | ||||
| and rent_shop_type = 1 | |||||
| and rent_shop_type = #{shopType} | |||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||
| @@ -652,7 +652,7 @@ | |||||
| </select> | </select> | ||||
| <select id="searchMerchantByname" resultType="hashmap" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="searchMerchantByname" resultType="hashmap" parameterType="com.iformall.domain.po.WxRentContract"> | ||||
| select merchant_id,merchant_name from wx_rent_contract where tenant_id = #{tenantId} and merchant_name like concat('%',#{merchantName},'%') and rent_shop_type = 1 ORDER BY merchant_name | |||||
| select merchant_id,merchant_name from wx_rent_contract where tenant_id = #{tenantId} and merchant_name like concat('%',#{merchantName},'%') and rent_shop_type = #{shopType} ORDER BY merchant_name | |||||
| </select> | </select> | ||||
| <select id="getByMerchantId" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="getByMerchantId" resultType="com.iformall.domain.po.WxRentContract" parameterType="com.iformall.domain.po.WxRentContract"> | ||||