app/Console/Commands/BatchMarkTag.php

@@ -45,6 +45,8 @@ class BatchMarkTag extends Command
 
     public function handle()
     {
+        //脚本废弃
+        return false;
         $this->info('开始执行');
         $time = time();
         $d = true;

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/BatchMarkTagDeal.php

@@ -0,0 +1,219 @@
+<?php
+
+namespace App\Console\Commands\CorpInformation;
+
+use App\Log;
+use App\Models\AuthorizeCorp;
+use App\Models\BatchMarkTag;
+use App\Models\BatchMarkTagRecord;
+use App\Models\CustomerDetails;
+use App\Models\DjUser;
+use App\Models\Tag;
+use App\RedisModel;
+use App\Service\TagService;
+use App\Support\EmailQueue;
+use App\Support\qyApi\QyCommon;
+use Illuminate\Console\Command;
+
+class BatchMarkTagDeal extends Command
+{
+    protected $signature = 'BatchMarkTagDeal';
+    protected $description = '客户批量打标签处理';
+
+    protected $emailSender = '猎羽-批量打标签';
+    protected $emailReceiver = ['song.shen@kuxuan-inc.com'];
+    protected $logName = 'BatchMarkTagDeal';
+
+    public function handle()
+    {
+        \DB::connection()->disableQueryLog();
+
+        $beginTime = time();
+        $this->info(date('m-d H:i:s') . ' 开始整理');
+
+        while(true) {
+            $result = $this->taskDeal();
+            if(!$result) sleep(1);
+            $now = time();
+            // 超过10分钟，主动停止循环
+            if ($now - $beginTime > 600) {
+                break;
+            }
+
+            sleep(1);
+        }
+
+        $this->info(date('Y-m-d H:i:s') . ' 整理结束');
+    }
+
+    private function taskDeal()
+    {
+        # 取出数据
+        $redisVal = RedisModel::rPop(BatchMarkTagRecord::BATCH_MARK_TAG_RECORD);
+        if(empty($redisVal))
+            return false;
+        try {
+            $this->createTask($redisVal);
+        } catch (\Exception $e) {
+            EmailQueue::rPush('客户批量打标签处理任务出现异常', $e->getTraceAsString(), $this->emailReceiver, $this->emailSender);
+            Log::logError('程序异常', [
+                'line'  => $e->getLine(), 'msg'   => $e->getMessage(), 'param' => $redisVal
+            ], $this->logName);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private function createTask($redisVal) {
+        $redisData = json_decode($redisVal, 1);
+        if(empty($redisData) || empty($redisData['task_id']) || empty($redisData['record_id'])) {
+            Log::logError('队列数据异常', [$redisData], $this->logName);
+            EmailQueue::rPush('处理客户批量打标签 - 队里数据异常', $redisVal, $this->emailReceiver, $this->emailSender);
+            return false;
+        }
+
+        $taskId = $redisData['task_id'];
+        $recordId = $redisData['record_id'];
+        $taskInfo = BatchMarkTag::getTaskInfoById($redisData['task_id']);
+        if(empty($taskInfo)) {
+            Log::logError('根据任务ID查询任务信息失败', ['task_id' => $taskId], $this->logName);
+            EmailQueue::rPush('处理客户批量打标签 - 根据任务ID查询任务信息失败', $redisVal, $this->emailReceiver, $this->emailSender);
+            $status = -1;
+            BatchMarkTagRecord::updateData($recordId, ['status' => $status]);
+            return false;
+        }
+
+        $taskInfo = json_decode(json_encode($taskInfo), 1);
+
+        $recordInfo = BatchMarkTagRecord::getInfoById($recordId);
+        if(empty($recordInfo)) {
+            Log::logError('根据记录ID查询记录信息失败', ['record_id' => $recordId], $this->logName);
+            EmailQueue::rPush('处理客户批量打标签 - 根据记录ID查询记录信息失败', $redisVal, $this->emailReceiver, $this->emailSender);
+            $status = -1;
+            BatchMarkTagRecord::updateData($recordId, ['status' => $status]);
+            return false;
+        }
+
+        $recordInfo = json_decode(json_encode($recordInfo), 1);
+
+        $this->dealTask($taskInfo, $recordInfo);
+    }
+
+    private function dealTask($taskInfo, $recordInfo) {
+        $externalUserIdList = explode(',', $recordInfo['external_userid_list']);
+        if(empty($externalUserIdList)) {
+            Log::logError('根据记录ID查询记录信息失败', ['record_id' => $recordInfo['id']], $this->logName);
+            EmailQueue::rPush('处理客户批量打标签 - 根据记录ID查询记录信息失败', 'task_id:'.$taskInfo['id'].'; record_id:'.$recordInfo['id'], $this->emailReceiver, $this->emailSender);
+            $status = -1;
+            BatchMarkTagRecord::updateData($recordInfo['id'], ['status' => $status]);
+            return false;
+        }
+
+        $tagList = json_decode($taskInfo['tag_list'], 1);
+        // 标签转化
+        $newTagList = Tag::query()->where('corpid', $taskInfo['corpid'])->where('enable', 1)
+            ->whereIn('tag_md5', $tagList)->get();
+        $newTagList = $newTagList->isNotEmpty() ? array_column($newTagList->toArray(), 'tag_id') : [];
+
+        $update = ['exec_success' => 0, 'exec_fail' => 0];
+        foreach ($externalUserIdList as $externalUserId) {
+            if(1 == $taskInfo['type']) {
+                $newAddTagIdList = $newTagList;
+                $newRemoveTagIdList = [];
+            } else if(2 == $taskInfo['type']) {
+                $newAddTagIdList = [];
+                $newRemoveTagIdList = $newTagList;
+            }
+
+            $res = $this->markTag($taskInfo['corpid'], $recordInfo['user_id'], $externalUserId, $newAddTagIdList, $newRemoveTagIdList);
+            if($res) {
+                $update['exec_success']++;
+            } else {
+                $update['exec_fail']++;
+            }
+        }
+
+        # 验证总数
+        if($update['exec_success'] + $update['exec_fail'] != $recordInfo['exec_total']) {
+            Log::logError('程序异常', ['record_id' => $recordInfo['id'], 'stat' => $update], $this->logName);
+            EmailQueue::rPush('客户批量打标签 - 处理数据总数与待处理数据总数不一致', json_encode(['record_id' => $recordInfo['id'], 'stat' => $update]), $this->emailReceiver, $this->emailSender);
+        }
+
+        # 更新任务状态
+        if($update['exec_fail'] == $recordInfo['exec_total']) {
+            $update['status'] = -1;
+        } else {
+            $update['status'] = 1;
+        }
+        $res = BatchMarkTagRecord::updateData($recordInfo['id'], $update);
+        if(!$res) {
+            Log::logError('数据更新失败', ['record_id' => $recordInfo['id'], 'update' => $update], $this->logName);
+        }
+
+        # 判断总体任务是否执行完成
+        $this->chargeTaskStatus($taskInfo['id']);
+    }
+
+    private function markTag($corpid, $userId, $externalUserId, $newAddTagIdList, $newRemoveTagIdList, $retry = 0) {
+        $responseData = QyCommon::mark_tag($corpid, $userId, $externalUserId, $newAddTagIdList, $newRemoveTagIdList);
+
+        if(isset($responseData['errcode']) && $responseData['errcode'] == 0) {
+            // 编辑成功了
+            TagService::updateLocalCustomerTagSecond($corpid, $userId, $externalUserId, $newAddTagIdList, $newRemoveTagIdList);
+
+            $state = $data['state'] ?? null;
+            if (!is_null($state)) {
+                // 客户详情10s同步一遍
+                RedisModel::lPush(CustomerDetails::CUSTOMER_DATA_SYNC_RDS, json_encode([
+                    'corpid' => $corpid,
+                    'user_id' => $userId,
+                    'external_userid' => $externalUserId,
+                    'exec_time' => time() + 10
+                ]));
+            }
+
+            return true;
+        } else {
+           if( $responseData['errcode'] != 84061 ) { # 无法处理的状态码：没有好友关系
+                // 判断重试次数
+                if($retry <= 5) {
+                    $retry++;
+                    return $this->markTag($corpid, $userId, $externalUserId, $newAddTagIdList, $newRemoveTagIdList, $retry);
+                } else {
+                    $params = ['corpid' => $corpid, 'user_id' => $userId, 'external_userid' => $externalUserId, 'add_tag_id_list' => $newAddTagIdList, 'remove_tag_id_list' => $newRemoveTagIdList];
+                    // 还是一直失败，则不再请求，日志记录一下
+                    Log::logError('请求企微打标签接口3次重试均失败', [
+                        'param' => $params,
+                        'response' => $responseData,
+                    ], $this->logName);
+                    EmailQueue::rPush('请求企微打标签接口3次重试均失败', json_encode(['params' => $params, 'res' => $responseData], 256), $this->emailReceiver, $this->emailSender);
+                    return false;
+                }
+            } else {
+               //todo 隔1小时报警一次
+
+               return false;
+           }
+        }
+    }
+
+    private function chargeTaskStatus($taskId) {
+        $countData = BatchMarkTagRecord::recordCount($taskId);
+        $total = 0; $exec = 0;
+        if($countData->isNotEmpty()) {
+            foreach ($countData as $countInfo) {
+                if(0 == $countInfo->status) {
+                    $exec += $countInfo->count;
+                }
+
+                $total += $countInfo->count;
+            }
+        }
+
+        if($exec == 0) {
+            BatchMarkTag::updateStatus($taskId, 3);
+        }
+    }
+}

app/Console/Commands/CorpInformation/BatchMarkTagNew.php

@@ -0,0 +1,227 @@
+<?php
+
+namespace App\Console\Commands\CorpInformation;
+
+use App\Log;
+use App\Models\AuthorizeCorp;
+use App\Models\BatchMarkTag;
+use App\Models\BatchMarkTagRecord;
+use App\Models\Customer;
+use App\Models\CustomerDetails;
+use App\Models\DjUser;
+use App\RedisModel;
+use App\Support\EmailQueue;
+use Illuminate\Console\Command;
+
+class BatchMarkTagNew extends Command
+{
+    protected $signature = 'BatchMarkTagNew';
+    protected $description = '执行客户批量打标签';
+
+    protected $page = 1;
+    protected $limit = 500; // 限制记录中的客户条数
+    protected $emailSender = '猎羽-批量打标签';
+    protected $emailReceiver = ['song.shen@kuxuan-inc.com'];
+    protected $logName = 'BatchMarkTagNew';
+
+    public function handle()
+    {
+        \DB::connection()->disableQueryLog();
+
+        $beginTime = time();
+        $this->info(date('m-d H:i:s') . ' 开始整理');
+
+        while(true) {
+            $result = $this->taskDeal();
+            if(!$result) sleep(1);
+            $now = time();
+            // 超过10分钟，主动停止循环
+            if ($now - $beginTime > 600) {
+                break;
+            }
+
+            sleep(1);
+        }
+
+        $this->info(date('Y-m-d H:i:s') . ' 整理结束');
+    }
+
+    private function taskDeal()
+    {
+        # 取出数据
+        $taskId = RedisModel::rPop(BatchMarkTag::BATCH_MARK_TAG);
+        if(empty($taskId))
+            return false;
+        try {
+            $this->createTask($taskId);
+        } catch (\Exception $e) {
+            EmailQueue::rPush('创建客户批量打标签出现异常', $e->getTraceAsString(), $this->emailReceiver, $this->emailSender);
+            Log::logError('创建客户批量打标签出现异常', [
+                'line'  => $e->getLine(), 'msg'   => $e->getMessage(), 'param' => $taskId
+            ], $this->logName);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private function createTask($taskId) {
+        $taskInfo = BatchMarkTag::getTaskInfoById($taskId);
+        if(empty($taskInfo)) {
+            Log::logError('根据任务ID查询任务信息失败', ['task_id' => $taskId], $this->logName);
+            EmailQueue::rPush('根据任务ID查询任务信息失败', 'task_id : ' . $taskId, $this->emailReceiver, $this->emailSender);
+            return false;
+        }
+
+        $taskInfo = json_decode(json_encode($taskInfo), 1);
+        BatchMarkTag::updateStatus($taskId, 2);
+
+        $activeUserList = DjUser::getActiveUserListById($taskInfo['corpid']);
+        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, $activeUserList);
+        } else {
+            $this->dealFilterTask($taskInfo, $activeUserList);
+        }
+
+    }
+
+    private function dealSelectTask($taskInfo, $activeUserList) {
+        $customerList = json_decode($taskInfo['customer_list'], 1);
+        $taskId = $taskInfo['id'];
+        $corpid = $taskInfo['corpid'];
+
+        if(!empty($customerList)) {
+            $userCustomerList = $this->dealSelectCustomerList($customerList, $this->limit);
+        } else {
+            Log::logError('所选择客户列表为空', ['task_id' => $taskId], $this->logName);
+            EmailQueue::rPush('客户批量打标签-所选择客户列表为空', 'task_id:'.$taskId, $this->emailReceiver, $this->emailSender);
+            $status = -1;
+            BatchMarkTag::updateStatus($taskId, $status);
+            return false;
+        }
+
+        foreach ($userCustomerList as $userId => $childCustomerIdListArr) {
+            if(!in_array($userId, $activeUserList)) {
+                Log::logInfo('客服无许可，跳过', ['user_id' => $userId, 'customer_list' => $childCustomerIdListArr], $this->logName);
+                continue;
+            }
+
+            foreach ($childCustomerIdListArr['list'] as $childCustomerIdList) {
+                $externalUserDataList = Customer::getCustomerInfoByIdList($corpid, $childCustomerIdList);
+
+                if($externalUserDataList->count() != count($childCustomerIdList)) {
+                    Log::logError('查询客户结果与预处理数据不一致', [
+                        'task_id' => $taskId, 'user_id' => $userId,
+                        'external_userid_list' => $externalUserDataList->toArray(),
+                        'child_customer_id_list' => $childCustomerIdList], $this->logName);
+                    EmailQueue::rPush('客户批量打标签-查询客户结果与预处理数据不一致', 'task_id:'.$taskId.'  user_id:'.$userId
+                        , $this->emailReceiver, $this->emailSender);
+                }
+
+                if($externalUserDataList->isNotEmpty()) {
+                    $externalUserIdList = $externalUserDataList->pluck('external_userid')->toArray();
+                    $result = BatchMarkTagRecord::savedData($taskId, $corpid, $userId, $externalUserIdList);
+
+                    if(!$result) {
+                        Log::logError('记录写入失败', ['task_info' => $taskInfo], $this->logName);
+                    } else {
+                        RedisModel::rPush(BatchMarkTagRecord::BATCH_MARK_TAG_RECORD, json_encode(['task_id' => $taskId, 'record_id' => $result->id]));
+                    }
+                }
+            }
+        }
+    }
+
+    # 遍历所选客户列表，按客服分组后数据分割，便于后续数据入库
+    private function dealSelectCustomerList($customerList, $limit): array
+    {
+        $data = [];
+        foreach ($customerList as $customerInfo) {
+            if(isset($data[$customerInfo['user_id']])) {
+                if ($limit != 0 && $data[$customerInfo['user_id']]['total'] % $limit == 0) {
+                    $key = count($data[$customerInfo['user_id']]['list']);
+                } else {
+                    $key = count($data[$customerInfo['user_id']]['list']) - 1;
+                }
+
+                $data[$customerInfo['user_id']]['list'][$key][] = $customerInfo['customer_id'];
+                $data[$customerInfo['user_id']]['total']++;
+            } else {
+                $key = 0;
+                $data[$customerInfo['user_id']]['list'][$key][] = $customerInfo['customer_id'];
+                $data[$customerInfo['user_id']]['total'] = 1;
+            }
+        }
+
+        return $data;
+    }
+
+    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);
+        if(!empty($filterCustomerList)) {
+            $newFilterCustomerList = $this->dealSelectCustomerList($filterCustomerList, 0);
+        } else {
+            $newFilterCustomerList = [];
+        }
+
+        # 先查询出所有需要执行的客服，再按照客服来查询客户列表
+        $userIdList = $params['user_id_list'];
+        if (empty($userIdList)) {
+            $userIdList = $activeUserList;
+        } else {
+            $userIdList = array_intersect($params['user_id_list'], $activeUserList);
+        }
+
+        foreach ($userIdList as $userId) {
+            $params['user_id_list'] = [$userId];
+            $page = 1;
+            $limit = 5000;
+            do {
+                $customerQuery = CustomerDetails::getCustomerBySearchNew($params, $source);
+                $count = $customerQuery->count();
+                if($count > 0) {
+                    $customerList = $customerQuery->selectRaw("customer_id, external_userid")
+                        ->offset(($page - 1) * $limit)->limit($limit)->get();
+
+                    $userFilterCustomerList = $newFilterCustomerList[$userId]['list'][0] ?? [];
+                    if (!empty($userFilterCustomerList)) {
+                        $newCustomerList = $customerList->whereNotIn('customer_id', $userFilterCustomerList)->all();
+                    } else {
+                        $newCustomerList = $customerList->all();
+                    }
+
+                    $userExternalUserIdList = array_column($newCustomerList, 'external_userid');
+                    $externalUserIdArr = array_chunk($userExternalUserIdList, $this->limit);
+                    foreach ($externalUserIdArr as $externalUserIdList) {
+                        $result = BatchMarkTagRecord::savedData($taskInfo['id'], $taskInfo['corpid'], $userId, $externalUserIdList);
+
+                        if (!$result) {
+                            Log::logError('记录写入失败', ['task_info' => $taskInfo], $this->logName);
+                        } else {
+                            RedisModel::rPush(BatchMarkTagRecord::BATCH_MARK_TAG_RECORD, json_encode(['task_id' => $taskInfo['id'], 'record_id' => $result->id]));
+                        }
+                    }
+                }
+
+
+                $page++;
+            } while ($count == $limit);
+        }
+    }
+}

app/Console/Kernel.php

@@ -48,6 +48,8 @@ use App\Console\Commands\CleanData;
 use App\Console\Commands\ContactChangeRecycle;
 use App\Console\Commands\CorpAccessTokenRefresh;
 use App\Console\Commands\CorpDataSync;
+use App\Console\Commands\CorpInformation\BatchMarkTagDeal;
+use App\Console\Commands\CorpInformation\BatchMarkTagNew;
 use App\Console\Commands\CorpInformation\CustomerPayTagDeal;
 use App\Console\Commands\CorpInformation\LossContactCntStat;
 use App\Console\Commands\CorpInformation\LossContactDeal;
@@ -477,6 +479,8 @@ class Kernel extends ConsoleKernel
         SyncYunXuanOrder::class,                // 同步云选联盟订单
         ECommerceUserActionsDataUpload::class,  // 电商直投订单数据回传
         OrganizationAccountGet::class,          // 查询组织下的广告主信息
+        BatchMarkTagNew::class,                 // 客户批量打标签任务分发（新）
+        BatchMarkTagDeal::class,                // 客户批量打标签任务处理
     ];
 
     /**

app/Http/Controllers/Api/CustomerController.php

@@ -181,34 +181,31 @@ class CustomerController extends Controller
             return self::returnValue($validator->getMessageBag(), 1102);
         }
 
-        $customerName = $request->input('customer_name'); // 客户名关键字
-        $userIdList = $request->input('user_id_list'); // 所属客服
-        $addDateStart = $request->input('add_date_start'); // 起始添加日期
-        $addDateEnd = $request->input('add_date_end'); // 截止添加日期
-        $lastPayTimeStart = $request->input('last_pay_time_start'); // 最近一次充值时间起始
-        $lastPayTimeEnd = $request->input('last_pay_time_end'); // 最近一次充值时间截止
-        $addWay = $request->input('add_way'); // 添加渠道
-        $gender = $request->input('gender'); // 客户性别
-        $payStatus = $request->input('pay_status'); // 付费状态
-        $payNumMin = $request->input('pay_num_min'); // 最小付费次数
-        $payNumMax = $request->input('pay_num_max'); // 最高付费次数
-        $tagType = $request->input('tag_type', 0); // 标签筛选类型 0未筛选 1满足其一 2同时满足 3无标签
-        $tagIdList = $request->input('tag_id_list'); // 标签列表
-        $lossStatus = $request->input('loss_status'); // 客户流失状态
-        $corpid = $request->input('corpid');
+        $params['customer_name'] = $request->input('customer_name'); // 客户名关键字
+        $params['user_id_list'] = $request->input('user_id_list'); // 所属客服
+        $params['add_date_start'] = $request->input('add_date_start'); // 起始添加日期
+        $params['add_date_end'] = $request->input('add_date_end'); // 截止添加日期
+        $params['last_pay_time_start'] = $request->input('last_pay_time_start'); // 最近一次充值时间起始
+        $params['last_pay_time_end'] = $request->input('last_pay_time_end'); // 最近一次充值时间截止
+        $params['add_way'] = $request->input('add_way'); // 添加渠道
+        $params['gender'] = $request->input('gender'); // 客户性别
+        $params['pay_status'] = $request->input('pay_status'); // 付费状态
+        $params['pay_num_min'] = $request->input('pay_num_min'); // 最小付费次数
+        $params['pay_num_max'] = $request->input('pay_num_max'); // 最高付费次数
+        $params['tag_type'] = $request->input('tag_type', 0); // 标签筛选类型 0未筛选 1满足其一 2同时满足 3无标签
+        $params['tag_id_list'] = $request->input('tag_id_list'); // 标签列表
+        $params['loss_status'] = $request->input('loss_status'); // 客户流失状态
+        $params['corpid'] = $request->input('corpid');
         $page = $request->input('page', 1);
         $pageSize = $request->input('page_size', 20);
         $source = $request->input('source', 1);
-        $lossTimeStart = $request->input('loss_time_start');
-        $lossTimeEnd = $request->input('loss_time_end');
-        $isNewCustomerNoLoss = $request->input('is_new_customer_no_loss');# 是否为新用户 0复粉 1新用户
-        $canReceive = $request->input('can_receive');       // 是否可正常接收群发消息 0否 1是
-        $retainedStatus = $request->input('retained_status');       // 是否在当前主体内还有留存 0否 1是
-
-        list($data, $count, $extra) = CustomerService::customerList($customerName, $userIdList, $addDateStart, $addDateEnd,
-            $addWay, $gender, $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid, $page,
-            $pageSize, $source, $lastPayTimeStart, $lastPayTimeEnd, $lossTimeStart, $lossTimeEnd,
-            $isNewCustomerNoLoss, $canReceive, $retainedStatus);
+        $params['loss_time_start'] = $request->input('loss_time_start');
+        $params['loss_time_end'] = $request->input('loss_time_end');
+        $params['is_new_customer_no_loss'] = $request->input('is_new_customer_no_loss');# 是否为新用户 0复粉 1新用户
+        $params['can_receive'] = $request->input('can_receive');       // 是否可正常接收群发消息 0否 1是
+        $params['retained_status'] = $request->input('retained_status');       // 是否在当前主体内还有留存 0否 1是
+
+        list($data, $count, $extra) = CustomerService::customerList($params, $page, $pageSize, $source);
         return self::returnPageValue($data, $count, $pageSize, $page, $extra);
     }
 
@@ -239,31 +236,28 @@ class CustomerController extends Controller
             return self::returnValue($validator->getMessageBag(), 1102);
         }
 
-        $customerName = $request->input('customer_name'); // 客户名关键字
-        $userIdList = $request->input('user_id_list'); // 所属客服
-        $addDateStart = $request->input('add_date_start'); // 起始添加日期
-        $addDateEnd = $request->input('add_date_end'); // 截止添加日期
-        $lastPayTimeStart = $request->input('last_pay_time_start'); // 最近一次充值时间起始
-        $lastPayTimeEnd = $request->input('last_pay_time_end'); // 最近一次充值时间截止
-        $addWay = $request->input('add_way'); // 添加渠道
-        $gender = $request->input('gender'); // 客户性别
-        $payStatus = $request->input('pay_status'); // 付费状态
-        $payNumMin = $request->input('pay_num_min'); // 最小付费次数
-        $payNumMax = $request->input('pay_num_max'); // 最高付费次数
-        $tagType = $request->input('tag_type', 0); // 标签筛选类型 0未筛选 1满足其一 2同时满足 3无标签
-        $tagIdList = $request->input('tag_id_list'); // 标签列表
-        $lossStatus = $request->input('loss_status'); // 客户流失状态
-        $corpid = $request->input('corpid');
-        $lossTimeStart = $request->input('loss_time_start');
-        $lossTimeEnd = $request->input('loss_time_end');
-        $isNewCustomerNoLoss = $request->input('is_new_customer_no_loss');# 是否为新用户 0复粉 1新用户
-        $canReceive = $request->input('can_receive');       // 是否可正常接收群发消息 0否 1是
-        $retainedStatus = $request->input('retained_status');       // 是否在当前主体内还有留存 0否 1是
-
-        $data = CustomerService::customerCountStat($customerName, $userIdList, $addDateStart, $addDateEnd,
-            $addWay, $gender, $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid,
-            $lastPayTimeStart, $lastPayTimeEnd, $lossTimeStart, $lossTimeEnd, $isNewCustomerNoLoss, $canReceive,
-            $retainedStatus);
+        $params['customer_name'] = $request->input('customer_name'); // 客户名关键字
+        $params['user_id_list'] = $request->input('user_id_list'); // 所属客服
+        $params['add_date_start'] = $request->input('add_date_start'); // 起始添加日期
+        $params['add_date_end'] = $request->input('add_date_end'); // 截止添加日期
+        $params['last_pay_time_start'] = $request->input('last_pay_time_start'); // 最近一次充值时间起始
+        $params['last_pay_time_end'] = $request->input('last_pay_time_end'); // 最近一次充值时间截止
+        $params['add_way'] = $request->input('add_way'); // 添加渠道
+        $params['gender'] = $request->input('gender'); // 客户性别
+        $params['pay_status'] = $request->input('pay_status'); // 付费状态
+        $params['pay_num_min'] = $request->input('pay_num_min'); // 最小付费次数
+        $params['pay_num_max'] = $request->input('pay_num_max'); // 最高付费次数
+        $params['tag_type'] = $request->input('tag_type', 0); // 标签筛选类型 0未筛选 1满足其一 2同时满足 3无标签
+        $params['tag_id_list'] = $request->input('tag_id_list'); // 标签列表
+        $params['loss_status'] = $request->input('loss_status'); // 客户流失状态
+        $params['corpid'] = $request->input('corpid');
+        $params['loss_time_start'] = $request->input('loss_time_start');
+        $params['loss_time_end'] = $request->input('loss_time_end');
+        $params['is_new_customer_no_loss'] = $request->input('is_new_customer_no_loss');# 是否为新用户 0复粉 1新用户
+        $params['can_receive'] = $request->input('can_receive');       // 是否可正常接收群发消息 0否 1是
+        $params['retained_status'] = $request->input('retained_status');       // 是否在当前主体内还有留存 0否 1是
+
+        $data = CustomerService::customerCountStat($params);
         return self::returnValue($data);
     }
 

app/Http/Controllers/Api/TagController.php

@@ -58,6 +58,7 @@ class TagController extends Controller
         $params['loss_time_end'] = $request->input('loss_time_end');
         $params['is_new_customer_no_loss'] = $request->input('is_new_customer_no_loss');# 是否为新用户 0复粉 1新用户
         $params['can_receive'] = $request->input('can_receive');       // 是否可正常接收群发消息 0否 1是
+        $params['retained_status'] = $request->input('retained_status');       // 是否在当前主体内还有留存 0否 1是
 
         # 验证是否含有相同标签的任务
         $flag = TagService::getSameTaskStatus($corpid, $tagList, $type, $customerList, $selectAll, $filterCustomerList, $params);

app/Models/BatchMarkTag.php

@@ -17,5 +17,13 @@ class BatchMarkTag extends Model
     public $timestamps = false;
     protected static $unguarded = true;
 
-    const BATCH_MARK_TAG = 'Playlet::batch_mark_tag';
+    const BATCH_MARK_TAG = 'Playlet::batchMarkTag';
+
+    public static function getTaskInfoById($taskId) {
+        return self::query()->where('enable', 1)->where('id', $taskId)->first();
+    }
+
+    public static function updateStatus($taskId, $status) {
+        return self::query()->where('id', $taskId)->update(['status' => $status]);
+    }
 }

app/Models/BatchMarkTagRecord.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BatchMarkTagRecord extends Model
+{
+    protected $table = 'dj_batch_mark_tag_record';
+    public $timestamps = false;
+    protected static $unguarded = true;
+
+    const BATCH_MARK_TAG_RECORD = 'Playlet::batchMarkTagRecord';
+
+    public static function savedData($taskId, $corpid, $userId, $externalUserIdList) {
+        $model = new BatchMarkTagRecord();
+
+        $model->task_id = $taskId;
+        $model->corpid = $corpid;
+        $model->user_id = $userId;
+        $model->external_userid_list = implode(',', $externalUserIdList);
+        $model->exec_total = count($externalUserIdList);
+        $model->save();
+
+        return $model;
+    }
+
+    public static function getInfoById($recordId) {
+        return self::query()->where('enable', 1)->where('id', $recordId)->first();
+    }
+
+    public static function updateData($recordId, $update) {
+        return self::query()->where('id', $recordId)->update($update);
+    }
+
+    public static function recordCount($taskId) {
+        $model = self::query()->where('enable', 1)->where('task_id', $taskId);
+        return $model->selectRaw('status, count(1) as count')->groupBy(['status'])->get();
+    }
+}

app/Models/Customer.php

@@ -430,4 +430,8 @@ class Customer extends Model
 
         return $model->get();
     }
+
+    public static function getCustomerInfoByIdList($corpid, $customerIdList) {
+        return self::suffix($corpid)->where('corpid', $corpid)->where('enable', 1)->whereIn('id', $customerIdList)->get();
+    }
 }

app/Models/CustomerDetails.php

@@ -651,7 +651,7 @@ class CustomerDetails extends Model
     public static function getCustomerModel($corpid, $source) {
         if(2 == $source) {
             // 在职迁移列表
-            $customerQuery = CustomerDetails::suffix($corpid)->where('loss_status', 1)->where('enable', 1);
+            $customerQuery = CustomerDetails::suffix($corpid)->whereIn('loss_status', [0, 1])->where('enable', 1);
         } else if(1 == $source) {
             // 客户列表 0已流失 1正常状态 2待分配
             $customerQuery = CustomerDetails::suffix($corpid)->where('enable', 1);
@@ -661,64 +661,62 @@ class CustomerDetails extends Model
         return $customerQuery;
     }
 
-    public static function getCustomerBySearch($customerName, $userIdList, $addDateStart, $addDateEnd, $addWay, $gender
-        , $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid, $source
-        , $lastPayTimeStart, $lastPayTimeEnd, $lossTimeStart, $lossTimeEnd, $isNewCustomerNoLoss, $canReceive, $retainedStatus) {
-        $customerQuery = CustomerDetails::getCustomerModel($corpid, $source);
+    public static function getCustomerBySearchNew ($search, $source) {
+        $customerQuery = CustomerDetails::getCustomerModel($search['corpid'], $source);
 
-        $customerQuery = $customerQuery->where('corpid', $corpid);
+        $customerQuery = $customerQuery->where('corpid', $search['corpid']);
 
-        if(!empty($customerName)) {$customerQuery = $customerQuery->where('name', 'like', '%'.$customerName.'%');}
-        if(!empty($userIdList)) {$customerQuery = $customerQuery->whereIn('user_id', $userIdList);}
-        if(!empty($addDateStart)) {$customerQuery = $customerQuery->where('createtime', '>=', strtotime($addDateStart . ' 00:00:00'));}
-        if(!empty($addDateEnd)) {$customerQuery = $customerQuery->where('createtime', '<=', strtotime($addDateEnd . ' 23:59:59'));}
-        if(!empty($lastPayTimeStart)) {$customerQuery = $customerQuery->where('last_pay_time', '>=', $lastPayTimeStart . ' 00:00:00');}
-        if(!empty($lastPayTimeEnd)) {$customerQuery = $customerQuery->where('last_pay_time', '<=', $lastPayTimeEnd . ' 23:59:59');}
+        if(!empty($search['customer_name'])) { $customerQuery = $customerQuery->where('name', 'like', '%'.$search['customer_name'].'%'); }
+        if(!empty($search['user_id_list'])) { $customerQuery = $customerQuery->whereIn('user_id', $search['user_id_list']); }
+        if(!empty($search['add_date_start'])) { $customerQuery = $customerQuery->where('createtime', '>=', strtotime($search['add_date_start'] . ' 00:00:00')); }
+        if(!empty($search['add_date_end'])) { $customerQuery = $customerQuery->where('createtime', '<=', strtotime($search['add_date_end'] . ' 23:59:59')); }
+        if(!empty($search['last_pay_time_start'])) { $customerQuery = $customerQuery->where('last_pay_time', '>=', $search['last_pay_time_start'] . ' 00:00:00'); }
+        if(!empty($search['last_pay_time_end'])) { $customerQuery = $customerQuery->where('last_pay_time', '<=', $search['last_pay_time_end'] . ' 23:59:59'); }
 
-        if(is_numeric($addWay)) {$customerQuery = $customerQuery->where('add_way', $addWay);}
-        if(is_numeric($canReceive)) {$customerQuery = $customerQuery->where('can_receive', $canReceive);}
-        if(is_numeric($retainedStatus)) {$customerQuery = $customerQuery->where('retained_status', $retainedStatus);}
-        if(is_array($addWay) && !empty($addWay)) {$customerQuery = $customerQuery->whereIn('add_way', $addWay);}
-        if(is_numeric($gender)) {$customerQuery = $customerQuery->where('gender', $gender);}
-        if(is_numeric($isNewCustomerNoLoss)) {
-            if(1 == $isNewCustomerNoLoss){$customerQuery = $customerQuery->whereIn('is_new_customer_no_loss', [1, 3]);}
-            else{$customerQuery = $customerQuery->where('is_new_customer_no_loss', 0);}
+        if(is_numeric($search['add_way'])) { $customerQuery = $customerQuery->where('add_way', $search['add_way']); }
+        if(is_numeric($search['can_receive'])) { $customerQuery = $customerQuery->where('can_receive', $search['can_receive']); }
+        if(is_numeric($search['retained_status'])) { $customerQuery = $customerQuery->where('retained_status', $search['retained_status']); }
+        if(is_array($search['add_way']) && !empty($search['add_way'])) { $customerQuery = $customerQuery->whereIn('add_way', $search['add_way']); }
+        if(is_numeric($search['gender'])) { $customerQuery = $customerQuery->where('gender', $search['gender']); }
+        if(is_numeric($search['is_new_customer_no_loss'])) {
+            if(1 == $search['is_new_customer_no_loss']){ $customerQuery = $customerQuery->whereIn('is_new_customer_no_loss', [1, 3]);
+            } else { $customerQuery = $customerQuery->where('is_new_customer_no_loss', 0); }
         }
 
         // 付款状态，付款次数筛选
-        if(is_numeric($payStatus)) {
-            if(0 == $payStatus) {$customerQuery->where('is_paid', 0);
-            }else {$customerQuery->where('is_paid', 1);}
-            if(is_numeric($payNumMax)) {$customerQuery = $customerQuery->where('pay_num', '<=', $payNumMax);}
-            if(is_numeric($payNumMin)) {$customerQuery = $customerQuery->where('pay_num', '>=', $payNumMin);}
+        if(is_numeric($search['pay_status'])) {
+            if(0 == $search['pay_status']) { $customerQuery->where('is_paid', 0);
+            } else {$customerQuery->where('is_paid', 1);}
+            if (is_numeric($search['pay_num_max'])) { $customerQuery = $customerQuery->where('pay_num', '<=', $search['pay_num_max']); }
+            if (is_numeric($search['pay_num_min'])) { $customerQuery = $customerQuery->where('pay_num', '>=', $search['pay_num_min']); }
         }
 
-        if(1 == $tagType) {
+        if(1 == $search['tag_type']) {
             $tagRaw = '';
-            foreach($tagIdList as $k=>$tagId) {
+            foreach($search['tag_id_list'] as $k => $tagId) {
                 $tagRaw .= $tagId;
-                if($k < count($tagIdList) -1){
+                if($k < count($search['tag_id_list']) -1){
                     $tagRaw = $tagRaw.' ';
                 }
             }
 
             $customerQuery = $customerQuery->whereRaw('match(`tag_list`) against ("'.$tagRaw.'" in boolean mode)');
         }
-        if(2 == $tagType) {
+        if(2 == $search['tag_type']) {
             $tagRaw = '';
-            foreach($tagIdList as $k=>$tagId) {
+            foreach($search['tag_id_list'] as $k => $tagId) {
                 $tagRaw .= '+'.$tagId;
-                if($k < count($tagIdList) -1){
+                if($k < count($search['tag_id_list']) -1){
                     $tagRaw = $tagRaw.' ';
                 }
             }
 
             $customerQuery = $customerQuery->whereRaw('match(`tag_list`) against ("'.$tagRaw.'" in boolean mode)');
         }
-        if(3 == $tagType) {$customerQuery = $customerQuery->whereNull('tag_list');}
-        if(!empty($lossTimeStart)) {$customerQuery->where('loss_time', '>=', $lossTimeStart);}
-        if(!empty($lossTimeEnd)) {$customerQuery->where('loss_time', '<=', $lossTimeEnd);}
-        if(is_numeric($lossStatus)) {$customerQuery = $customerQuery->where('loss_status', $lossStatus);}
+        if(3 == $search['tag_type']) { $customerQuery = $customerQuery->whereNull('tag_list'); }
+        if(!empty($search['loss_time_start'])) { $customerQuery->where('loss_time', '>=', $search['loss_time_start']); }
+        if(!empty($search['loss_time_end'])) { $customerQuery->where('loss_time', '<=', $search['loss_time_end']); }
+        if(is_numeric($search['loss_status'])) { $customerQuery = $customerQuery->where('loss_status', $search['loss_status']); }
 
         return $customerQuery;
     }

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];

app/Service/CustomerService.php

@@ -124,14 +124,11 @@ class CustomerService
     }
 
     // 客户管理列表
-    public static function customerList($customerName, $userIdList, $addDateStart, $addDateEnd, $addWay, $gender
-        , $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid, $page, $pageSize, $source
-        , $lastPayTimeStart, $lastPayTimeEnd, $lossTimeStart, $lossTimeEnd, $isNewCustomerNoLoss, $canReceive, $retainedStatus)
+    public static function customerList($search, $page, $pageSize, $source)
     {
         $extra = '';    // 当用户筛选了客户关注起止时间时，返回列表中客户对应的客服列表
-        $customerQuery = CustomerDetails::getCustomerBySearch($customerName, $userIdList, $addDateStart, $addDateEnd, $addWay, $gender
-            , $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid, $source
-            , $lastPayTimeStart, $lastPayTimeEnd, $lossTimeStart, $lossTimeEnd, $isNewCustomerNoLoss, $canReceive, $retainedStatus);
+        $customerQuery = CustomerDetails::getCustomerBySearchNew($search, $source);
+        $corpid = $search['corpid'];
 
         $customerRelationCount = clone $customerQuery;
         $followCount = $customerRelationCount->selectRaw('count(distinct(`con_user_cus`)) as count')->first();
@@ -144,7 +141,7 @@ class CustomerService
         $lossCountInfo = $customerLossQ->where('loss_status', 0)->selectRaw('count(distinct(`external_userid`)) as count')->first();
         $loss_count = $lossCountInfo->count ?? 0;
 
-        if($addDateStart && $addDateEnd) {
+        if($search['add_date_start'] && $search['add_date_end']) {
             $userListQuery = clone $customerQuery;
             $userIdList = $userListQuery->selectRaw('distinct(user_id) as user_id')->pluck('user_id');
 
@@ -3080,20 +3077,15 @@ class CustomerService
 
     }
 
-    public static function customerCountStat($customerName, $userIdList, $addDateStart, $addDateEnd, $addWay, $gender
-        , $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid, $lastPayTimeStart, $lastPayTimeEnd
-        , $lossTimeStart, $lossTimeEnd, $isNewCustomerNoLoss, $canReceive, $retainedStatus) {
-
+    public static function customerCountStat($search) {
         $source = 1;
-        $customerQuery = CustomerDetails::getCustomerBySearch($customerName, $userIdList, $addDateStart, $addDateEnd, $addWay, $gender
-            , $payStatus, $payNumMin, $payNumMax, $tagType, $tagIdList, $lossStatus, $corpid, $source
-            , $lastPayTimeStart, $lastPayTimeEnd, $lossTimeStart, $lossTimeEnd, $isNewCustomerNoLoss, $canReceive, $retainedStatus);
+        $customerQuery = CustomerDetails::getCustomerBySearchNew($search, $source);
 
         $data = $customerQuery->selectRaw("user_id, count(1) as count")->groupBy('user_id')->orderByDesc('count')->get();
         $insideUserIdList = array_unique(array_column($data->toArray(), 'user_id'));
 
         // 查询客服基本信息
-        $search = ['corpid' => $corpid, 'user_list' => $insideUserIdList];
+        $search = ['corpid' => $search['corpid'], 'user_list' => $insideUserIdList];
         $userDataList = DjUser::getUserBySearch($search);
 
         $result = [];

app/Service/TagService.php

@@ -369,6 +369,7 @@ class TagService
         ];
 
         if(isset($res->id)) {
+            RedisModel::rPush(BatchMarkTag::BATCH_MARK_TAG, $res->id);
             return ['id' => $res->id];
         } else {
             Log::logInfo('batchCustomerTag 操作失败 request:'.json_encode($requestData, JSON_UNESCAPED_UNICODE), ['id' => 0], 'interface');