客户批量打标签处理 调试

app/Console/Commands/ChatGroup/GroupBasicInfo.php

@@ -84,12 +84,13 @@ class GroupBasicInfo extends Command
     private function getGroupInfo($corpid, $userIds, $source)
     {
         # owner_filter参数处理
-        $userIdList = DjUser::select(['user_id'])->where('corpid', $corpid)->where('enable', 1)
-            ->where(function($query) use($userIds) {
-                if($userIds) $query->whereIn('user_id', $userIds);
-            })
-            ->where('status', 1)->orderBy('id')
-            ->distinct()->pluck('user_id')->toArray();
+//        $userIdList = DjUser::select(['user_id'])->where('corpid', $corpid)->where('enable', 1)
+//            ->where(function($query) use($userIds) {
+//                if($userIds) $query->whereIn('user_id', $userIds);
+//            })
+//            ->where('status', 1)->orderBy('id')
+//            ->distinct()->pluck('user_id')->toArray();
+        $userIdList = DjUser::getActiveUserListById($corpid, $userIds);
 
         $userCount = count($userIdList);
         # 需要截取的段数

app/Console/Commands/CorpInformation/BatchMarkTagNew.php

@@ -77,39 +77,26 @@ class BatchMarkTagNew extends Command
         $taskInfo = json_decode(json_encode($taskInfo), 1);
         BatchMarkTag::updateStatus($taskId, 2);
 
-        # 客服许可(兼容新授权到系统的企微，此种企微的客服没有许可，但是会有75天的试用期)
-        $corpInfo = AuthorizeCorp::getCorpInfo($taskInfo['corpid']);
-        if(!empty($corpInfo)) {
-            $chargeActiveType = 1;
-            $activeUserList = [];
-            if (strtotime($corpInfo->created_at) <= strtotime('-75 days')) {
-                $chargeActiveType = 2;
-                $activeUserList = DjUser::getActiveUserListById($taskInfo['corpid'], []);
-                $activeUserList = json_decode(json_encode($activeUserList), 1);
-                if(empty($activeUserList)) {
-                    # 选择的客服列表全部没有许可，不去查询客户列表，直接更新状态
-                    $status = -1;
-                    BatchMarkTag::updateStatus($taskId, $status);
-                    Log::logError('所属企微的客服全部没有许可信息', ['task_id' => $taskId, 'corpid' => $taskInfo['corpid']], $this->logName);
-                    return false;
-                }
-            }
-
-            # 直接筛选出要处理的客户列表，方便生成记录表数据
-            if(0 == $taskInfo['select_all']) {
-                $this->dealSelectTask($taskInfo, $chargeActiveType, $activeUserList);
-            } else {
-                $this->dealFilterTask($taskInfo, $chargeActiveType, $activeUserList);
-            }
-        } else {
+        $activeUserList = DjUser::getActiveUserListById($taskInfo['corpid']);
+        if(empty($activeUserList)) {
+            # 选择的客服列表全部没有许可，不去查询客户列表，直接更新状态
             $status = -1;
             BatchMarkTag::updateStatus($taskId, $status);
-            Log::logError('企微信息异常', ['task_id' => $taskId], $this->logName);
-            EmailQueue::rPush('客户批量打标签-企微信息查询异常', 'task_id:'.$taskId, $this->emailReceiver, $this->emailSender);
+            Log::logError('所属企微的客服全部没有许可信息', ['task_id' => $taskId, 'corpid' => $taskInfo['corpid']], $this->logName);
+            return false;
         }
+
+
+        # 直接筛选出要处理的客户列表，方便生成记录表数据
+        if(0 == $taskInfo['select_all']) {
+            $this->dealSelectTask($taskInfo, $activeUserList);
+        } else {
+            $this->dealFilterTask($taskInfo, $activeUserList);
+        }
+
     }
 
-    private function dealSelectTask($taskInfo, $chargeActiveType, $activeUserList) {
+    private function dealSelectTask($taskInfo, $activeUserList) {
         $customerList = json_decode($taskInfo['customer_list'], 1);
         $taskId = $taskInfo['id'];
         $corpid = $taskInfo['corpid'];
@@ -125,7 +112,7 @@ class BatchMarkTagNew extends Command
         }
 
         foreach ($userCustomerList as $userId => $childCustomerIdListArr) {
-            if(2 == $chargeActiveType && !in_array($userId, $activeUserList)) {
+            if(!in_array($userId, $activeUserList)) {
                 Log::logInfo('客服无许可，跳过', ['user_id' => $userId, 'customer_list' => $childCustomerIdListArr], $this->logName);
                 continue;
             }
@@ -180,10 +167,11 @@ class BatchMarkTagNew extends Command
         return $data;
     }
 
-    private function dealFilterTask($taskInfo, $chargeActiveType, $activeUserList)
+    private function dealFilterTask($taskInfo, $activeUserList)
     {
         $params = json_decode($taskInfo['params'], 1);
         $params['corpid'] = $taskInfo['corpid'];
+        $params['user_id_list'] = !is_array($params['user_id_list']) ? json_decode($params['user_id_list']) : $params['user_id_list'];
         $source = 1;
 
         $filterCustomerList = json_decode($taskInfo['filter_customer_list'], 1);
@@ -196,11 +184,7 @@ class BatchMarkTagNew extends Command
         # 先查询出所有需要执行的客服，再按照客服来查询客户列表
         $userIdList = $params['user_id_list'];
         if (empty($userIdList)) {
-            if (1 == $chargeActiveType) {
-                $userIdList = DjUser::query()->where('corpid', $taskInfo['corpid'])->where('enable', 1)->pluck('user_id')->toArray();
-            } else {
-                $userIdList = $activeUserList;
-            }
+            $userIdList = $activeUserList;
         } else {
             $userIdList = array_intersect($params['user_id_list'], $activeUserList);
         }

app/Models/DjUser.php

@@ -225,11 +225,22 @@ class DjUser extends Model
             ->where('corpid', $corpid)->get()->pluck('user_id');
     }
 
-    public static function getActiveUserListById($corpid, $userIdList)  {
-        return self::query()->where('corpid', $corpid)->where(function($query) use($userIdList){
-            if(!empty($userIdList)) $query->whereIn('user_id', $userIdList);
-        })->where('enable', 1)->where('status', 1)->where('is_active', 1)
-            ->pluck('user_id');
+    public static function getActiveUserListById($corpid, $userIdList = null)  {
+        $corpInfo = AuthorizeCorp::getCorpInfo($corpid);
+        # 客服许可(兼容新授权到系统的企微，此种企微的客服没有许可，但是会有75天的试用期)
+        if(!empty($corpInfo)) {
+            $model = self::query()->where('corpid', $corpid)->where(function ($query) use ($userIdList) {
+                if (!empty($userIdList)) $query->whereIn('user_id', $userIdList);
+            })->where('enable', 1)->where('status', 1);
+
+            if (strtotime($corpInfo->created_at) <= strtotime('-75 days')) {
+                $model = $model->where('is_active', 1);
+            }
+
+            return $model->pluck('user_id')->toArray();
+        } else {
+            return [];
+        }
     }
 
     public static function getActiveUserListByPage($startId, $limit, $corpid = null) {

app/Service/ChatGroup/ChatGroupService.php

@@ -848,9 +848,10 @@ class ChatGroupService
         Log::logInfo('start', [time()], 'syncCorpChatGroup');
         try{
             # owner_filter参数处理
-            $userIdList = DjUser::select(['user_id'])->where('corpid', $corpid)->where('enable', 1)
-                ->where('status', 1)->orderBy('id')
-                ->distinct()->pluck('user_id')->toArray();
+//            $userIdList = DjUser::select(['user_id'])->where('corpid', $corpid)->where('enable', 1)
+//                ->where('status', 1)->orderBy('id')
+//                ->distinct()->pluck('user_id')->toArray();
+            $userIdList = DjUser::getActiveUserListById($corpid);
 
             if(empty($userIdList)) {
                 return ['待同步成员列表为空', 2014];