From 54433cf0c76003e4399218ae62642c2826a46ee2 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Mon, 8 Nov 2021 00:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8A=E6=9E=B6=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=89=80=E6=9C=89=E4=BB=A3=E7=90=86=E5=95=86=E9=83=BD?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8A=E6=9E=B6=EF=BC=88=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=98=AF=E4=B8=8A=E6=9E=B6=E8=BF=87=E6=9F=90?=
 =?UTF-8?q?=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86=E7=9A=84=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=89=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E4=B8=8A=E6=9E=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Providers/ProductServiceProvider.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/Providers/ProductServiceProvider.php b/app/Providers/ProductServiceProvider.php
index bec64cb..1fa6f19 100644
--- a/app/Providers/ProductServiceProvider.php
+++ b/app/Providers/ProductServiceProvider.php
@@ -4,9 +4,9 @@ namespace App\Providers;
 
 use App\Common\AgentType;
 use App\Common\ProductStatus;
+use App\Common\UserStatus;
 use App\Models\AgentProduct;
 use App\Models\AgentProductItem;
-use App\Models\AgentProductSpec;
 use App\Models\AgentSetting;
 use App\Models\Category;
 use App\Models\Agent;
@@ -14,7 +14,6 @@ use App\Models\Product;
 use App\Models\ProductSpec;
 use App\Service\SmsService;
 use App\Traits\SmsTraits;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
@@ -52,14 +51,12 @@ class ProductServiceProvider extends ServiceProvider
 				/** 同步信息到代理商产品 END */
 
 				/** 自动上架 START */
-				$agentIds = AgentProductItem::query()
-					->withoutGlobalScope('orderById')
-					->where('supplier_id', $product->supplier_id)
-					->whereHas('agent',function($query) {
-						$query->where('type','!=',AgentType::OPERATOR);
-					})
-					->distinct()
-					->pluck('agent_id');
+				$agentIds = Agent::query()->where([
+					['id', '>', 1], //1是总管理员，不处理
+					['type', '<>', AgentType::OPERATOR],
+					['status', '=', UserStatus::NORMAL]
+				])->pluck('id');
+
 				foreach ($agentIds as $v) {
 					//如果没开启自动上架 滚蛋
 					if (empty(AgentSetting::val($v, 'auto_shelves'))) {