From 18d746602e50039f08a77047360ec7e71b64345a Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 2 Jun 2021 09:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9Epc=E9=9C=80=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/rest/UserBillController.java |  6 +++++-
 .../user/service/YxUserBillService.java       |  5 +++--
 .../service/impl/YxUserBillServiceImpl.java   | 19 ++++++++++---------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java
index 054b7f25..78f40dca 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java
@@ -183,7 +183,11 @@ public class UserBillController {
             newType = Integer.valueOf(type);
         }
         Long uid = LocalUser.getUser().getUid();
-        return ApiResult.resultPage(Collections.singletonList(userBillService.getUserBillList(page,limit,uid,newType)),limit);
+        Map<String, Object> map = userBillService.getUserBillList(page,limit,uid,newType);
+        Long total = (Long)map.get("total");
+        Long totalPage = (Long)map.get("totalPage");
+        return ApiResult.resultPage(total.intValue(),totalPage.intValue(),map.get("list"));
+      //  return ApiResult.resultPage(Collections.singletonList(userBillService.getUserBillList(page,limit,uid,newType)),limit);
     }
 
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java
index b50cfeb9..2ee25c3d 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java
@@ -70,9 +70,10 @@ public interface YxUserBillService  extends BaseService<YxUserBill>{
      * @param limit limit
      * @param uid uid
      * @param type BillDetailEnum
-     * @return list
+     * @return map
      */
-    List<BillVo> getUserBillList(int page, int limit, long uid, int type);
+    Map<String,Object> getUserBillList(int page, int limit, long uid, int type);
+
 
     double getBrokerage(int uid);
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
index ff67b441..8fdf8677 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java
@@ -40,11 +40,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -174,10 +171,10 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUse
      * @param limit limit
      * @param uid uid
      * @param type BillDetailEnum
-     * @return list
+     * @return map
      */
     @Override
-    public List<BillVo> getUserBillList(int page, int limit, long uid, int type) {
+    public Map<String,Object> getUserBillList(int page, int limit, long uid, int type) {
        QueryWrapper<YxUserBill> wrapper = new QueryWrapper<>();
         wrapper.lambda().eq(YxUserBill::getUid,uid).orderByDesc(YxUserBill::getCreateTime)
                 .orderByAsc(YxUserBill::getId);
@@ -216,8 +213,12 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUse
             billDTO.setList(yxUserBillMapper.getUserBillList(wrapperT));
 
         }
-
-        return billDTOList;
+        Map<String,Object> map = new HashMap<>();
+        map.put("list",billDTOList);
+        map.put("total",pageModel.getTotal());
+        map.put("totalPage",pageModel.getPages());
+        return map;
+       // return billDTOList;
     }
 
     @Override