From c1f26a22685a07d39f8e3eae9b853896a0ac7f4b Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Sun, 2 Jul 2023 10:37:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxMerchantController.java | 5 +++-- .../src/main/java/com/iformall/mapper/WxMerchantMapper.java | 5 +---- .../main/java/com/iformall/service/WxMerchantService.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxMerchantMapper.xml | 3 +++ 5 files changed, 10 insertions(+), 9 deletions(-) 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},'%') +