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

平台建店list fix

Browse Source
This commit is contained in:
shuo.wang
2024-10-11 11:04:00 +08:00
parent 2aa3a7eb4c
commit 91d5605e1d
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java
View File

@@ -9,6 +9,7 @@ import com.cool.store.response.PlatformBuildResponse;
import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.PlatformBuildInfoVO;
import com.cool.store.vo.Preparation.PreparationScheduleDetailVO;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -33,6 +34,6 @@ public interface PlatformBuildService {
PlatformBuildInfoVO getPlatformBuildInfo(Long shopId);
List<PlatformBuildListResponse> platformBuildList(platformBuildListRequest request);
PageInfo<PlatformBuildListResponse> platformBuildList(platformBuildListRequest request);
}

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
View File

@@ -27,6 +27,7 @@ import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.PlatformBuildInfoVO;
import com.cool.store.vo.Preparation.PreparationScheduleDetailVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -218,11 +219,11 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
}
@Override
public List<PlatformBuildListResponse> platformBuildList(platformBuildListRequest request) {
public PageInfo<PlatformBuildListResponse> platformBuildList(platformBuildListRequest request) {
String userId = request.getOperateUserId();
List<String> regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId);
if (CollectionUtils.isEmpty(regionIds)) {
return Collections.emptyList();
return new PageInfo<>();
}
List<Long> regionIdList = new ArrayList<>();
for (String regionId : regionIds) {
@@ -230,6 +231,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
}
PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<PlatformBuildListResponse> responses = shopInfoDAO.platformBuildList(regionIdList, request);
PageInfo<PlatformBuildListResponse> pageInfo = new PageInfo<>(responses);
List<Long> shopIds = responses.stream().map(PlatformBuildListResponse::getShopId).collect(Collectors.toList());
List<Long> regionIds1 = responses.stream().map(PlatformBuildListResponse::getRegionId).collect(Collectors.toList());
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds1);
@@ -255,7 +257,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
}
}
}
return responses;
pageInfo.setList(responses);
return pageInfo;
}
@Override

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java
View File

@@ -13,6 +13,7 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.service.OperationLogService;
import com.cool.store.service.PlatformBuildService;
import com.cool.store.vo.PlatformBuildInfoVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
@@ -40,7 +41,7 @@ public class PCPlatformBuildController {
@ApiOperation("平台建店列表")
@PostMapping("/platformBuildList")
public ResponseResult<List<PlatformBuildListResponse> > platformBuildList(@RequestBody platformBuildListRequest request) {
public ResponseResult<PageInfo<PlatformBuildListResponse>> platformBuildList(@RequestBody platformBuildListRequest request) {
request.setOperateUserId(CurrentUserHolder.getUserId());
return ResponseResult.success(platformBuildService.platformBuildList(request));
}