shop接口修改

src/main/java/com/edgec/browserbackend/browser/dto/ShopPageInfo.java

@@ -3,7 +3,7 @@ package com.edgec.browserbackend.browser.dto;
 public class ShopPageInfo {
     int currentPage;
     int totalPage;
-    int totalShops;
+    long totalShops;
 
     public int getCurrentPage() {
         return currentPage;
@@ -21,11 +21,11 @@ public class ShopPageInfo {
         this.totalPage = totalPage;
     }
 
-    public int getTotalShops() {
+    public long getTotalShops() {
         return totalShops;
     }
 
-    public void setTotalShops(int totalShops) {
+    public void setTotalShops(long totalShops) {
         this.totalShops = totalShops;
     }
 }

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -312,13 +312,14 @@ public class ShopServiceImpl implements ShopService {
             String group1 = userShopRepository.findByUsernameAndShopId(username, x.getShopId()).getGroupId();
             shopDtos.add(ShopDto.of(x, group1, ipResource));
         });
+        logger.error(shopDtos.size() + "!!");
         Page<ShopDto> shopDtoPage = new PageImpl<>(shopDtos, pageable, shopDtos.size());
         ShopPageResultDto shopPageResultDto = new ShopPageResultDto();
         shopPageResultDto.setShopList(shopDtoPage.getContent());
         ShopPageInfo shopPageInfo = new ShopPageInfo();
-        shopPageInfo.setCurrentPage(shopDtoPage.getPageable().getPageNumber());
+        shopPageInfo.setCurrentPage(shopDtoPage.getPageable().getPageNumber() + 1);
         shopPageInfo.setTotalPage(shopDtoPage.getTotalPages());
-        shopPageInfo.setTotalShops(shopDtos.size());
+        shopPageInfo.setTotalShops(shopDtoPage.getTotalElements());
         shopPageResultDto.setShopPage(shopPageInfo);
         return shopPageResultDto;
     }