From 3fabc6425076378cf70db1a0604d5bae3d589680 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 8 Dec 2023 17:51:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=B8=E9=94=80=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index 63be54e2..fd838855 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -23,10 +23,12 @@ class Order extends BaseController
 
     public $streetCode; // 镇街道地区码
 
+    public $token;
     public function __construct(App $app, BaseRepository $repository)
     {
         parent::__construct($app);
         $this->repository = $repository;
+        $this->token = trim($this->request->header('X-Token'));
         $this->areaCode = $this->request->param('areaCode', '');
         $this->streetCode = $this->request->param('streetCode', '');
 
@@ -575,7 +577,18 @@ class Order extends BaseController
         unset($where['date']);
         $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'));