Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

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,
+				]);
+			}
 		});
     }
 }

app/AdminAgent/Controllers/AgentProductController.php

@@ -249,7 +249,7 @@ class AgentProductController extends AdminController
 					$count = Product::where([['status', '=', ProductStatus::ON_SALE], ['stock', '>=', $form->model()->stock]])
 						->whereIn('id', $ids)->count();
 					if (count($ids) != $count) {
-						return $form->response()->success('供应商产品已下架或库存不足！');
+						return $form->response()->error('供应商产品已下架或库存不足！');
 					}
 
 					//修改库存
@@ -283,7 +283,7 @@ class AgentProductController extends AdminController
 				if ($product->status != ProductStatus::ON_SALE) {
 					return $form->response()->error('产品ID '. $form->product_id .' 已下架');
 				} else if ($product->stock < $form->stock) {
-					return $form->response()->error("供应商当前库存为{$form->stock}，你设置的库存不能超过该数值");
+					return $form->response()->error("供应商当前库存为{$product->stock}，你设置的库存不能超过该数值");
 				}
 				$form->title = $product->title;
 				$form->pictures = $product->pictures;

app/AdminSupplier/Controllers/ProductController.php

@@ -38,7 +38,7 @@ class ProductController extends AdminController
             $grid->column('stock');
             $grid->column('sale');
             $grid->column('status')->using(ProductStatus::array());
-			$grid->column('verify_mobile','核销号码');
+			$grid->column('verify_mobile','核销员手机');
             $grid->column('created_at');
             $grid->column('updated_at');
 
@@ -71,7 +71,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('verify_mobile','核销员手机');
             $show->field('created_at');
             $show->field('updated_at');
         });
@@ -101,9 +101,9 @@ class ProductController extends AdminController
             $form->text('stock')->default(9999)->required();
             $form->editor('know');
             $form->editor('content')->required();
-			$form->text('verify_mobile','核销号码');
+			$form->text('verify_mobile','核销员手机');
             if ($form->isEditing()) {
-				$form->confirm('提示', '编辑产品需要重新审核，同时<span class="btn-danger">下架所有</span>关联的代理商产品，是否继续？');
+				$form->confirm('提示', '修改标题、价格、产品图片、旅游须知、产品详情需要重新审核，同时<span class="btn-danger">下架所有</span>关联的代理商产品，是否继续？');
 			}
         })->saving(function (Form $form) {
         	//不允许编辑非自己数据
@@ -111,7 +111,7 @@ class ProductController extends AdminController
 				return $form->response()->error('数据不存在');
 			}
 
-			//不允许编辑的字段 TODO 忽略字段不起作用
+			//不允许编辑的字段，忽略字段不起作用？
 			$form->ignore(['id', 'supplier_id', 'sale', 'status', 'created_at', 'updated_at', 'deleted_at']);
 
 			//null字段转为''
@@ -123,15 +123,38 @@ class ProductController extends AdminController
 
 			//特殊字段处理
 			$form->hidden(['status', 'supplier_id']); //表单没有的字段，必须加上这句才能重置值
-			$form->status = ProductStatus::UNAUDITED;
 			$form->supplier_id = Admin::user()->id;
+			if ($form->isCreating()) {
+				$form->status = ProductStatus::UNAUDITED;
+			}
 		})->saved(function (Form $form, $result) {
-			//下架代理商产品
-			$id = $form->getKey();
-			if ($result) {
-				AgentProduct::where('product_id', $id)
-					->orWhere(DB::raw('FIND_IN_SET(' . $id . ', product_ids)')) //TODO product_ids字段可能会去掉
-					->update(['status' => ProductStatus::SOLD_OUT]);
+			if ($form->isEditing() && $result) {
+				$ap_ids = AgentProductItem::where('product_id', $form->getKey())->pluck('agent_product_id')->toArray();
+
+				DB::beginTransaction();
+				try {
+					//如果修改标题、价格、产品图片、旅游须知、产品详情，状态将变为未审核
+					if ($form->model()->wasChanged(['title', 'price', 'original_price', 'pictures', 'know', 'content'])) {
+						$form->model()->update(['status' => ProductStatus::UNAUDITED]);
+
+						//下架所有代理商产品，未审核的产品，不能同步信息到代理商产品
+						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,
+						]);
+					}
+
+					DB::commit();
+					return $form->response()->success('更新成功！')->script('history.go(-1)');
+				} catch (\Exception $exception) {
+					DB::rollBack();
+					return $form->response()->error($exception->getMessage());
+				}
 			}
 		})->deleting(function (Form $form) {
 			//不允许删除非自己的数据

app/Http/Controllers/Api/OrderController.php

@@ -177,8 +177,8 @@ class OrderController extends Controller
 			} else if ($formData['pay_type'] == PayType::EARNEST_PAY && $ap->earnest_timeout > 0) {
 				$timeout = date('Y-m-d H:i:s', time() + $ap->earnest_timeout * 60);
 			} else {
-				$order_timeout = AgentSetting::val($this->agent_id, 'order_timeout') ?? 60;
-				$timeout = date('Y-m-d H:i:s', time() + $ap->earnest_timeout * $order_timeout);
+				$order_timeout = AgentSetting::val($this->agent_id, 'order_timeout') ?? 60; //默认60分钟
+				$timeout = date('Y-m-d H:i:s', time() + 60 * $order_timeout); //60 * 分钟转为秒
 			}
 
 			// 存入订单表

app/Models/AgentProduct.php

@@ -54,23 +54,17 @@ class AgentProduct extends BaseModel
 
 	public function setChannelIdAttribute($value)
 	{
-		if (is_array($value)) {
-			$this->attributes['channel_id'] = join(',', array_filter($value));
-		}
+		$this->attributes['channel_id'] = is_array($value) ? join(',', array_filter($value)) : $value;
 	}
 
 	public function setPicturesAttribute($value)
 	{
-		if (is_array($value)) {
-			$this->attributes['pictures'] = json_encode(array_filter($value)) ?? '';
-		}
+		$this->attributes['pictures'] = is_array($value) ? (json_encode(array_filter($value)) ?? '[]') : '[]';
 	}
 
 	public function setProductIdsAttribute($value)
 	{
-		if (is_array($value)) {
-			$this->attributes['product_ids'] = join(',', array_filter($value));
-		}
+		$this->attributes['product_ids'] = is_array($value) ? join(',', array_filter($value)) : $value;
 	}
 
 	// 获取所有产品图片