cqp пре 2 месеци
родитељ
комит
9f4253b657
3 измењених фајлова са 29 додато и 2 уклоњено
  1. 13 0
      app/Http/Controllers/Api/CustomerController.php
  2. 15 1
      app/Service/CustomerService.php
  3. 1 1
      routes/wx.php

+ 13 - 0
app/Http/Controllers/Api/CustomerController.php

@@ -72,6 +72,19 @@ class CustomerController extends BaseController
         }
     }
 
+    public function customerWxList(Request $request)
+    {
+        $service = new CustomerService();
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->customerWxList($request->all(),$userData);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function customerRepeatList(Request $request)
     {
         $service = new CustomerService();

+ 15 - 1
app/Service/CustomerService.php

@@ -703,7 +703,7 @@ class CustomerService extends Service
      * @param $user
      * @return array
      */
-    public function customerList($data,$user){
+    public function customerWxList($data,$user){
         $model = $this->customerCommonSearch($data,$user);
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list,$data, $user);
@@ -716,6 +716,20 @@ class CustomerService extends Service
         return [true, $list];
     }
 
+    /**
+     * 客户列表
+     * @param $data
+     * @param $user
+     * @return array
+     */
+    public function customerList($data,$user){
+        $model = $this->customerCommonSearch($data,$user);
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillData($list,$data, $user);
+
+        return [true, $list];
+    }
+
     public function customer2CommonSearch($data,$user){
         $model = Customer::Clear($user,$data);
         $model = $model->where('del_time',0)

+ 1 - 1
routes/wx.php

@@ -115,7 +115,7 @@ Route::group(['middleware'=> ['checkWx']],function ($route){
     $route->any('getSettingTotal2', 'Api\ScheduleController@getSettingTotal2');
     $route->any('getSettingGetDetail2', 'Api\ScheduleController@getSettingGetDetail2');
     //客户
-    $route->any('customerList', 'Api\CustomerController@customerList');
+    $route->any('customerList', 'Api\CustomerController@customerWxList');
     $route->any('customerEdit', 'Api\CustomerController@customerEdit')->middleware('OssFileDeal');
     $route->any('customerAdd', 'Api\CustomerController@customerAdd')->middleware('OssFileDeal');
     $route->any('customerDel', 'Api\CustomerController@customerDel')->middleware('OssFileDeal');