附件认证规则修改

app/Http/Controllers/Api/CommonApiController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Services\AdminUserService;
 use App\Http\Services\AdminUserService;
 use App\Model\BrandModel;
 use App\Model\BrandModel;
 use App\Model\SelfClassifyModel;
 use App\Model\SelfClassifyModel;
+use App\Model\StandardBrandModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use GuzzleHttp\Client;
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -45,6 +46,31 @@ class CommonApiController extends Controller
         return $this->response(0, 'ok', $brandList);
         return $this->response(0, 'ok', $brandList);
     }
     }
 
 
+    //搜索标准品牌
+    public function SearchStandardBrand($request)
+    {
+        $brandName = $request->input('brand_name');
+
+        $standardBrandModel = new StandardBrandModel();
+        $query = $standardBrandModel->where('status', 1);
+        if ($brandName) {
+            $query = $query->where('brand_name', 'like', $brandName . '%');
+        }
+        $count = $query->count();
+        $list = $query->select('brand_name', 'brand_id')->paginate(17);
+        $list = $list ? $list->toArray() : [];
+        $data = array_get($list, 'data');
+        $lastPage = array_get($list, 'last_page');
+        echo json_encode([
+            'errcode' => 0,
+            'errmsg' => 'ok',
+            'total' => $count,
+            'count' => $count,
+            'data' => $data,
+            'last_page' => $lastPage
+        ]);
+    }
+
     private function SearchBrand($request)
     private function SearchBrand($request)
     {
     {
         $brandName = $request->input('brand_name');
         $brandName = $request->input('brand_name');

app/Http/Validators/SupplierValidator.php

@@ -32,7 +32,7 @@ class SupplierValidator
             'return_address' => 'max:100',
             'return_address' => 'max:100',
             'return_consignee' => 'max:50',
             'return_consignee' => 'max:50',
             'return_phone' => 'max:50',
             'return_phone' => 'max:50',
-            'business_license' => 'required',
+//            'business_license' => 'required',
 //            'established_time' => 'required',
 //            'established_time' => 'required',
             'cn_ratio' => 'min:1',
             'cn_ratio' => 'min:1',
             'us_ratio' => 'min:1',
             'us_ratio' => 'min:1',
@@ -45,6 +45,19 @@ class SupplierValidator
             'supplier_position' => 'required|max:30',
             'supplier_position' => 'required|max:30',
             'can_check_uids' => 'required',
             'can_check_uids' => 'required',
         ];
         ];
+
+        //校验附件,只要营业执照、商业登记证、公司注册证至少其中一个上传了附件，就判定已经上传了附件
+        $attachmentValidateFields = ['business_license', 'registration_certificate', 'incorporation_certificate'];
+        $attachmentValidateFieldsExist = false;
+        foreach ($attachmentValidateFields as $field) {
+            if (array_get($requestData, $field)) {
+                $attachmentValidateFieldsExist = true;
+                break;
+            }
+        }
+        if (!$attachmentValidateFieldsExist) {
+            return '附件里营业执照、商业登记证、公司注册证至少要上传一个';
+        }
         //第一次新增的时候,是要校验联系人的
         //第一次新增的时候,是要校验联系人的
         if (empty($requestData['supplier_id'])) {
         if (empty($requestData['supplier_id'])) {
             $rules = array_merge($rules, $contactRuler);
             $rules = array_merge($rules, $contactRuler);