From 070a83a35da4cb786639267d260e1ef0d27692b1 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Fri, 5 Jul 2024 14:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Atest=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=20=09[=E8=BF=87=E7=A8=8B]?=
 =?UTF-8?q?=EF=BC=9A=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 .../Controller/AdminController.class.php      | 65 ++++++++++---------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/FlyCube/MpApi/Controller/AdminController.class.php b/FlyCube/MpApi/Controller/AdminController.class.php
index 5d2d8e1..0016285 100644
--- a/FlyCube/MpApi/Controller/AdminController.class.php
+++ b/FlyCube/MpApi/Controller/AdminController.class.php
@@ -743,11 +743,12 @@ class AdminController extends PublicController
 	 */
 	public function getOrderList()
 	{
-		$where = [];
+		//总管理员 可接收任何shop_id 非总管理员 只可以调用自身shop_id 否则会中断
+		$this->isPower();
 
-		// 非总管理员只返回自己的账户信息
-		if ($this->tokenShop_id != C('powerId')) {
-			$where['shop_id'] = $this->tokenShop_id;
+		// 添加 shop_id 条件
+		if ($_REQUEST['shop_id'] != '') {
+			$where['shop_id'] = $_REQUEST['shop_id'];
 		}
 
 		// 添加 start_time 和 end_time 条件
@@ -755,38 +756,38 @@ class AdminController extends PublicController
 			$where['order_time'] = array('between', array($_REQUEST['start_time'], $_REQUEST['end_time']));
 		}
 
-		// 添加 main_status 条件
-		if (isset($_REQUEST['main_status']) && is_array($_REQUEST['main_status'])) {
-			$where['main_status'] = array('in', $_REQUEST['main_status']);
-		}
+		// // 添加 main_status 条件
+		// if (isset($_REQUEST['main_status']) && is_array($_REQUEST['main_status'])) {
+		// 	$where['main_status'] = array('in', $_REQUEST['main_status']);
+		// }
 
-		// 添加 shipment_status 条件
-		if (isset($_REQUEST['shipment_status']) && is_array($_REQUEST['shipment_status'])) {
-			$where['shipment_status'] = array('in', $_REQUEST['shipment_status']);
-		}
+		// // 添加 shipment_status 条件
+		// if (isset($_REQUEST['shipment_status']) && is_array($_REQUEST['shipment_status'])) {
+		// 	$where['shipment_status'] = array('in', $_REQUEST['shipment_status']);
+		// }
 
-		// 添加 refund_status 条件
-		if (isset($_REQUEST['refund_status']) && is_array($_REQUEST['refund_status'])) {
-			$where['refund_status'] = array('in', $_REQUEST['refund_status']);
-		}
+		// // 添加 refund_status 条件
+		// if (isset($_REQUEST['refund_status']) && is_array($_REQUEST['refund_status'])) {
+		// 	$where['refund_status'] = array('in', $_REQUEST['refund_status']);
+		// }
 
-		// 添加搜索条件
-		if (isset($_REQUEST['search']) && is_array($_REQUEST['search']) && count($_REQUEST['search']) == 2) {
-			list($field, $value) = $_REQUEST['search'];
-			if (!empty($field) && !empty($value)) {
-				$fieldMap = [
-					'orderSn' => 'order_sn',
-					'name' => 'receiver',
-					'tel' => 'tel',
-					'remark' => 'remark',
-					'desc' => 'describe'
-				];
+		// // 添加搜索条件
+		// if (isset($_REQUEST['search']) && is_array($_REQUEST['search']) && count($_REQUEST['search']) == 2) {
+		// 	list($field, $value) = $_REQUEST['search'];
+		// 	if (!empty($field) && !empty($value)) {
+		// 		$fieldMap = [
+		// 			'orderSn' => 'order_sn',
+		// 			'name' => 'receiver',
+		// 			'tel' => 'tel',
+		// 			'remark' => 'remark',
+		// 			'desc' => 'describe'
+		// 		];
 
-				if (array_key_exists($field, $fieldMap)) {
-					$where[$fieldMap[$field]] = array('like', '%' . $value . '%');
-				}
-			}
-		}
+		// 		if (array_key_exists($field, $fieldMap)) {
+		// 			$where[$fieldMap[$field]] = array('like', '%' . $value . '%');
+		// 		}
+		// 	}
+		// }
 
 		$orderDb = D('order');
 		$orderList = $orderDb->where($where)->select();