From 21e87e80fc245ee1e1bbc27182c1d0ad1d78e44c Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Tue, 31 Aug 2021 16:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AgentProductController.php         | 14 +++++++-------
 .../Controllers/ProductController.php              |  4 +++-
 .../Controllers/Api/VerificationController.php     |  9 ++++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php
index f440eae..e9a1ac1 100644
--- a/app/AdminAgent/Controllers/AgentProductController.php
+++ b/app/AdminAgent/Controllers/AgentProductController.php
@@ -211,13 +211,13 @@ class AgentProductController extends AdminController
 				])
 				->required();
 			$form->switch('is_rec')->help('推荐后将在“我的”页面下方显示');
-			$form->selectTable('verifier')
-				->title('选择核销人员')
-				->dialogWidth('50%;min-width:600px;') //不起作用
-				->from(SelectUser::make(['is_verify' => 1]))
-				->model(User::class, 'id', 'nickname')
-				->customFormat(fn($v) => !$v ? '' : $v)
-				->required();
+			//$form->selectTable('verifier')
+			//	->title('选择核销人员')
+			//	->dialogWidth('50%;min-width:600px;') //不起作用
+			//	->from(SelectUser::make(['is_verify' => 1]))
+			//	->model(User::class, 'id', 'nickname')
+			//	->customFormat(fn($v) => !$v ? '' : $v)
+			//	->required();
 
 			//组团版旅行社可以选择地接
 			if (Admin::user()->type == AgentType::CLUSTER) {
diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php
index 1834803..2eac557 100644
--- a/app/AdminSupplier/Controllers/ProductController.php
+++ b/app/AdminSupplier/Controllers/ProductController.php
@@ -35,6 +35,7 @@ class ProductController extends AdminController
             $grid->column('stock');
             $grid->column('sale');
             $grid->column('status')->using(ProductStatus::array());
+			$grid->column('verify_mobile','核销号码');
             $grid->column('created_at');
             $grid->column('updated_at');
 
@@ -67,6 +68,7 @@ class ProductController extends AdminController
             $show->field('status');
             $show->field('know')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/script>/is', '', $v));
             $show->field('content')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/script>/is', '', $v));
+			$show->field('verify_mobile','核销号码');
             $show->field('created_at');
             $show->field('updated_at');
         });
@@ -96,7 +98,7 @@ class ProductController extends AdminController
             $form->text('stock')->default(9999)->required();
             $form->editor('know');
             $form->editor('content')->required();
-
+			$form->text('verify_mobile','核销号码');
             if ($form->isEditing()) {
 				$form->confirm('提示', '编辑产品需要重新审核，同时<span class="btn-danger">下架所有</span>关联的代理商产品，是否继续？');
 			}
diff --git a/app/Http/Controllers/Api/VerificationController.php b/app/Http/Controllers/Api/VerificationController.php
index 2db89ef..d63a3a5 100644
--- a/app/Http/Controllers/Api/VerificationController.php
+++ b/app/Http/Controllers/Api/VerificationController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Models\Agent;
 use App\Models\Order;
+use App\Models\Product;
 use App\Models\User;
 use App\Common\OrderStatus;
 use EasyWeChat\Factory;
@@ -31,7 +32,13 @@ class VerificationController extends Controller
 		}
 
 		$user = User::firstWhere(['id' => $this->user_id, 'status' => 1]);
-		if (!$user || $user->is_verify !=1 || $user->id != $order->agentProduct->verifier) {
+		if (!$user || $user->is_verify !=1) {
+			return $this->error('对不起，你没有核销权限，请联系管理员');
+		}
+
+		$checkMobile = Product::query()->whereIn('id',explode(',',$order->product_ids))->where('verify_mobile',$user->mobile)->doesntExist();
+
+		if ($checkMobile) {
 			return $this->error('对不起，你没有核销权限，请联系管理员');
 		}