diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java index 44b88d8b1..6eec04f30 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java @@ -64,11 +64,11 @@ public class StoreDao { return storeMapper.listByMobile(mobile); } - public List getSubStoreByRegionIdsAndMobile(List regionIdList, String mobile) { + public List getSubStoreByRegionIdsAndMobile(List regionIdList, String mobile,String storeName) { if(CollectionUtils.isEmpty(regionIdList)&&StringUtils.isBlank(mobile)) { return new ArrayList<>(); } - return storeMapper.getSubStoreByRegionIdsAndMobile(regionIdList,mobile); + return storeMapper.getSubStoreByRegionIdsAndMobile(regionIdList,mobile,storeName); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java index 81aa8f2ed..d9249e9c5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java @@ -32,7 +32,7 @@ public interface StoreMapper { */ List listByMobile(@Param("mobile") String mobile); - List getSubStoreByRegionIdsAndMobile(@Param("regionIdList") List regionIdList, @Param("mobile") String mobile); + List getSubStoreByRegionIdsAndMobile(@Param("regionIdList") List regionIdList, @Param("mobile") String mobile,@Param("storeName") String storeName); /** * 分页查询门店数据 * @return diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml index 91515f4e1..7625497ef 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml @@ -94,6 +94,9 @@ select store_id as storeId, store_name as shopName, store_num as shopCode, store_address as detailAddress from store_${enterpriseId} where is_delete = 'effective' + + and store_name like concat('%', #{storeName}, '%') + and ( diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index 35f8b0c7d..b4c2aa031 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -89,7 +89,7 @@ public class StoreServiceImpl implements StoreService { } } PageHelper.startPage(pageNum,pageSize); - List list = storeDao.getSubStoreByRegionIdsAndMobile(regionIds,mobile); + List list = storeDao.getSubStoreByRegionIdsAndMobile(regionIds,mobile,storeName); return new PageInfo<>(list); }