suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

成功开店代码改造

Browse Source
This commit is contained in:
shuo.wang
2025-07-03 11:33:26 +08:00
parent fe0c4e2ef7
commit 55abe7db99
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
View File

@@ -64,11 +64,11 @@ public class StoreDao {
return storeMapper.listByMobile(mobile);
}
public List<MiniShopsResponse> getSubStoreByRegionIdsAndMobile(List<String> regionIdList, String mobile,String storeName) {
public List<MiniShopsResponse> getSubStoreByRegionIdsAndMobile(List<String> regionIdList, String mobile,String storeName,String storeNum) {
if(CollectionUtils.isEmpty(regionIdList)&&StringUtils.isBlank(mobile)) {
return new ArrayList<>();
}
return storeMapper.getSubStoreByRegionIdsAndMobile(regionIdList,mobile,storeName);
return storeMapper.getSubStoreByRegionIdsAndMobile(regionIdList,mobile,storeName,storeNum);
}

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
View File

@@ -32,7 +32,8 @@ public interface StoreMapper {
*/
List<StoreDO> listByMobile(@Param("mobile") String mobile);
List<MiniShopsResponse> getSubStoreByRegionIdsAndMobile(@Param("regionIdList") List<String> regionIdList, @Param("mobile") String mobile,@Param("storeName") String storeName);
List<MiniShopsResponse> getSubStoreByRegionIdsAndMobile(@Param("regionIdList") List<String> regionIdList, @Param("mobile") String mobile,
@Param("storeName") String storeName, @Param("storeNum") String storeNum);
/**
* 分页查询门店数据
* @return

3
coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
View File

@@ -97,6 +97,9 @@
<if test="storeName!=null and storeName!=''">
and store_name like concat('%', #{storeName}, '%')
</if>
<if test="storeNum!=null and storeNum!=''">
and store_num = #{storeNum}
</if>
and (
<if test="regionIdList != null and regionIdList.size >0 ">
<foreach collection="regionIdList" item="regionId" separator=" or " open=" (" close=" )">

4
coolstore-partner-model/src/main/java/com/cool/store/request/ShopListSuccessOpenRequest.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
@@ -18,5 +20,7 @@ public class ShopListSuccessOpenRequest {
private Integer pageNum = 1;
private Integer pageSize = 10;
private String storeName;
@ApiModelProperty("门店编号")
private String storeNum;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java
View File

@@ -23,6 +23,6 @@ public interface StoreService {
*/
PageInfo<StoreDTO> getStoreExtendFieldInfo(Integer pageSize,Integer pageNum);
PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName);
PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum);
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -606,7 +606,7 @@ public class ShopServiceImpl implements ShopService {
Integer pageSize = request.getPageSize();
String storeName = request.getStoreName();
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId);
PageInfo<MiniShopsResponse> storeListByMobile = storeService.getStoreListByMobile(lineInfoDO.getMobile(), pageNum, pageSize, storeName);
PageInfo<MiniShopsResponse> storeListByMobile = storeService.getStoreListByMobile(lineInfoDO.getMobile(), pageNum, pageSize, storeName,request.getStoreNum());
if (CollectionUtils.isEmpty(storeListByMobile.getList())) {
return new PageInfo<>();
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
View File

@@ -69,7 +69,7 @@ public class StoreServiceImpl implements StoreService {
}
@Override
public PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName) {
public PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum) {
//根据手机号查询 标品userId
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
if (enterpriseUserDO == null){
@@ -89,7 +89,7 @@ public class StoreServiceImpl implements StoreService {
}
}
PageHelper.startPage(pageNum,pageSize);
List<MiniShopsResponse> list = storeDao.getSubStoreByRegionIdsAndMobile(regionIds,mobile,storeName);
List<MiniShopsResponse> list = storeDao.getSubStoreByRegionIdsAndMobile(regionIds,mobile,storeName,storeNum);
return new PageInfo<>(list);
}