From 96dca83970ee24f29d2ed9c3f2ad2e37901a872c Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Wed, 29 Sep 2021 23:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Extensions/Grid/MiniProgramUpload.php               | 4 ++--
 ...{BatchUploadMiniProgram.php => UploadMiniProgramQueue.php} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename app/Jobs/{BatchUploadMiniProgram.php => UploadMiniProgramQueue.php} (89%)

diff --git a/app/Admin/Extensions/Grid/MiniProgramUpload.php b/app/Admin/Extensions/Grid/MiniProgramUpload.php
index d74142e..895aa0e 100644
--- a/app/Admin/Extensions/Grid/MiniProgramUpload.php
+++ b/app/Admin/Extensions/Grid/MiniProgramUpload.php
@@ -2,7 +2,7 @@
 
 namespace App\Admin\Extensions\Grid;
 use App\Common\UserStatus;
-use App\Jobs\BatchUploadMiniProgram;
+use App\Jobs\UploadMiniProgramQueue;
 use App\Models\Agent;
 use App\Models\MiniProgramTemplate;
 use App\Service\UploadMiniProgram;
@@ -71,7 +71,7 @@ class MiniProgramUpload extends RowAction
 			])->pluck('id');
 
 		foreach ($ids as $id) {
-			BatchUploadMiniProgram::dispatch($template_id, $id);
+			UploadMiniProgramQueue::dispatch($template_id, $id);
 		}
 		return $this->response()->success('已经为所有已注册过小程序，且状态正常的代理商上传小程序。上传需要一定时间，请耐心等待');
 	}
diff --git a/app/Jobs/BatchUploadMiniProgram.php b/app/Jobs/UploadMiniProgramQueue.php
similarity index 89%
rename from app/Jobs/BatchUploadMiniProgram.php
rename to app/Jobs/UploadMiniProgramQueue.php
index a52edc3..78e7657 100644
--- a/app/Jobs/BatchUploadMiniProgram.php
+++ b/app/Jobs/UploadMiniProgramQueue.php
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class BatchUploadMiniProgram implements ShouldQueue
+class UploadMiniProgramQueue implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -41,7 +41,7 @@ class BatchUploadMiniProgram implements ShouldQueue
     public function handle()
     {
 		$agent = Agent::find($this->agent_id);
-		$template = MiniProgramTemplate::where('template_id', $this->template_id)->first();
+		$template = MiniProgramTemplate::find($this->template_id);
 
 		if (!$agent || !$template) return;