diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php index 48afe0fd..58e4063c 100644 --- a/Server/application/cunkebao/config/route.php +++ b/Server/application/cunkebao/config/route.php @@ -46,6 +46,7 @@ Route::group('v1/', function () { Route::get('detail', 'app\cunkebao\controller\plan\GetAddFriendPlanDetailV1Controller@index'); Route::PUT('update', 'app\cunkebao\controller\plan\PostUpdateAddFriendPlanV1Controller@index'); Route::get('getWxMinAppCode', 'app\cunkebao\controller\plan\PlanSceneV1Controller@getWxMinAppCode'); + Route::get('getUserList', 'app\cunkebao\controller\plan\PlanSceneV1Controller@getUserList'); }); // 流量池相关 diff --git a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php index dca65350..055cf9ea 100644 --- a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php +++ b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php @@ -433,7 +433,9 @@ class PlanSceneV1Controller extends BaseController return ResponseHelper::error('获客场景id不能为空'); } - $task = Db::name('customer_acquisition_task')->where(['id' => $planId, 'deleteTime' => 0])->find(); + $task = Db::name('customer_acquisition_task') + ->where(['id' => $planId, 'deleteTime' => 0,'companyId' => $this->getUserInfo('companyId')]) + ->find(); if(empty($task)) { return ResponseHelper::error('活动不存在'); } @@ -449,12 +451,24 @@ class PlanSceneV1Controller extends BaseController $total = $query->count(); $list = $query->page($page, $pageSize)->order('id', 'desc')->select(); - foreach ($list as &$item) { + unset($item['fail_reason'],$item['processed_wechat_ids'],$item['task_id']); + $userinfo = Db::table('s2_wechat_friend') + ->field('alias,wechatId,nickname,avatar') + ->where('alias|wechatId|phone|conRemark','like','%'.$item['phone'].'%') + ->order('id DESC') + ->find(); + + if (!empty($userinfo)) { + $item['userinfo'] = $userinfo; + }else{ + $item['userinfo'] = []; + } + $item['tags'] = json_decode($item['tags'], true); $item['siteTags'] = json_decode($item['siteTags'], true); - $item['createTime'] = date('Y-m-d H:i:s', $item['createTime']); - $item['updateTime'] = date('Y-m-d H:i:s', $item['updateTime']); + $item['createTime'] = !empty($item['createTime']) ? date('Y-m-d H:i:s', $item['createTime']) : ''; + $item['updateTime'] = !empty($item['updateTime']) ? date('Y-m-d H:i:s', $item['updateTime']) : ''; } diff --git a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php index 4ce512f7..076c6e6f 100644 --- a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php +++ b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php @@ -149,12 +149,11 @@ class PosterWeChatMiniProgram extends Controller - $data = [ 'id' => $task['id'], 'name' => $task['name'], 'poster' => ['sUrl' => $posterUrl], - 'sTip' => '啦啦啦啦', + 'sTip' => '', ];