Merge branch 'zjl_inquiry_order_20210311'

app/Http/Controllers/AddOrderController.php

@@ -180,16 +180,16 @@ Class AddOrderController extends Controller
             if (strpos($_SERVER['HTTP_HOST'], 'sz') === false) { // 非测试环境下执行
                 // 若用户已分配，则判断当前登录客服是否能给用户下单，若没分配，按之前流程，订单生成时分配给当前登录客服
                 $CrmModel = new CrmModel();
-                //$sale_id = $CrmModel->getSaleId($user->user_id);
+                $sale_id = $CrmModel->getSaleId($user->user_id);
 
-                //if ($sale_id && $sale_id != $operator_id) {
-                //    $CmsModel = new CmsModel();
-                //    $sale_name = $CmsModel->getUserName($sale_id);
-                //   return ['errcode' => -1, 'errmsg' => '该客户由 '.$sale_name.' 跟进，请联系主管重新指派'];
-                //}
+                if ($sale_id && $sale_id != $operator_id) {
+                   $CmsModel = new CmsModel();
+                   $sale_name = $CmsModel->getUserName($sale_id);
+                   return ['errcode' => -1, 'errmsg' => '该客户由 '.$sale_name.' 跟进，请联系主管重新指派'];
+                }
 
-                $res = $CrmModel->isBind($user->user_id, $operator_id);
-                if (!$res) return ['errcode'=>-1, 'errmsg'=>'当前用户与登录客服无绑定关系'];
+                // $res = $CrmModel->isBind($user->user_id, $operator_id);
+                // if (!$res) return ['errcode'=>-1, 'errmsg'=>'当前用户与登录客服无绑定关系'];
             }     
             
             $address = DB::connection('order')->table('lie_user_address')->where('user_id', $user->user_id)->select('address_id', 'consignee')->get(); // 收货地址