Merge branch 'feature/lianjingrong/20210524' into 'master'

Feature/lianjingrong/20210524

See merge request !7

app/Http/Controllers/ApiController.php

@@ -47,7 +47,6 @@ class ApiController extends Controller
         $input["user_id"]   = $this->user_id; #用户id
         $input["email"] = $this->email;   #邮箱
         $input["user_name"] = $this->user_name; #用户中文名称
-
         $this->$id($input, $id);
     }
 

app/Http/Controllers/Controller.php

@@ -2,6 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Utils\ApiCode;
+use App\Http\Utils\RequestHelper;
+use App\Http\Utils\Response;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -11,4 +14,19 @@ use Illuminate\Foundation\Auth\Access\AuthorizesResources;
 class Controller extends BaseController
 {
     use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
+
+    public function setError($errMsg, $errCode = ApiCode::API_CODE_ERROR, $data = null)
+    {
+         Response::setError($errMsg, $errCode, $data);
+    }
+
+    public function setSuccess($data, $code = ApiCode::API_CODE_SUCCESS, $msg = "")
+    {
+        Response::setSuccess($data, $code, $msg);
+    }
+
+    public function user()
+    {
+        return RequestHelper::getUser();
+    }
 }

app/Http/Controllers/InquiryController.php

+<?php
+
+namespace App\Http\Controllers;
+use App\Model\CommonModel;
+use App\Model\InquiryItemsAssignModel;
+use App\Model\InquiryItemsModel;
+use App\Model\InquiryModel;
+use Illuminate\Http\Request;
+
+class InquiryController extends Controller
+{
+
+    // 关闭询价单
+    public function close(Request $request)
+    {
+        $inquiry_id = $request->input("inquiry_id");
+        $remark = $request->input("remark");
+        $user = $this->user();
+
+        $InquiryModel = new InquiryModel();
+        $inquiry_info = $InquiryModel->getInfoById($inquiry_id);
+        $inquiry_close_res = $InquiryModel->closeById($inquiry_id, $remark);
+        if ($inquiry_close_res){
+            // 关闭询价单-明细
+            $InquiryItemsModel = new InquiryItemsModel;
+            $InquiryItemsModel->closeByInquiryId($inquiry_id);
+
+            $inquiry_related_items = $InquiryItemsModel->getListByInquiryId($inquiry_id);
+            if ($inquiry_related_items){
+                $inquiry_item_ids = array_column($inquiry_related_items, 'id');
+                // 给领取询价单用户发送消息
+                $InquiryItemsAssignModel = new InquiryItemsAssignModel();
+                $assign_uids = $InquiryItemsAssignModel->getUniqAssignUidsByInquiryItemIds($inquiry_item_ids);
+                $CommonModel = new CommonModel();
+                foreach ($assign_uids as $assign_uid){
+                    $CommonModel->send_msg($assign_uid,$user["user_name"].'已关闭询价，询价单号：'. $inquiry_info['inquiry_sn']);
+                }
+            }
+        }
+
+        $response_data =  [0, "关闭整个询价单成功"];
+        Export($response_data);
+    }
+    //新增询价，sku查询接口
+    public function ApiSkuList(Request $request){
+        $k = $request->input('k');
+        $types = $request->input('types');
+        $url = Config('website.search_url'). "/search/spu/think?spu_name=".$k;
+        $res = post_curl($url,[]);
+        $resArr = \GuzzleHttp\json_decode($res,true);
+        $temp = [];
+        if (count($resArr["data"]) == 0 && $types == 1){ #返回没查到的数据
+            array_push($temp,["value"=>"","name"=>$k]);
+        }else{
+            foreach ($resArr["data"] as $k=>$v){
+                array_push($temp,["value"=>json_encode($v),"name"=>$v["spu_name"]." 品牌:".$v["brand_name"]]);
+            }
+        }
+        echo json_encode($temp,JSON_UNESCAPED_UNICODE) ;
+    }
+    //新增询价，品牌查询接口
+    public function ApiBrandList(Request $request){
+        $k = $request->input('k');
+        $types = $request->input('types');
+
+    }
+}
\ No newline at end of file

app/Http/Kernel.php

@@ -25,12 +25,6 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middlewareGroups = [
-        'web' => [
-            \App\Http\Middleware\CheckLogin::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            EnableCrossRequestMiddleware::class,
-        ],
-
         'api' => [
             
         ],
@@ -51,6 +45,7 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth.api' => \App\Http\Middleware\ApiAuthenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

app/Http/Middleware/ApiAuthenticate.php

+<?php
+
+namespace App\Http\Middleware;
+
+use App\Http\Services\UserService;
+use App\Http\Utils\RequestHelper;
+use App\Http\Utils\Response;
+use App\Model\LoginModel;
+use Closure;
+
+
+class ApiAuthenticate
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (@$_REQUEST["debug"] == 100) {
+            $userInfo = ["user_id" => 1000, "user_name" => "admin"];
+        } else {
+            //来自不一样的端，判断是否已经登录
+            $source = $request->header("source"); //来源端：内部后台:pc  云芯系统：yunxin App: app 小程序：h5_app
+            $token = $request->header("token");
+            if ($token == "") {
+                Response::setError("参数 token 不得为空");
+            }
+
+            if ($source == 'yunxin') {
+                $cloud_user_info = UserService::getCloudSupplierCmsInfo($token);
+                if (empty($cloud_user_info)) {
+                    Response::setError("请先登录");
+                }
+                $userInfo = ['user_id' => $cloud_user_info['userId'], "user_name" => $cloud_user_info['name'], 'email' => $cloud_user_info['email']];
+
+                // 设置请求平台类型
+                RequestHelper::setClientType($source);
+
+            } else {
+                // to do 待优化
+                $Redis = \RedisDB::connection();
+                $userInfoKey = $Redis->keys('frq_login_' . $token . "*");
+                $userInfo = count($userInfoKey) ? $Redis->get($userInfoKey[0]) : "";
+                if (empty($userInfo)) {
+                    Response::setError("请先登录");
+                }
+                $userInfo = \GuzzleHttp\json_decode($userInfo, true);
+            }
+        }
+
+        // 设置请求用户信息
+        RequestHelper::setUser($userInfo);
+        return $next($request);
+    }
+
+}

app/Http/Services/UserService.php

+<?php
+
+namespace App\Http\Services;
+
+class UserService
+{
+    public static function getCloudSupplierCmsInfo($token)
+    {
+        $http = new \GuzzleHttp\Client;
+        $url = Config('website.cloud_domain') . "/api/user/getsupplier.cmsinfo";
+        $response = $http->get($url, ['query' => ['token' => $token]]);
+        $stringBody = (string)$response->getBody();
+        $res = json_decode($stringBody, true);
+        if ($res && is_array($res) && ($res['err_code'] === 0)) {
+            $cms_info = $res['data'];
+        } else {
+            throw new \Exception("查询cms用户信息失败");
+        }
+        return $cms_info;
+    }
+}

app/Http/Utils/ApiCode.php

+<?php
+
+namespace App\Http\Utils;
+interface ApiCode
+{
+    const API_CODE_SUCCESS = 0;//接口请求成功
+
+    const API_CODE_ERROR = 1001;//接口请求失败
+
+    const API_CODE_DATA_INVALID = 1001;//数据校验失败
+
+    const API_CODE_UNLOGINED = 1001;//未登陆
+
+    const API_CODE_DATA_EMPTY = 1003;//数据为空
+
+    const API_CODE_NODATA = 20001;//没有数据
+
+    const API_CODE_PARAM_REQUIRED = -1;//参数缺失
+
+    const API_CODE_INQUIRY_HAS_BEEN_TAKEN = -1;//询价已被领取
+
+     const API_CODE_TAKE_INQUIRY_ERROR = -1;//领取询价失败
+}
\ No newline at end of file

app/Http/Utils/Response.php

+<?php
+
+namespace App\Http\Utils;
+
+class Response
+{
+    public static function setError($errMsg, $errCode = ApiCode::API_CODE_ERROR, $data = null)
+    {
+        echo json_encode(['code' => $errCode, 'msg' => $errMsg, 'data' => $data], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+        exit();
+    }
+
+    public static function setSuccess($data, $code = ApiCode::API_CODE_SUCCESS, $msg = "")
+    {
+        echo json_encode(['code' => $code, 'msg' => $msg, 'data' => $data], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+        exit();
+    }
+}
\ No newline at end of file

app/Http/routes.php

@@ -7,6 +7,30 @@
 //    Route::match(['get', 'post'],'/api/{key}',          'ApiController@Entrance');
 //    Route::match(['get', 'post'],'/hd/{key}',           'HdController@Entrance');
 //});
+
+
+
+
 Route::match(['get', 'post'],'/hd/{key}',           'HdController@Entrance');
 Route::match(['get', 'post'],'/api/{key}',          'ApiController@Entrance');
-Route::match(['get', 'post'],'/server/{key}', 'ServerController@Entrance'); //对外提供导出回调接口
\ No newline at end of file
+Route::match(['get', 'post'],'/server/{key}', 'ServerController@Entrance'); //对外提供导出回调接口
+
+/*******************询价管理*************************/
+//Route::Get('/api/ApiSkuList','InquiryController@ApiSkuList');//新增询价查询sku接口;
+//Route::Get('/api/ApiBrandList','InquiryController@ApiBrandList');//新增询价查询品牌接口;
+//Route::Post('/api/ApiCheckGoods','ApiController@ApiCheckGoods');//检查是否已经存在询价单;
+//Route::Post('/api/ApiCreateOneItems','ApiController@ApiCreateOneItems');//创建一条明细;
+//Route::Post('/api/ApiDeleteInquiryItems','ApiController@ApiDeleteInquiryItems');//删除一条明细;
+//Route::Post('/api/ApiEditInquiry','ApiController@ApiEditInquiry');//新增询价;
+//Route::Post('/api/ApiDeleteInquiryItems','ApiController@ApiDeleteInquiryItems');//删除询价列表;
+//Route::Get('/api/ApiInquiryList','ApiController@ApiInquiryList');//询价列表;
+//Route::Post('/api/ApiInquiryExport','ApiController@ApiInquiryExport');//导出询价;
+//Route::Post('/api/ApiInquiryClose','InquiryController@close');//关闭询价;
+
+/*******************报价管理*************************/
+//Route:Post('/api/ApiInquiryListPool','ApiController@ApiInquiryListPool');//询价池;
+//Route:Post('/api/ApiTakeInquiry','ApiController@ApiTakeInquiry');//领取询价;
+//Route:Post('/api/ApiQuoteList','ApiController@ApiQuoteList');//报价列表;
+/*******************操作日志*************************/
+//Route::Post('/api/ApiOperationLog','ApiController@ApiOperationLog');
+

app/Http/routes/api.php

+<?php
+
+
+Route::Get('/ApiSkuList','SearchController@getSkuList');//新增询价查询sku接口;
+Route::Get('/ApiBrandList','SearchController@getBrandList');//新增询价查询品牌接口;
+Route::Post('/ApiCheckGoods','SearchController@checkUniqueGoods');//检查是否已经存在询价单;
+Route::Post('/ApiCreateOneItems','DataController@createInquiryItemsDetail');//创建一条询价明细;
+Route::Post('/ApiDeleteInquiryItems','DataController@deleteInquiryItemsDetail');//删除询价明细;
+Route::Post('/ApiEditInquiry','DataController@creatInquiry');//新增询价;
+Route::Post('/ApiUpdateOneItems','DataController@editInquiryItemDetail');//修改单条明细记录;
+Route::Get('/ApiInquiryList','SearchController@getInquiryList');//询价列表;
+Route::Post('/ApiInquiryListPool','SearchController@getInquiryListPool');//询价池;
+Route::Post('/ApiQuoteList','SearchController@getQuoteList');//报价列表;
+Route::Post('/ApiTakeInquiry','DataController@takeInquiry');//领取询价;
+Route::Get('/ApiSupplierList','SearchController@getApiSupplierList');//报价时查询供应商
\ No newline at end of file

app/Model/CommonModel.php

@@ -240,4 +240,33 @@ class CommonModel extends Model
         return  DB::connection('ass')->table('supplier_channel')->where('supplier_name', $supplier_name)->value('supplier_id');
     }
 
+    public function getSupplierList($supplier_name,$user_id){
+////        $code_id = DB::connection('mysql')->select("select code_id as channel_id from lie_intracode where admin_id =  ".$user_id);
+//        $lieIntracodeModel = new LieIntracodeModel();
+//        $lieSupplierChannelModel = new LieSupplierChannelModel();
+//        $code_id = $lieIntracodeModel->getCodeId($user_id);
+//        if(empty($code_id)){
+//            $channel_id = -1;
+//        }else{
+//            $channel_id = $code_id[0]['code_id'];
+//        }
+//
+////        $supplierInfo = $lieSupplierChannelModel->adminGetSupplierName($supplier_name);
+////        var_dump($supplierInfo);
+////        exit();
+//        if ($channel_id == 10000){
+//            $supplierInfo = DB::connection('ass')->select("select supplier_id as value, supplier_name as name from lie_supplier_channel where status = 2 and supplier_name like '%".$supplier_name."%' limit 1");
+//            echo json_encode($supplierInfo,JSON_UNESCAPED_UNICODE) ;
+//            exit();
+//        }
+//        $supplierInfo = DB::connection('ass')->select("select supplier_id as value, supplier_name as name from lie_supplier_channel where status = 2 and supplier_name like '%".$supplier_name."%' and channel_uid like '%".$channel_id."%' limit 10");
+//        echo json_encode($supplierInfo,JSON_UNESCAPED_UNICODE) ;
+        $supplierInfo = array();
+        $supplierInfoParam = array(
+            "value" => -1,
+            "name" => $supplier_name
+        );
+        array_push($supplierInfo,$supplierInfoParam);
+        echo json_encode($supplierInfo,JSON_UNESCAPED_UNICODE) ;
+    }
 }
\ No newline at end of file

app/Model/InquiryItemsAssignModel.php

@@ -17,6 +17,12 @@ class InquiryItemsAssignModel extends Model
 	const ASSIGN_TYPE_SELECTED = 2;
 
 
+	public function getUniqAssignUidsByInquiryItemIds($inquiry_item_ids)
+    {
+        $res = $this->select('assign_uid')->whereIn("inquiry_item_id", $inquiry_item_ids)->distinct()->get();
+        return ($res) ? $res->toArray() : [];
+    }
+
 	// 领取询价
 	public function assign($inquiry_items_id, $assign_uid, $types=1)
 	{
@@ -62,6 +68,15 @@ class InquiryItemsAssignModel extends Model
 		return $this->where($map)->delete();
 	}
 
+    public function clearOutAssign($inquiry_items_id){//清空指定人
+        $this->where("inquiry_items_id",$inquiry_items_id)->delete();
+    }
 
-
+    public function insertAssign($assignInsert){//插入指定人
+        $this->insert($assignInsert);
+    }
+    public function getAssignInfo($inquiry_items_id){
+        $assignInfo = $this->select("assign_uid")->where("inquiry_items_id",$inquiry_items_id)->get();
+        return $assignInfo;
+    }
 }
\ No newline at end of file

app/Model/InquiryItemsModel.php

 <?php
 namespace App\Model;
 
+use App\Http\Utils\ApiCode;
 use App\map\InquiryMap;
 use App\map\QuoteMap;
 use App\Model\InquiryItemsAssignModel;
@@ -20,6 +21,8 @@ class InquiryItemsModel extends Model
 	const CREATED_AT      = 'create_time';
 	const UPDATED_AT      = 'update_time';
 
+	const STATUS_CLOSE = -1;  // 状态-已关闭
+
 	public function fromDateTime($value)
 	{
 		return strtotime(parent::fromDateTime($value));
@@ -30,6 +33,16 @@ class InquiryItemsModel extends Model
         return $this->whereIn("id", $ids)->get()->toArray();
     }
 
+    public function getListByInquiryId($inquiry_id)
+    {
+        $res = $this->where("inquiry_id", $inquiry_id)->get();
+        return ($res) ? $res->toArray() : [];
+    }
+
+    public function closeByInquiryId($inquiry_id)
+    {
+        return $this->where("inquiry_id", $inquiry_id)->update(["status" => self::STATUS_CLOSE, "update_time" => time()]);
+    }
 
     //生成报价单详情
     public function ItemsOfferDetail($inquiry_id)
@@ -137,6 +150,7 @@ class InquiryItemsModel extends Model
 
 	//清空列表
     public function DeleteInquiryItems($input){
+
         if (@$input["inquiry_id"]){
             $del = $this->where(["inquiry_id"=>$input["inquiry_id"]])->delete();
         }
@@ -144,7 +158,7 @@ class InquiryItemsModel extends Model
             $del = $this->where(["id"=>$input["inquiry_items_id"]])->delete();
             $del = (new InquiryItemsReportModel())->where(["inquiry_items_id"=>$input["inquiry_items_id"]])->delete(); #同步输出报价表
         }
-        return [0,"删除成功"];
+        return [ApiCode::API_CODE_SUCCESS,"删除成功"];
     }
 
    /*
@@ -203,12 +217,12 @@ class InquiryItemsModel extends Model
         if (count($b) == 0 || $b == ""){
              return [1001,"插入数据不得为空"];
         }
-        if (empty($b["goods_name"])) return [1003, "请选择型号名称"];
-        if (empty($b["inquiry_id"])) return [1003, "询价单ID不得为空"];
-        if (empty($b["brand_s"])) return [1003, "请选择品牌名称"];
-        if (empty($b["inquiry_number"])) return [1003, "请输入询价数量"];
-        if (empty($b["batch"]))  return [1003, "请输入批次要求"];
-        if (empty($b["delivery_time"])) return [1003, "请选择交货日期"];
+        if (empty($b["goods_name"])) return [ApiCode::API_CODE_DATA_EMPTY, "请选择型号名称"];
+        if (empty($b["inquiry_id"])) return [ApiCode::API_CODE_DATA_EMPTY, "询价单ID不得为空"];
+        if (empty($b["brand_s"])) return [ApiCode::API_CODE_DATA_EMPTY, "请选择品牌名称"];
+        if (empty($b["inquiry_number"])) return [ApiCode::API_CODE_DATA_EMPTY, "请输入询价数量"];
+        if (empty($b["batch"]))  return [ApiCode::API_CODE_DATA_EMPTY, "请输入批次要求"];
+        if (empty($b["delivery_time"])) return [ApiCode::API_CODE_DATA_EMPTY, "请选择交货日期"];
 
         try{
             $con = DB::connection('rfq');
@@ -283,10 +297,10 @@ class InquiryItemsModel extends Model
             ]);
 
             $con->commit();
-            return [0,"添加成功"];
+            return [ApiCode::API_CODE_SUCCESS,"添加成功"];
         }catch (\Exception $e) {
             $con->rollBack();
-            return [1001,"添加失败：".$e->getMessage()];
+            return [ApiCode::API_CODE_ERROR,"添加失败：".$e->getMessage()];
         }
     }
 
@@ -642,5 +656,29 @@ class InquiryItemsModel extends Model
         return  [0,"通过"];
     }
 
+    public function checkUniqueInquiryItemsDetail($input){//检查是否存在相同品牌信息的明细
+        $brandInfo = json_decode($input["brand_s"],true);
+        $check = $this->where(["inquiry_id"=>$input["inquiry_id"],"goods_name"=>$input["goods_name"],"brand_name"=>$brandInfo[0]["name"]])->count();
+        return $check;
+    }
 
+    public function updateInquiryItemsStatus($inquiryItemsId,$status){
+        $this->where('id', $inquiryItemsId)->update(['status' => $status]); // 存在指定采购，则标记状态为已领取
+    }
+    public function hasItems($inquiry_id){//判断是否存在明细
+        $hasItems = $this->where("inquiry_id",$inquiry_id)->count();
+        return $hasItems;
+    }
+    public function getInquiryItems($inquiry_id){
+        $inquiry_items = (new InquiryItemsModel())->where("inquiry_id",$inquiry_id)->get()->toArray();
+        return $inquiry_items;
+    }
+
+    public function updateInquiryItemsDetail($inquiry_items_id,$updateArr){
+        $this->where("id",$inquiry_items_id)->update($updateArr);
+    }
+    public function getItemArr($inquiry_items_id){
+        $itemArr =  $this->where("id",$inquiry_items_id)->first()->toArray(); #明细
+        return $itemArr;
+    }
 }
\ No newline at end of file

app/Model/InquiryItemsReportModel.php

@@ -236,5 +236,8 @@ class InquiryItemsReportModel extends Model
         return $check != count($itemsIdArr) ? [1001,$types == 1 ? "存在没选中的询价单！":"存在没确定的询价单！"] : [0,"通过"];
     }
 
+    public function updateIquiryItemsReport($item,$reportArr){
+        $this->where("inquiry_items_id", $item['id'])->update($reportArr);
+    }
 
 }
\ No newline at end of file

app/Model/InquiryModel.php

@@ -27,6 +27,12 @@ class InquiryModel extends Model
         return $this->whereIn("id", $ids)->get()->toArray();
     }
 
+    public function getInfoById($id)
+    {
+        $res = $this->where("id", $id)->first();
+        return ($res) ? $res->toArray() : [];
+    }
+
     /**
      * 询价列表
      */
@@ -183,7 +189,7 @@ class InquiryModel extends Model
             if ($export == 0){
                 $res = $Redis->SISMEMBER('frq_quote_urge', $v['id']);
                 if ($res) {
-                    $v['inquiry_sn'] = $v['inquiry_sn'] . "<span style='color:red;'>&nbsp;*</span>";
+                    $v['inquiry_sn'] = $v['inquiry_sn'] . "<span style='color:#f2f2f2;'>&nbsp;*</span>";
                 }
             }
 
@@ -231,6 +237,14 @@ class InquiryModel extends Model
         return [0, "关闭整个询价单成功"];
     }
 
+    public function closeById($inquiry_id, $remark = '', $user_name = '')
+    {
+        if (empty(@$inquiry_id)) {
+            return false;
+        }
+        return $this->where("id", $inquiry_id)->update(["status" => -1, "remark" => $remark, "update_time" => time()]);
+    }
+
     /**
      * 询价池
      */
@@ -557,6 +571,9 @@ class InquiryModel extends Model
         $res = $con->select($sql1);
         return @$res[0]["count"];
     }
-
+    public function getMainArr($itemArr){//获取主表单状态
+        $mainArr =  $this->where("id",$itemArr["inquiry_id"])->first()->toArray();
+        return $mainArr;
+    }
 
 }
\ No newline at end of file

app/Model/InquiryUsersModel.php

@@ -20,5 +20,13 @@ class InquiryUsersModel extends Model
     protected $primaryKey='id';
     public $timestamps = false;
 
+    public function getUserInfo($input,$user){
+        $userInfo= (new InquiryUsersModel())->where(["create_uid" => $input["user_id"], "user_name" => $user[0]["name"]])->first();
+        return $userInfo;
+    }
 
+    public function getUserId($input,$user){
+        $userId = $this->insertGetId(["create_uid" => $input["user_id"], "user_name" => $user[0]["name"], "create_time" => time()]);
+        return $userId;
+    }
 }
\ No newline at end of file

app/Model/LieBrandModel.php

+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LieBrandModel extends Model
+{
+    protected $connection = 'spu';
+    protected $table      = 'brand';
+    protected $primaryKey = 'brand_id';
+    public function getBrandList($k,$types=1){
+        if ($types == 1) { #模糊搜索
+            $brandInfoList = $this->select('brand_name','brand_id')->where('brand_name','like','%'.$k.'%')->get()->toArray();
+            $brandInfo = [];
+            foreach ($brandInfoList as $k=>$v){
+                array_push($brandInfo,["value"=>$v["brand_id"],"name"=>$v["brand_name"]]);
+            }
+            if (count($brandInfo) == 0){
+                $brandInfo = [["value"=>"0","name"=>$k]];
+            }
+            echo json_encode($brandInfo,JSON_UNESCAPED_UNICODE) ;
+            exit();
+        }
+        if ($types == 2) { #模糊搜索
+            $brandInfo = $this->select("select brand_id as value,brand_name as name from lie_brand where  brand_name like '%".$k."%' limit 10");
+            echo json_encode($brandInfo,JSON_UNESCAPED_UNICODE) ;
+            exit();
+        }
+        if ($types == 3){ #精确搜索
+            $brandInfo = $this->select("select brand_id as brand_id,brand_name as name from lie_brand where  brand_name = '".$k."' limit 1");
+            if (!$brandInfo){
+                return false;
+            }else{
+                return $brandInfo[0]["brand_id"];
+            }
+        }
+    }
+}

app/Model/LieIntracodeModel.php

+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LieIntracodeModel extends Model
+{
+    protected $connection = 'mysql';
+    protected $table      = 'lie_intracode';
+    protected $primaryKey = 'code_id';
+
+    public function getCodeId($userId){
+        $codeId = $this->select('code_id')->where('admin_id',$userId)->get()->toArray();
+        return $codeId;
+    }
+}

app/Model/LieSupplierChannelModel.php

+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+
+
+class LieSupplierChannelModel extends Model
+{
+    protected $connection = 'ass';
+    protected $table      = 'supplier_channel';
+    protected $primaryKey = 'supplier_id';
+
+    public function buyerGetSupplierName($userId,$supplier_name){
+        $supplier_names = $this->select(DB::raw(' supplier_id as value, supplier_name as name'))->where('status',2)->where('supplier_name','like','%'.$supplier_name.'%')->where('channel_uid','like','%'.$userId.'%')->limit(10)->get()->toArray();
+        return $supplier_names;
+    }
+
+    public function adminGetSupplierName($supplier_name){
+        $supplier_names = $this->select(DB::raw(' supplier_id as value, supplier_name as name'))->where('status',2)->where('supplier_name','like','\'%'.$supplier_name.'%\'')->limit(10)->get()->toArray();
+        return $supplier_names;
+    }
+}

app/Providers/RouteServiceProvider.php

@@ -37,9 +37,9 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map(Router $router)
     {
-        $this->mapWebRoutes($router);
+        $this->mapApiRoutes($router);
 
-        //
+        $this->mapWebRoutes($router);
     }
 
     /**
@@ -58,4 +58,16 @@ class RouteServiceProvider extends ServiceProvider
             require app_path('Http/routes.php');
         });
     }
+
+    protected function mapApiRoutes(Router $router)
+    {
+        $router->group([
+            'prefix' => "api",
+            'namespace' => $this->namespace,
+            "middleware" => 'auth.api',
+        ], function ($router) {
+            require app_path('Http/routes/api.php');
+        });
+    }
+
 }