From 13266ffd48d91ce3906a6baa40c399801198b2ee Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 22 Aug 2023 12:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 20 +++++++++++++++++---
 route/api.php               |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 1e420be9..030c579c 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -893,7 +893,7 @@ class Auth extends BaseController
         $districtCode = $this->request->param('district_code', '');
         $streetCode   = $this->request->param('street_code');
         $villageCode  = $this->request->param('village_code', '');
-        $brigadeId    = $this->request->param('brigade_id', -1);
+        $brigadeId    = $this->request->param('brigade_id', 0);
         $startDate    = $this->request->param('start_date', date('Y-m-d'));
         $endDate      = $this->request->param('end_date', date('Y-m-d'));
         $queryBuilder = Db::name('ProductOrderLog')->where('status', 1);
@@ -938,7 +938,7 @@ class Auth extends BaseController
         $districtCode = $this->request->param('district_code', '');
         $streetCode   = $this->request->param('street_code');
         $villageCode  = $this->request->param('village_code', '');
-        $brigadeId    = $this->request->param('brigade_id', -1);
+        $brigadeId    = $this->request->param('brigade_id', 0);
         $startDate    = $this->request->param('start_date', date('Y-m-d'));
         $endDate      = $this->request->param('end_date', date('Y-m-d'));
         $queryBuilder = Db::name('ProductOrderLog')->where('status', 1);
@@ -964,7 +964,21 @@ class Auth extends BaseController
             $queryBuilder = $queryBuilder->whereTime('create_time', '<=', trim($endDate) . ' 23:59:59');
         }
         $count = $queryBuilder->count();
-        $list  = $queryBuilder->setOption('field', [])->field([''])->order('id', 'desc')->page($page, $limit)->fetchSql(false)->select();
+        $list  = $queryBuilder->setOption('field', [])->field(['id', 'order_id', 'product_num', 'product_price', 'total_price', 'city_code', 'district_code', 'street_code', 'village_code', 'brigade_id', 'create_time'])->order('id', 'desc')->page($page, $limit)->fetchSql(false)->select();
+        $orderIdList = [];
+        if ($list) {
+            $orderIdArray = $list->column('order_id');
+            if (count($orderIdArray) > 0) {
+                $orderIdList = Db::name('store_order')->whereIn('order_id', $orderIdArray)->fetchSql(false)->column('order_sn', 'order_id');
+            }
+            $list = $list->toArray();
+        };
+        foreach($list as $k=>$v) {
+            $list[$k]['order_sn'] = '';
+            if (!empty($orderIdList[$v['order_id']])) {
+                $list[$k]['order_sn'] = $orderIdList[$v['order_id']];
+            }
+        }
         return app('json')->success(compact('count', 'list'));
     }
 
diff --git a/route/api.php b/route/api.php
index 0f5b48eb..af608aa3 100644
--- a/route/api.php
+++ b/route/api.php
@@ -24,7 +24,7 @@ Route::group('api/', function () {
     Route::any('dotest', 'api.Auth/dotest');
     Route::post('goods/take/:id', 'api.Auth/deliveryGoods');
     Route::get('order/statistics', 'api.Auth/orderStatistics');
-    Route::get('order/list', 'api.Auth/orderList');
+    Route::get('region/order', 'api.Auth/orderList');
     Route::resource('upload', 'api.Upload');
     Route::post('articleCatch', 'api.Upload/article');
     //强制登录