客户转让

app/controller/CustomerController.php

@@ -393,25 +393,21 @@ class CustomerController
     public function cede(Request $request)
     {
         $customerId = Util::getParam($request, 'customer_id');
-        $user_sn = Util::getParam($request, 'user_sn');
+        $userId = Util::getParam($request, 'user_id');
-        $userId = $request->user['id'];
+        $selfId = $request->user['id'];
-        if (Util::isEmpty($user_sn)) {
+        if (Util::isEmpty($userId)) {
-            return Util::fail([], 'ID'.trans('not_null'));
+            return Util::fail([], 'user_id'.trans('not_null'));
+        }
+        if (Util::isEmpty($customerId)) {
+            return Util::fail([], 'customer_id'.trans('not_null'));
         }
 
-        $user = User::where(['sn' => $user_sn])->first();
+        $user = User::where(['id' => $userId])->first();
         if (Util::isEmpty($user)) {
             return Util::fail(null, trans('user_none'));
         }
 
-        if(Util::isEmpty($customerId)){
+        $query= Customer::where('user_id',$selfId)->whereIn('id',$customerId);
-            $data = [
-                'user_id' => $userId
-            ];
-            $query= Customer::where($data);
-        }else{
-            $query= Customer::whereIn('id',explode(',',$customerId));
-        }
         $customer = $query->get();
 
         foreach ($customer as $item) {

app/controller/UserController.php

@@ -374,7 +374,7 @@ class UserController
             return Util::fail([], trans('param_error'));
         }
         $data = [
-            'language' => $language,
+//            'language' => $language,
         ];
 
         $res = User::where('id', $id)

app/middleware/AuthMiddleware.php

@@ -86,8 +86,10 @@ class AuthMiddleware implements MiddlewareInterface
             // 将用户ID存入请求对象，供后续使用
 //            $request->user = ['id' => $userId];
             $request->user = $user;
+            $request->language = $request->header('fdesk-language');
+
 //            locale($user['language']);
-            locale('zh_CN');
+            locale($request->language);
             return $handler($request);
         } catch (BusinessException $e) {
             return json(['code' => 401, 'msg' => $e->getMessage()]);