From 4145ac6ba85927c7320a777f82dd331fca294df9 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Fri, 20 Aug 2021 00:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=9D=E5=AD=98=E5=9C=B0?=
 =?UTF-8?q?=E6=8E=A5guide=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MySQL_change.sql                               | 6 ++++++
 app/AdminGuide/Controllers/OrderController.php | 5 ++++-
 app/Http/Controllers/Api/OrderController.php   | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/MySQL_change.sql b/MySQL_change.sql
index 3bbc28f..ad84235 100644
--- a/MySQL_change.sql
+++ b/MySQL_change.sql
@@ -52,3 +52,9 @@ ALTER TABLE `agent_products`
 ALTER TABLE `advertisings`
     CHANGE COLUMN `agent_id` `agent_id` INT(10) NOT NULL COMMENT '发布者ID' AFTER `id`,
     ADD INDEX `agent_id` (`agent_id`);
+
+# 0:01 ‎2021/‎08/‎20
+ALTER TABLE `orders`
+	ADD COLUMN `guide_id` INT NOT NULL DEFAULT '0' COMMENT '地接ID' AFTER `refund_info`,
+	ADD INDEX `guide_id` (`guide_id`);
+
diff --git a/app/AdminGuide/Controllers/OrderController.php b/app/AdminGuide/Controllers/OrderController.php
index cba7be9..ee53c2e 100644
--- a/app/AdminGuide/Controllers/OrderController.php
+++ b/app/AdminGuide/Controllers/OrderController.php
@@ -7,6 +7,7 @@ use App\Common\OrderStatus;
 use App\Common\PayType;
 use App\Models\Agent;
 use App\Models\Supplier;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -26,7 +27,7 @@ class OrderController extends AdminController
 			$grid->disableCreateButton();
 			$grid->disableActions();
 
-			//TODO 此处需要再加筛选条件
+			$grid->model()->where('guide_id', Admin::user()->id);
 
             $grid->column('id')->sortable();
             $grid->column('agent.name');
@@ -46,6 +47,8 @@ class OrderController extends AdminController
             $grid->filter(function (Grid\Filter $filter) {
 				$filter->panel();
 
+				$filter->model()->where('guide_id', Admin::user()->id);
+
 				$filter->equal('id')->width(2);
 				$filter->equal('mobile')->width(2);
 				$filter->equal('order_no')->width(3);
diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php
index 5d7c19e..098c7eb 100644
--- a/app/Http/Controllers/Api/OrderController.php
+++ b/app/Http/Controllers/Api/OrderController.php
@@ -151,6 +151,7 @@ class OrderController extends Controller
 				'status' => $formData['pay_type'] == PayType::OFFLINE ? Status::OFFLINE_UNPAID : Status::UNPAID,
 				'pay_type' => $formData['pay_type'],
 				'coupon_id' => join(',', $coupon_ids),
+				'guide_id' => $ap->guide_id,
 			]);
 
 			DB::commit();