From 491bcf332006e88f0018d445834b5e2e3d46ff7f Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 4 Jun 2024 13:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/controller/BuyOrderController.java |  9 ++++++---
 .../modules/common/service/BuyOrderService.java       |  3 ++-
 .../common/service/impl/BuyOrderServiceImpl.java      | 11 ++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/common/controller/BuyOrderController.java
index 10043a03..a01eedc4 100644
--- a/src/main/java/com/peanut/modules/common/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/common/controller/BuyOrderController.java
@@ -1,6 +1,8 @@
 package com.peanut.modules.common.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.peanut.common.utils.R;
+import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.common.service.BuyOrderService;
 import com.peanut.modules.common.to.PrepareOrderDto;
 import lombok.extern.slf4j.Slf4j;
@@ -24,9 +26,10 @@ public class BuyOrderController {
     }
 
     //用户订单列表
-    @RequestMapping("/buyOrderList")
-    public R buyOrderList(@RequestBody Map params){
-        return R.ok().put("data",buyOrderService.buyOrderList(params));
+    @RequestMapping("/commonBuyOrderList")
+    public R commonBuyOrderList(@RequestBody Map params){
+        IPage<BuyOrder> page = buyOrderService.commonBuyOrderList(params);
+        return R.ok().put("data",page);
     }
 
     //用户订单各状态下数量
diff --git a/src/main/java/com/peanut/modules/common/service/BuyOrderService.java b/src/main/java/com/peanut/modules/common/service/BuyOrderService.java
index 71801c5c..db5ec02c 100644
--- a/src/main/java/com/peanut/modules/common/service/BuyOrderService.java
+++ b/src/main/java/com/peanut/modules/common/service/BuyOrderService.java
@@ -1,5 +1,6 @@
 package com.peanut.modules.common.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.common.entity.ExpressQueryResponse;
@@ -11,7 +12,7 @@ public interface BuyOrderService extends IService<BuyOrder> {
 
     Map<String,Object> initPrepareOrder(PrepareOrderDto prepareOrderDto);
 
-    List<BuyOrder> buyOrderList(Map params);
+    IPage<BuyOrder> commonBuyOrderList(Map params);
 
     List<Map<String,Object>> getBuyOrderNumByStatus(Map params);
 
diff --git a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
index c3aad0ad..e7c265fb 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java
@@ -1,9 +1,13 @@
 package com.peanut.modules.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.ExpressOrderUtil;
+import com.peanut.common.utils.Query;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.service.BuyOrderService;
@@ -57,7 +61,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     }
 
     @Override
-    public List<BuyOrder> buyOrderList(Map params) {
+    public IPage<BuyOrder> commonBuyOrderList(Map params) {
         LambdaQueryWrapper<BuyOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BuyOrder::getUserId,params.get("userId"));
         wrapper.eq(BuyOrder::getCome,params.get("come"));
@@ -68,7 +72,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             wrapper.eq(BuyOrder::getOrderStatus,params.get("orderStatus").toString());
         }
         wrapper.orderByDesc(BuyOrder::getCreateTime);
-        List<BuyOrder> buyOrderList = this.getBaseMapper().selectList(wrapper);
+        IPage<BuyOrder> page = this.page(new Query<BuyOrder>().getPage(params),wrapper);
+        List<BuyOrder> buyOrderList = page.getRecords();
         if (buyOrderList.size() > 0){
             for(BuyOrder b : buyOrderList){
                 b.setUser(userDao.selectById(b.getUserId()));
@@ -91,7 +96,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                 }
             }
         }
-        return buyOrderList;
+        return page;
     }
 
     @Override