From 3fbe1020d9272dab5890aa5636a5c6c9a2f89bef Mon Sep 17 00:00:00 2001
From: Cool <747682928@qq.com>
Date: Sun, 1 Sep 2024 02:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bigdata/wxappserver/service/OrderService.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bigdata/wxappserver/service/OrderService.java b/src/main/java/com/bigdata/wxappserver/service/OrderService.java
index 939e8db..3e8e765 100644
--- a/src/main/java/com/bigdata/wxappserver/service/OrderService.java
+++ b/src/main/java/com/bigdata/wxappserver/service/OrderService.java
@@ -51,11 +51,13 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
 
     public JSONObject list(JSONObject jsonObject) {
         Integer userId = jsonObject.getInteger("userId");
+        Integer status = jsonObject.getInteger("status");
 //        Integer currentPage = jsonObject.getInteger("currentPage");
 //        Integer pageSize = jsonObject.getInteger("pageSize");
 //        IPage<Order> page = new Page<>(currentPage, pageSize);
         LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(userId != null, Order::getUserId, userId);
+        wrapper.eq(userId != null, Order::getUserId, userId)
+                .eq(status!=null,Order::getStatus,status);
 //        IPage<Order> orderIPage = page(page, wrapper);
         List<Order> list = list(wrapper);
         List<OrderDto> orderDtoList = dealList(list);
@@ -83,6 +85,7 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
                 orderDto.setGoodImage(goods.getGoodImage());
                 orderDto.setGoodName(goods.getGoodName());
             }
+            list.add(orderDto);
         }
         return list;
     }