From defa3e34bf41053a429a8be3a63e3707c69f1abb Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Sat, 4 Dec 2021 12:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8A=E6=9E=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Jobs/AgentProductShelve.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/AgentProductShelve.php b/app/Jobs/AgentProductShelve.php
index 747226f..d9cbf62 100644
--- a/app/Jobs/AgentProductShelve.php
+++ b/app/Jobs/AgentProductShelve.php
@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Common\ProductStatus;
 use App\Models\Agent;
 use App\Models\AgentProduct;
 use App\Models\AgentProductItem;
@@ -77,21 +78,26 @@ class AgentProductShelve implements ShouldQueue
 			$agentProduct->product_id = $product->id;
 			$agentProduct->product_ids = $product->id;
 			$agentProduct->stock = $product->stock;
-			$agentProduct->status = 1;
+			$agentProduct->status = ProductStatus::ON_SALE;
 			$agentProduct->pictures = $product->pictures;
 			$agentProduct->content = $product->content;
 			$agentProduct->know = $product->know;
 			$agentProduct->price = $product->price;
 			$agentProduct->original_price = $product->original_price;
+			$agentProduct->tpl_type = $product->type;
+			$agentProduct->extends = $product->extends;
+			$agentProduct->longitude = $product->longitude;
+			$agentProduct->latitude = $product->latitude;
+			$agentProduct->address = $product->address;
 
 			//自动添加分类
 			$autoCategory = AgentSetting::val($agent_id, 'auto_category') ?? 0;
 
+			$categoryName = Category::query()->where('id', $product->category_id)->value('name');
 			if (!empty($autoCategory)) {
-				$categoryName = Category::query()->where('id', $product->category_id)->value('name');
-				$category = Category::query()->firstOrCreate(['agent_id' => $agent_id, 'name' => $categoryName]);
-				$agentProduct->category_id = $category->id;
+				Category::query()->firstOrCreate(['agent_id' => $agent_id, 'name' => $categoryName]);
 			}
+			$agentProduct->category_id = Category::where(['agent_id' => $agent_id, 'name' => $categoryName])->value('id');
 
 			$agentProduct->save();