From 82c08ddcc6a00003a1f766961afc6ae1533d09fd Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Thu, 6 May 2021 19:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=86=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/rest/StoreBargainController.java |  4 +-
 .../main/java/co/yixiang/api/ApiResult.java   | 47 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java
index a51ea314..9bf1cf1d 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java
@@ -54,6 +54,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -97,7 +98,8 @@ public class StoreBargainController {
     @ApiOperation(value = "砍价产品列表",notes = "砍价产品列表")
     public ApiResult<Object> getYxStoreBargainPageList(@RequestParam(value = "page",defaultValue = "1") int page,
                                                        @RequestParam(value = "limit",defaultValue = "10") int limit){
-        return ApiResult.ok(storeBargainService.getList(page, limit));
+
+        return ApiResult.resultPage(Collections.singletonList(storeBargainService.getList(page, limit)),limit);
     }
 
     /**
diff --git a/yshop-common/src/main/java/co/yixiang/api/ApiResult.java b/yshop-common/src/main/java/co/yixiang/api/ApiResult.java
index 6abf11e6..54bb6174 100644
--- a/yshop-common/src/main/java/co/yixiang/api/ApiResult.java
+++ b/yshop-common/src/main/java/co/yixiang/api/ApiResult.java
@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -177,6 +178,52 @@ public class ApiResult<T> implements Serializable {
         return result(ApiCode.FAIL,map);
     }
 
+    public static <T> ApiResult<T> resultPage(List<T> list, int limit){
+        int count = list.size() / limit;
+        if (list.size() == 0) {
+            return (ApiResult<T>) ApiResult.builder()
+                    .total(0)
+                    .totalPage(0)
+                    .status(200)
+                    .msg(null)
+                    .data(list)
+                    .success(true)
+                    .time(new Date())
+                    .build();
+        }
+        if (list.size() <= limit) {
+            return (ApiResult<T>) ApiResult.builder()
+                    .total(list.size())
+                    .totalPage(1)
+                    .status(200)
+                    .msg(null)
+                    .data(list)
+                    .success(true)
+                    .time(new Date())
+                    .build();
+        } else if (count % limit == 0) {
+            return (ApiResult<T>) ApiResult.builder()
+                    .total(list.size())
+                    .totalPage(count)
+                    .status(200)
+                    .msg(null)
+                    .data(list)
+                    .success(true)
+                    .time(new Date())
+                    .build();
+        } else {
+             return (ApiResult<T>) ApiResult.builder()
+                    .total(list.size())
+                    .totalPage(count+1)
+                    .status(200)
+                    .msg(null)
+                    .data(list)
+                    .success(true)
+                    .time(new Date())
+                    .build();
+        }
+    }
+
     public static ApiResult<Boolean> fail() {
         return fail(ApiCode.FAIL);
     }