From 91d5605e1da1f51eee7ec0b2ce6278fdd4b83606 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Oct 2024 11:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=BB=BA=E5=BA=97list=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/PlatformBuildService.java | 3 ++- .../store/service/impl/PlatformBuildServiceImpl.java | 9 ++++++--- .../store/controller/webb/PCPlatformBuildController.java | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java index bc7eee518..ba8af6d4c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java @@ -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 platformBuildList(platformBuildListRequest request); + PageInfo platformBuildList(platformBuildListRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index c305e1349..88a40f472 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -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 platformBuildList(platformBuildListRequest request) { + public PageInfo platformBuildList(platformBuildListRequest request) { String userId = request.getOperateUserId(); List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId); if (CollectionUtils.isEmpty(regionIds)) { - return Collections.emptyList(); + return new PageInfo<>(); } List regionIdList = new ArrayList<>(); for (String regionId : regionIds) { @@ -230,6 +231,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } PageHelper.startPage(request.getPageNum(), request.getPageSize()); List responses = shopInfoDAO.platformBuildList(regionIdList, request); + PageInfo pageInfo = new PageInfo<>(responses); List shopIds = responses.stream().map(PlatformBuildListResponse::getShopId).collect(Collectors.toList()); List regionIds1 = responses.stream().map(PlatformBuildListResponse::getRegionId).collect(Collectors.toList()); Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds1); @@ -255,7 +257,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } } } - return responses; + pageInfo.setList(responses); + return pageInfo; } @Override diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java index 10cc346fb..d4731b0db 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java @@ -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 > platformBuildList(@RequestBody platformBuildListRequest request) { + public ResponseResult> platformBuildList(@RequestBody platformBuildListRequest request) { request.setOperateUserId(CurrentUserHolder.getUserId()); return ResponseResult.success(platformBuildService.platformBuildList(request)); }