From f2b2f52c7f795e45f8ef279e0248085550eb057b Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Fri, 22 Mar 2024 21:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/OrdersQuerry/index.jsx | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/pages/OrdersQuerry/index.jsx b/src/pages/OrdersQuerry/index.jsx
index a27066a..8b6b2a0 100644
--- a/src/pages/OrdersQuerry/index.jsx
+++ b/src/pages/OrdersQuerry/index.jsx
@@ -43,8 +43,8 @@ export default function OrdersQuerry() {
       render: (data) => {
         return (
           <div>
-            {data.coins && <p>{data.coins}</p>}
-            {data.money && <p>{data.money}</p>}
+            {data.coins && <p>{data.coins}金币</p>}
+            {data.money && <p>¥{data.money / 100}</p>}
           </div>
         );
       },
@@ -104,11 +104,12 @@ export default function OrdersQuerry() {
               order_id: item.order_id,
               order_status_desc: item.order_status_desc,
               ct: new Date(item.ct * 1000).toLocaleString(),
+              ct_origion: item.ct,
             },
             product: item.product_name,
             cost: {
-              coins: `${item?.coins}金币`,
-              money: `¥${item?.money / 100}`,
+              coins: item?.coins,
+              money: item?.money,
             },
             userAndStreamer: {
               user_user_id: item?.user_user_id,
@@ -121,9 +122,24 @@ export default function OrdersQuerry() {
         console.error(error);
       }
     };
-    let result = await ordersQuerry("coin_order_list");
-    if (!result) result = await ordersQuerry("order_list");
-    setData(result);
+    const coinOrderResult = await ordersQuerry("coin_order_list");
+    const orderResult = await ordersQuerry("order_list");
+    //合并查询结果，并按时间排序
+    if (!coinOrderResult) {
+      setData(orderResult);
+      return;
+    }
+    if (!orderResult) {
+      setData(coinOrderResult);
+      return;
+    }
+    if (coinOrderResult && orderResult) {
+      const allResult = [...coinOrderResult, ...orderResult];
+      const finalResult = allResult.sort(
+        (a, b) => b.base.ct_origion - a.base.ct_origion
+      );
+      setData(finalResult);
+    }
   };
 
   //表单提交失败