[智价云] 增加品牌名称强制校验

app/Http/Controllers/Manager/Collect/Product.php

@@ -260,7 +260,7 @@ class Product extends Controller
         if ($all_data['sampling_start_time']  && strtotime(date('Y-m-d', $all_data['sampling_start_time']) . '23:59:59') < time()) return json_send(['code' => 'error', 'msg' => '采集开始时间必须大于当前时间']);
         if ($all_data['sampling_end_time']  && $all_data['sampling_end_time'] < time()) return json_send(['code' => 'error', 'msg' => '采集结束时间必须大于当前时间']);
         //查询是否存在
-        $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
+        $map = ['product_brand'=> $product_brand, 'product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
             $all_data['company_id'] = $company_id;
@@ -327,7 +327,7 @@ class Product extends Controller
         if ($all_data['sampling_start_time']  && strtotime(date('Y-m-d', $all_data['sampling_start_time']) . '23:59:59') < time()) return json_send(['code' => 'error', 'msg' => '采集开始时间必须大于当前时间']);
         if ($all_data['sampling_end_time']  && $all_data['sampling_end_time'] < time()) return json_send(['code' => 'error', 'msg' => '采集结束时间必须大于当前时间']);
         //查询是否存在
-        $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
+        $map = ['product_brand'=> $product_brand, 'product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
         } else {

app/Http/Requests/Manager/Collect/Product.php

@@ -35,6 +35,7 @@ class Product extends BaseRequest
             'suggested_price'   => 'required',
             'store_scope'       => 'required',
             'platform'          => 'required',
+            'product_brand'    => 'required',
         ];
     }
 
@@ -43,8 +44,8 @@ class Product extends BaseRequest
     protected   $scenes         = [
         'detail'             => ['id'],
         'list'               => ['page', 'limit'],
-        'add'                      => ['platform','product_name'],
-        'edit'                  => ['id','platform','product_name'],
+        'add'                      => ['platform','product_brand','product_name'],
+        'edit'                  => ['id','platform','product_brand','product_name'],
         'set_status'              => ['id', 'status'],
         'delete'                  => ['id'],
         'product_name_specs_list' => [],
@@ -77,6 +78,7 @@ class Product extends BaseRequest
             'product_name.required' => '商品名称未知',
             'product_specs.required'    => '商品规格未知',
             'platform.required'      => '平台未知',
+            'product_brand.required' => '商品品牌未知',
         ];
     }
 }