From cd9f6d2121b17c1f59d5a929981dce73515b2304 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Thu, 2 Sep 2021 10:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ProductController.php   | 14 +++++++++
 .../Controllers/ProductController.php         | 29 ++++++++++---------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/Admin/Controllers/ProductController.php b/app/Admin/Controllers/ProductController.php
index 2d43892..713da99 100644
--- a/app/Admin/Controllers/ProductController.php
+++ b/app/Admin/Controllers/ProductController.php
@@ -6,6 +6,8 @@ use App\Admin\Extensions\Grid\AuditProduct;
 use App\Admin\Repositories\Product;
 use App\Common\ProductStatus;
 use App\Common\UserStatus;
+use App\Models\AgentProduct;
+use App\Models\AgentProductItem;
 use App\Models\Category;
 use App\Models\Supplier;
 use Dcat\Admin\Form;
@@ -138,6 +140,18 @@ class ProductController extends AdminController
 					$form->$k = '';
 				}
 			}
+		})->saved(function(Form $form) {
+			//如果是审核的产品，将产品同步到代理商产品
+			if ($form->isEditing() && $form->status == ProductStatus::ON_SALE) {
+				$ap_ids = AgentProductItem::where('product_id', $form->getKey())->pluck('agent_product_id')->toArray();
+				//同步信息到代理商产品，注：组合产品不同步
+				AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update([
+					'title' => $form->title,
+					'pictures' => explode(',', $form->pictures),
+					'know' => $form->know,
+					'content' => $form->content,
+				]);
+			}
 		});
     }
 }
diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php
index b22a0b0..c6d72ef 100644
--- a/app/AdminSupplier/Controllers/ProductController.php
+++ b/app/AdminSupplier/Controllers/ProductController.php
@@ -122,34 +122,35 @@ class ProductController extends AdminController
 			}
 
 			//特殊字段处理
-			$form->hidden('supplier_id'); //表单没有的字段，必须加上这句才能重置值
+			$form->hidden(['status', 'supplier_id']); //表单没有的字段，必须加上这句才能重置值
 			$form->supplier_id = Admin::user()->id;
+			if ($form->isCreating()) {
+				$form->status = ProductStatus::UNAUDITED;
+			}
 		})->saved(function (Form $form, $result) {
 			if ($form->isEditing() && $result) {
 				$ap_ids = AgentProductItem::where('product_id', $form->getKey())->pluck('agent_product_id')->toArray();
 
 				DB::beginTransaction();
 				try {
-					$data = [
-						'title' => $form->title,
-						'pictures' => explode(',', $form->pictures),
-						'know' => $form->know,
-						'content' => $form->content,
-					];
-
 					//如果修改标题、价格、产品图片、旅游须知、产品详情，状态将变为未审核
 					if ($form->model()->wasChanged(['title', 'price', 'original_price', 'pictures', 'know', 'content'])) {
 						$form->model()->update(['status' => ProductStatus::UNAUDITED]);
 
-						//下架所有代理商产品
-						$data['status'] = ProductStatus::SOLD_OUT;
+						//下架所有代理商产品，未审核的产品，不能同步信息到代理商产品
+						AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update(['status' => ProductStatus::SOLD_OUT]);
+					} else {
+						//不需要审核的修改信息同步信息到代理商产品，注：组合产品不同步
+						AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update([
+							'title' => $form->title,
+							'pictures' => explode(',', $form->pictures),
+							'know' => $form->know,
+							'content' => $form->content,
+						]);
 					}
 
-					//同步信息到代理商产品，注：组合产品不同步
-					AgentProduct::whereIn('id', $ap_ids)->where('type', 0)->update($data);
-
 					DB::commit();
-					return $form->response()->success('更新成功！');
+					return $form->response()->success('更新成功！')->script('history.go(-1)');
 				} catch (\Exception $exception) {
 					DB::rollBack();
 					return $form->response()->error($exception->getMessage());