diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index e583d4962..6cd8b5cbf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -131,10 +131,11 @@ public class WxMerchantController extends BaseController { @ApiOperation("子商户列表查询") @GetMapping("/subMerchantList") + @ApiImplicitParam(name = "subName", value = "subName", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "子商户列表查询") - public ResultData subMerchantList() { + public ResultData subMerchantList(String subName) { logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList"); - List merchants = wxMerchantService.subMerchantList(); + List merchants = wxMerchantService.subMerchantList(subName); return new ResultData(merchants); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index e74f0fdc7..1b14de1ae 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -4,9 +4,6 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.WxMerchantTradeDetailVo; -import com.iformall.domain.vo.WxMerchantTradeVo; -import com.iformall.domain.vo.WxMerchantVo; import org.apache.ibatis.annotations.Param; import java.util.HashMap; @@ -61,5 +58,5 @@ public interface WxMerchantMapper extends CommonMapper { List getMerchantListByIds(@Param("relationIds") List relationIds); - List getSubMerchantListByIds(@Param("merchantIds") List merchantIds); + List getSubMerchantListByIds(@Param("merchantIds") List merchantIds,@Param("subName") String subName); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 70b2a5613..aeddceb80 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -218,6 +218,6 @@ public interface WxMerchantService { List relationList(Long regionId); - List subMerchantList(); + List subMerchantList(String subName); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index e4ba1a36e..bdf1f2c69 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2076,9 +2076,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { * 查询剩余子商户 */ @Override - public List subMerchantList() { + public List subMerchantList(String subName) { //查询已经被选择了的子商户 List merchantIds = wxMerchantRelationService.getRelationByRegionId(null); - return wxMerchantMapper.getSubMerchantListByIds(merchantIds); + return wxMerchantMapper.getSubMerchantListByIds(merchantIds,subName); } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 36c9a6843..9448c93cf 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -472,6 +472,9 @@ #{idItem} + + and name like concat('%',#{subName},'%') +