From 13e302f755d165b187a54dc8fe954c76028aaa09 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Dec 2023 13:50:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=95=B0=E6=8D=AE=E4=B9=8B=E7=9C=BC-?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Order.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index cf3cc78b..3e15b45d 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -528,7 +528,19 @@ class Order extends BaseController
         $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','is_trader','activity_type','group_order_sn','store_name']);
         $status = $where['status'];
         unset($where['status']);
-        $query = $dao->search($where, null)->where($repository->getOrderType($status));
+        $query = $dao->search($where, null)->where($repository->getOrderType($status))
+            ->with([
+                'orderProduct',
+                'merchant' => function ($query) {
+                    return $query->field('mer_id,mer_name,is_trader');
+                },
+                'groupOrder' => function ($query) {
+                    $query->field('group_order_id,group_order_sn');
+                },
+                'user' => function ($query) {
+                    $query->field('uid,nickname,avatar');
+                },
+            ]);
         $count = $query->count();
         $list = $query->page($page, $limit)->select();
         return app('json')->success(compact('count', 'list'));