From dcb95b4d022d7622b7c3a93a165b423478b23328 Mon Sep 17 00:00:00 2001 From: wong <106998207@qq.com> Date: Mon, 21 Jul 2025 15:08:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=BD=E5=8F=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/application/api/config/route.php | 3 --- Server/application/cunkebao/config/route.php | 8 +++++-- .../plan/PostExternalApiV1Controller.php | 3 ++- .../Adapters/ChuKeBao/Adapter.php | 22 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Server/application/api/config/route.php b/Server/application/api/config/route.php index f6fecbfaa..79d3bc475 100644 --- a/Server/application/api/config/route.php +++ b/Server/application/api/config/route.php @@ -97,9 +97,6 @@ Route::group('v1', function () { Route::get('autoCreate', 'app\api\controller\AllotRuleController@autoCreateAllotRules');// 自动创建分配规则 √ }); - Route::group('scenarios', function () { - Route::any('', 'app\cunkebao\controller\plan\PostExternalApiV1Controller@index'); - }); }); }); \ No newline at end of file diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php index 69290e148..430c95167 100644 --- a/Server/application/cunkebao/config/route.php +++ b/Server/application/cunkebao/config/route.php @@ -118,8 +118,13 @@ Route::group('v1/', function () { -Route::group('v1/frontend', function () { +Route::group('v1/api/scenarios', function () { + Route::any('', 'app\cunkebao\controller\plan\PostExternalApiV1Controller@index'); +}); + +//小程序 +Route::group('v1/frontend', function () { Route::group('business/poster', function () { Route::post('getone', 'app\cunkebao\controller\plan\PosterWeChatMiniProgram@getPosterTaskData'); Route::post('decryptphone', 'app\cunkebao\controller\plan\PosterWeChatMiniProgram@getPhoneNumber'); @@ -129,5 +134,4 @@ Route::group('v1/frontend', function () { - return []; \ No newline at end of file diff --git a/Server/application/cunkebao/controller/plan/PostExternalApiV1Controller.php b/Server/application/cunkebao/controller/plan/PostExternalApiV1Controller.php index 1d4c6a5a9..10c91780e 100644 --- a/Server/application/cunkebao/controller/plan/PostExternalApiV1Controller.php +++ b/Server/application/cunkebao/controller/plan/PostExternalApiV1Controller.php @@ -96,7 +96,8 @@ class PostExternalApiV1Controller extends Controller if (!$trafficPool) { $trafficPoolId =Db::name('traffic_pool')->insertGetId([ 'identifier' => $identifier, - 'mobile' => $params['phone'] + 'mobile' => !empty($params['phone']) ? $params['phone'] : '', + 'createTime' => time() ]); }else{ $trafficPoolId = $trafficPool['id']; diff --git a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php index 495b7ae73..bc18298c3 100644 --- a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php +++ b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php @@ -191,7 +191,6 @@ class Adapter implements WeChatServiceInterface } //筛选出设备在线微信在线 $wechatIdAccountIdMap = $this->getWeChatIdsAccountIdsMapByDeviceIds($task_info['reqConf']['device']); - if (empty($wechatIdAccountIdMap)) { continue; } @@ -213,11 +212,9 @@ class Adapter implements WeChatServiceInterface continue; } - - // 判断24h内加的好友数量，friend_task 先固定10个人 getLast24hAddedFriendsCount $last24hAddedFriendsCount = $this->getLast24hAddedFriendsCount($wechatId); - if ($last24hAddedFriendsCount >= 10) { + if ($last24hAddedFriendsCount >= 20) { continue; } @@ -233,14 +230,15 @@ class Adapter implements WeChatServiceInterface $task['processed_wechat_ids'] = $task['processed_wechat_ids'] . ',' . $wechatId; // 处理失败任务用，用于过滤已处理的微信号 break; } - Db::name('task_customer') + $res = Db::name('task_customer') ->where('id', $task['id']) ->update([ 'status' => $friendAddTaskCreated ? 1 : 3, 'fail_reason' => $friendAddTaskCreated ? '' : '已经是好友了', 'processed_wechat_ids' => $task['processed_wechat_ids'], - 'updated_at' => time() - ]); // ~~不用管，回头再添加再判断即可~~ + 'updateTime' => time() + ]); + // ~~不用管，回头再添加再判断即可~~ // 失败一定是另一个进程/定时器在检查的 } @@ -254,9 +252,9 @@ class Adapter implements WeChatServiceInterface $tasks = Db::name('task_customer') ->whereIn('status', [1,2]) - ->where('updated_at', '>=', (time() - 86400 * 3)) + ->where('updateTime', '>=', (time() - 86400 * 3)) ->limit(50) - ->order('updated_at DESC') + ->order('updateTime DESC') ->select(); if (empty($tasks)) { @@ -296,7 +294,7 @@ class Adapter implements WeChatServiceInterface Db::name('task_customer') ->where('id', $task['id']) - ->update(['status' => 4, 'updated_at' => time()]); + ->update(['status' => 4, 'updateTime' => time()]); $wechatFriendRecord = $this->getWeChatAccoutIdAndFriendIdByWeChatIdAndFriendPhone($passedWeChatId, $task['phone']); $msgConf = is_string($task_info['msgConf']) ? json_decode($task_info['msgConf'], 1) : $task_info['msgConf']; @@ -316,7 +314,7 @@ class Adapter implements WeChatServiceInterface if (isset($latestFriendTask['status']) && $latestFriendTask['status'] == 1) { Db::name('task_customer') ->where('id', $task['id']) - ->update(['status' => 2, 'updated_at' => time()]); + ->update(['status' => 2, 'updateTime' => time()]); break; } @@ -324,7 +322,7 @@ class Adapter implements WeChatServiceInterface if (isset($latestFriendTask['status']) && $latestFriendTask['status'] == 2) { Db::name('task_customer') ->where('id', $task['id']) - ->update(['status' => 3, 'fail_reason' => $latestFriendTask['extra'] ?? '未知原因', 'updated_at' => time()]); + ->update(['status' => 3, 'fail_reason' => $latestFriendTask['extra'] ?? '未知原因', 'updateTime' => time()]); break; } } From 368e34cbdc77d1d54626be4942013c948a8738c8 Mon Sep 17 00:00:00 2001 From: wong <106998207@qq.com> Date: Mon, 21 Jul 2025 15:21:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cunkebao/controller/plan/PosterWeChatMiniProgram.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php index b05b981f0..e471356ff 100644 --- a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php +++ b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php @@ -150,13 +150,18 @@ class PosterWeChatMiniProgram extends Controller } + if(isset($sceneConf['tips'])) { + $sTip = $sceneConf['tips']; + } else { + $sTip = ''; + } $data = [ 'id' => $task['id'], 'name' => $task['name'], 'poster' => ['sUrl' => $posterUrl], - 'sTip' => '', + 'sTip' => $sTip, ]; From 1cc04366fcba09efce9bb2f17dbf13bef9832132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=94=E8=AE=B0=E6=9C=AC=E9=87=8C=E7=9A=84=E6=B0=B8?= =?UTF-8?q?=E5=B9=B3?= Date: Mon, 21 Jul 2025 15:32:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=9C=AC=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=A6=82=E4=B8=8B?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0tips=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cunkebao/src/pages/scenarios/new/page.tsx | 2 ++ .../scenarios/new/steps/BasicSettings.tsx | 25 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Cunkebao/src/pages/scenarios/new/page.tsx b/Cunkebao/src/pages/scenarios/new/page.tsx index ddbe3578b..59b7e2843 100644 --- a/Cunkebao/src/pages/scenarios/new/page.tsx +++ b/Cunkebao/src/pages/scenarios/new/page.tsx @@ -98,6 +98,7 @@ export default function NewPlan() { sceneId: Number(detail.scenario) || 1, remarkFormat: detail.remarkFormat ?? "", addFriendInterval: detail.addFriendInterval ?? 1, + tips: detail.tips ?? "", })); } } else { @@ -178,6 +179,7 @@ export default function NewPlan() { case 1: return ( void; onNext?: () => void; @@ -89,6 +90,7 @@ const generatePosterMaterials = (): Material[] => { }; export function BasicSettings({ + isEdit, formData, onChange, onNext, @@ -123,6 +125,7 @@ export function BasicSettings({ // 自定义标签相关状态 const [customTagInput, setCustomTagInput] = useState(""); const [customTags, setCustomTags] = useState(formData.customTags || []); + const [tips, setTips] = useState(formData.tips || ""); const [selectedScenarioTags, setSelectedScenarioTags] = useState( formData.scenarioTags || [] ); @@ -188,7 +191,11 @@ export function BasicSettings({ const today = new Date().toLocaleDateString("zh-CN").replace(/\//g, ""); const sceneItem = sceneList.find((v) => formData.scenario === v.id); onChange({ ...formData, name: `${sceneItem?.name || "海报"}${today}` }); - }, [sceneList]); + }, [isEdit]); + + useEffect(() => { + setTips(formData.tips || ""); + }, [formData.tips]); // 选中场景 const handleScenarioSelect = (sceneId: number) => { @@ -494,6 +501,22 @@ export function BasicSettings({ + {/* 输入获客成功提示 */} +
+
+ { + setTips(e.target.value); + onChange({ ...formData, tips: e.target.value }); + }} + placeholder="请输入获客成功提示" + className="w-full" + /> +
+
+ {/* 选素材 */}
选择海报
From 63c64fdd1ef150851047422d1dff33c911d9774b Mon Sep 17 00:00:00 2001 From: wong <106998207@qq.com> Date: Mon, 21 Jul 2025 16:03:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cunkebao/controller/plan/PosterWeChatMiniProgram.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php index e471356ff..da954377c 100644 --- a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php +++ b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php @@ -126,7 +126,10 @@ class PosterWeChatMiniProgram extends Controller // todo 获取海报获客任务的任务/海报数据 -- 表还没设计好，不急 ck_customer_acquisition_task public function getPosterTaskData() { $id = request()->param('id'); - $task = Db::name('customer_acquisition_task')->where(['id' => $id,'deleteTime' => 0])->find(); + $task = Db::name('customer_acquisition_task') + ->where(['id' => $id,'deleteTime' => 0]) + ->field('id,name,sceneConf,status') + ->find(); if (!$task) { return json([ 'code' => 400, @@ -156,12 +159,14 @@ class PosterWeChatMiniProgram extends Controller $sTip = ''; } + unset($task['sceneConf']); + $task['sTip'] = $sTip; $data = [ 'id' => $task['id'], 'name' => $task['name'], 'poster' => ['sUrl' => $posterUrl], - 'sTip' => $sTip, + 'task' => $task, ]; From 4948f9a0979e26a9c3933b7e8fc74a9db562dd54 Mon Sep 17 00:00:00 2001 From: wong <106998207@qq.com> Date: Mon, 21 Jul 2025 16:56:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=B1=A0=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cunkebao/controller/TrafficController.php | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 Server/application/cunkebao/controller/TrafficController.php diff --git a/Server/application/cunkebao/controller/TrafficController.php b/Server/application/cunkebao/controller/TrafficController.php new file mode 100644 index 000000000..c00154deb --- /dev/null +++ b/Server/application/cunkebao/controller/TrafficController.php @@ -0,0 +1,121 @@ +request->param('page',1); + $pageSize = $this->request->param('pageSize',10); + $device = $this->request->param('device',''); + $packageId = $this->request->param('packageId',''); // 流量池id + $userValue = $this->request->param('userValue',''); // 1高价值客户 2中价值客户 3低价值客户 + $addStatus = $this->request->param('addStatus',''); // 1待添加 2已添加 3添加失败 4重复用户 + $keyword = $this->request->param('keyword',''); + + $companyId = $this->request->userInfo['companyId']; + + // 1 文字 3图片 47动态图片 34语言 43视频 42名片 40/20链接 49文件 419430449转账 436207665红包 + + $where = []; + + // 添加筛选条件 + if (!empty($device)) { + $where['d.id'] = $device; + } + + if (!empty($packageId)) { + $where['tp.id'] = $packageId; + } + + if (!empty($userValue)) { + $where['tp.userValue'] = $userValue; + } + + if (!empty($addStatus)) { + $where['tp.addStatus'] = $addStatus; + } + + + // 构建查询 - 通过traffic_pool的identifier关联wechat_account的wechatId、alias或phone + $query = Db::name('traffic_pool')->alias('tp') + ->join('wechat_account wa', 'wa.wechatId = tp.wechatId', 'LEFT') + ->field('tp.id, tp.identifier,tp.createTime, tp.updateTime, + wa.wechatId, wa.alias, wa.phone, wa.nickname, wa.avatar') + ->where($where); + + // 关键词搜索 - 支持通过wechat_friendship的identifier关联wechat_account的wechatId、alias或phone + if (!empty($keyword)) { + $query->where(function($q) use ($keyword) { + $q->where('tp.identifier', 'like', '%' . $keyword . '%') + ->whereOr('wa.wechatId', 'like', '%' . $keyword . '%') + ->whereOr('wa.alias', 'like', '%' . $keyword . '%') + ->whereOr('wa.phone', 'like', '%' . $keyword . '%') + ->whereOr('wa.nickname', 'like', '%' . $keyword . '%'); + }); + } + + // 获取总数 + $total = $query->count(); + + + // 分页查询 + $list = $query->order('tp.createTime desc') + ->group('tp.identifier') + ->order('tp.id desc') + ->page($page, $pageSize) + ->select(); + + + + return json([ + 'code' => 200, + 'msg' => '获取成功', + 'data' => [ + 'list' => $list, + 'total' => $total, + ] + ]); + } + + + /** + * 用户旅程 + * @return false|string + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + */ + public function getUserJourney() + { + $page = $this->request->param('page',1); + $pageSize = $this->request->param('pageSize',10); + $userId = $this->request->param('userId',''); + if(empty($userId)){ + return json_encode(['code' => 500, 'msg' => '用户id不能为空']); + } + + $query = Db::name('user_portrait') + ->field('id,type,trafficPoolId,remark,count,createTime,updateTime') + ->where(['trafficPoolId' => $userId]); + + $total = $query->count(); + + $list = $query->order('createTime desc') + ->page($page,$pageSize) + ->select(); + + + foreach ($list as $k=>$v){ + $list[$k]['createTime'] = date('Y-m-d H:i:s',$v['createTime']); + $list[$k]['updateTime'] = date('Y-m-d H:i:s',$v['updateTime']); + } + return json_encode(['code' => 200,'data'=>['list' => $list,'total'=>$total],'获取成功']); + } + + +} \ No newline at end of file