Merge branch 'zjl_crm_v3_20210903' into development

app/Http/Controllers/AddOrderController.php

@@ -186,7 +186,7 @@ Class AddOrderController extends Controller
                 if ($order_user_limit) {
                     $count = $CrmModel->getSaleOrderUserCount($request->user->userId);
 
-                    if ($count >= $order_user_limit) return ['errcode'=>11001, 'errmsg'=>'你已达到成交用户上限，请先释放你跟进的已下单用户或联系主管重新分配当前用户'];
+                    if ($count > $order_user_limit) return ['errcode'=>11001, 'errmsg'=>'你已达到成交用户上限，请先释放你跟进的已下单用户或联系主管重新分配当前用户'];
                 }                
 
                 $res = $CrmModel->isBind($user->user_id, $operator_id);

app/Http/Controllers/OrderController.php

@@ -934,7 +934,7 @@ Class OrderController extends Controller
             if ($order_user_limit) {
                 $count = $CrmModel->getSaleOrderUserCount($request->user->userId);
 
-                if ($count >= $order_user_limit) return ['errcode'=>11001, 'errmsg'=>'你已达到成交用户上限，请先释放你跟进的已下单用户或联系主管重新分配当前用户'];
+                if ($count > $order_user_limit) return ['errcode'=>11001, 'errmsg'=>'你已达到成交用户上限，请先释放你跟进的已下单用户或联系主管重新分配当前用户'];
             }             
 
             $perm = new PermController; 

app/Model/CrmModel.php

@@ -52,7 +52,7 @@ class CrmModel extends Model
 
         if (empty($users)) return 0;
 
-        return OrderModel::whereIn('user_id', $users)->groupBy('user_id')->get()->count(); // 去重＋统计 laravel需要先get()
+        return OrderModel::whereIn('user_id', $users)->where('status', '<>', -1)->groupBy('user_id')->get()->count(); // 去重＋统计 laravel需要先get()
     }