Commit adb5fd8a authored by renjie's avatar renjie

shop接口修改

parent 45d74932
...@@ -13,7 +13,7 @@ public class IpResource { ...@@ -13,7 +13,7 @@ public class IpResource {
@Id @Id
private String id; private String id;
private String addr; private String addr;
private IpType ipType; private IpType ipType = IpType.VENDOR;
private String ipProvider; private String ipProvider;
private String ipRegion; private String ipRegion;
private IpStatus ipStatus; private IpStatus ipStatus;
......
...@@ -319,7 +319,7 @@ public class ShopServiceImpl implements ShopService { ...@@ -319,7 +319,7 @@ public class ShopServiceImpl implements ShopService {
ShopPageResultDto shopPageResultDto = new ShopPageResultDto(); ShopPageResultDto shopPageResultDto = new ShopPageResultDto();
shopPageResultDto.setShopList(shopDtoPage.getContent()); shopPageResultDto.setShopList(shopDtoPage.getContent());
ShopPageInfo shopPageInfo = new ShopPageInfo(); ShopPageInfo shopPageInfo = new ShopPageInfo();
shopPageInfo.setCurrentPage(shopDtoPage.getPageable().getPageNumber() + 1); shopPageInfo.setCurrentPage(shopDtoPage.getPageable().getPageNumber());
shopPageInfo.setTotalPages(shopDtoPage.getTotalPages()); shopPageInfo.setTotalPages(shopDtoPage.getTotalPages());
shopPageInfo.setTotalShops(shopDtos.size()); shopPageInfo.setTotalShops(shopDtos.size());
shopPageResultDto.setShopPage(shopPageInfo); shopPageResultDto.setShopPage(shopPageInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment