From 86bb6336e4e8a8830859fe9197056f6065c999b9 Mon Sep 17 00:00:00 2001
From: BrandWang <rj090123@163.com>
Date: Mon, 27 Mar 2023 11:37:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E5=8F=AF?=
 =?UTF-8?q?=E5=9B=9E=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改返回结构
---
 .../java/com/wabestway/recall/model/OrderList.java  | 13 +++++++++++++
 .../com/wabestway/recall/web/OrderController.java   |  9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/wabestway/recall/model/OrderList.java

diff --git a/src/main/java/com/wabestway/recall/model/OrderList.java b/src/main/java/com/wabestway/recall/model/OrderList.java
new file mode 100644
index 0000000..76e53cf
--- /dev/null
+++ b/src/main/java/com/wabestway/recall/model/OrderList.java
@@ -0,0 +1,13 @@
+package com.wabestway.recall.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderList {
+    private int page;
+    private int pageSize;
+    private int total;
+    private List<Order> list;
+}
diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/src/main/java/com/wabestway/recall/web/OrderController.java
index 798c25e..cbe6fbe 100644
--- a/src/main/java/com/wabestway/recall/web/OrderController.java
+++ b/src/main/java/com/wabestway/recall/web/OrderController.java
@@ -1,6 +1,7 @@
 package com.wabestway.recall.web;
 
 import com.wabestway.recall.model.Order;
+import com.wabestway.recall.model.OrderList;
 import com.wabestway.recall.model.Record;
 import com.wabestway.recall.model.ResObj;
 import com.wabestway.recall.repository.OrderRepository;
@@ -30,7 +31,7 @@ public class OrderController {
     }
 
     @PostMapping("/list")
-    public Flux<Order> list(@RequestBody Order order) {
+    public Mono<ResObj> list(@RequestBody Order order) {
         PageRequest pageRequest = PageRequest.of(0, 1);
         ExampleMatcher matcher = ExampleMatcher.matching()
                 .withIgnoreNullValues().withIgnorePaths("createAt", "last");
@@ -39,7 +40,11 @@ public class OrderController {
         Sort s = Sort.by("createAt");
 //        Mono<List<Integer>> listMono = flux.collectList();
 //        listMono.subscribe(list -> System.out.println(list));
-        return orderRepository.findAll(ep, s).skip(pageRequest.getOffset()).limitRate(pageRequest.getPageSize());
+        Flux<Order> flux = orderRepository.findAll(ep, s).skip(pageRequest.getOffset()).limitRate(pageRequest.getPageSize());
+        OrderList resList = new OrderList();
+        Mono<List<Order>> listMono = flux.collectList();
+        listMono.subscribe(list -> resList.setList(list));
+        return Mono.just(ResObj.ok(resList));
     }
 
     @PostMapping("/info/{orderId}")