From 527d5341db3c62e326ddf932a1f17b884e30884d Mon Sep 17 00:00:00 2001 From: wong <106998207@qq.com> Date: Mon, 20 Oct 2025 14:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chukebao/controller/DataProcessing.php | 2 +- .../common/model/TrafficSourcePackage.php | 17 ++ .../common/model/TrafficSourcePackageItem.php | 17 ++ Server/application/cunkebao/config/route.php | 11 +- .../cunkebao/controller/RFMController.php | 2 +- .../cunkebao/controller/TrafficController.php | 259 +++++++++++++++++- .../PostCreateAddFriendPlanV1Controller.php | 1 - .../PostUpdateAddFriendPlanV1Controller.php | 1 - 8 files changed, 301 insertions(+), 9 deletions(-) create mode 100644 Server/application/common/model/TrafficSourcePackage.php create mode 100644 Server/application/common/model/TrafficSourcePackageItem.php diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php index 46e7e68ab..04344a746 100644 --- a/Server/application/chukebao/controller/DataProcessing.php +++ b/Server/application/chukebao/controller/DataProcessing.php @@ -62,7 +62,7 @@ class DataProcessing extends BaseController $friend->save(); $msg = '修标签成功'; break; - case 'CmdAllotFriend': + case 'CmdAllotFriend': //迁移好友 if(empty($toAccountId)){ return ResponseHelper::error('参数缺失'); } diff --git a/Server/application/common/model/TrafficSourcePackage.php b/Server/application/common/model/TrafficSourcePackage.php new file mode 100644 index 000000000..c9c5e6112 --- /dev/null +++ b/Server/application/common/model/TrafficSourcePackage.php @@ -0,0 +1,17 @@ +request->param('page', 1); $limit = $this->request->param('limit', 10); $keyword = $this->request->param('keyword', ''); @@ -34,7 +42,7 @@ class TrafficController extends BaseController foreach ($list as $k => &$v) { if ($v['type'] != 1) { $v['createTime'] = !empty($v['createTime']) ? formatRelativeTime($v['createTime']) : ''; - }else{ + } else { $v['createTime'] = ''; } @@ -53,7 +61,6 @@ class TrafficController extends BaseController $v['F'] = $scores['F']; $v['M'] = $scores['M']; $v['RFM'] = $scores['R'] + $scores['F'] + $scores['M']; - } unset($v); @@ -65,4 +72,250 @@ class TrafficController extends BaseController return ResponseHelper::success($data); } + /** + * 添加流量池 + * @return \think\response\Json + * @throws \Exception + */ + public function addPackage() + { + $packageName = $this->request->param('packageName', ''); + $description = $this->request->param('description', ''); + $pic = $this->request->param('pic', ''); + $companyId = $this->getUserInfo('companyId'); + $userId = $this->getUserInfo('id'); + + if (empty($packageName)) { + return ResponseHelper::error('流量池名称不能为空'); + } + + $package = TrafficSourcePackage::where(['isDel' => 0, 'name' => $packageName]) + ->whereIn('companyId', [$companyId, 0]) + ->field('id,name') + ->find(); + if (!empty($package)) { + return ResponseHelper::error('该流量池名称已存在'); + } + $packageId = TrafficSourcePackage::insertGetId([ + 'userId' => $userId, + 'companyId' => $companyId, + 'name' => $packageName, + 'description' => $description, + 'pic' => $pic, + 'matchingRules' => json_encode([]), + 'createTime' => time(), + 'isDel' => 0, + ]); + + if (!empty($packageId)) { + return ResponseHelper::success($packageId, '该流量添加成功'); + } else { + return ResponseHelper::error('该流量添加失败'); + } + } + + /** + * 编辑流量池 + * @return \think\response\Json + * @throws \Exception + */ + public function editPackage() + { + $packageId = $this->request->param('packageId', ''); + $packageName = $this->request->param('packageName', ''); + $description = $this->request->param('description', ''); + $pic = $this->request->param('pic', ''); + $companyId = $this->getUserInfo('companyId'); + $userId = $this->getUserInfo('id'); + + if (empty($packageId)) { + return ResponseHelper::error('流量池ID不能为空'); + } + + if (empty($packageName)) { + return ResponseHelper::error('流量池名称不能为空'); + } + + // 检查流量池是否存在且属于当前公司 + $package = TrafficSourcePackage::where(['id' => $packageId, 'isDel' => 0]) + ->whereIn('companyId', [$companyId, 0]) + ->find(); + if (empty($package)) { + return ResponseHelper::error('流量池不存在或已删除'); + } + + // 检查系统流量池是否可编辑 + if ($package['isSys'] == 1) { + return ResponseHelper::error('系统流量池不允许编辑'); + } + + // 检查名称是否重复（排除当前记录） + $existPackage = TrafficSourcePackage::where(['isDel' => 0, 'name' => $packageName]) + ->whereIn('companyId', [$companyId, 0]) + ->where('id', '<>', $packageId) + ->field('id,name') + ->find(); + if (!empty($existPackage)) { + return ResponseHelper::error('该流量池名称已存在'); + } + + // 更新流量池信息 + $updateData = [ + 'name' => $packageName, + 'updateTime' => time(), + ]; + + // 更新描述字段（允许为空） + $updateData['description'] = $description; + + // 更新图片字段（允许为空） + $updateData['pic'] = $pic; + + $result = TrafficSourcePackage::where('id', $packageId)->update($updateData); + + if ($result !== false) { + return ResponseHelper::success($packageId, '流量池编辑成功'); + } else { + return ResponseHelper::error('流量池编辑失败'); + } + } + + /** + * 删除流量池（假删除） + * @return \think\response\Json + * @throws \Exception + */ + public function deletePackage() + { + $packageId = $this->request->param('packageId', ''); + $companyId = $this->getUserInfo('companyId'); + + if (empty($packageId)) { + return ResponseHelper::error('流量池ID不能为空'); + } + + // 检查流量池是否存在且属于当前公司 + $package = TrafficSourcePackage::where(['id' => $packageId, 'isDel' => 0]) + ->whereIn('companyId', [$companyId, 0]) + ->find(); + if (empty($package)) { + return ResponseHelper::error('流量池不存在或已删除'); + } + + // 检查系统流量池是否可删除 + if ($package['isSys'] == 1) { + return ResponseHelper::error('系统流量池不允许删除'); + } + + // 开启事务 + Db::startTrans(); + try { + // 执行流量池假删除 + $result = TrafficSourcePackage::where('id', $packageId)->update([ + 'isDel' => 1, + 'deleteTime' => time() + ]); + + if ($result === false) { + throw new \Exception('流量池删除失败'); + } + + // 删除流量池内容（TrafficSourcePackageItem）假删除 + $itemResult = TrafficSourcePackageItem::where([ + 'packageId' => $packageId, + 'companyId' => $companyId, + 'isDel' => 0 + ])->update([ + 'isDel' => 1, + 'deleteTime' => time() + ]); + + // 提交事务 + Db::commit(); + + return ResponseHelper::success($packageId, '流量池及内容删除成功'); + + } catch (\Exception $e) { + // 回滚事务 + Db::rollback(); + return ResponseHelper::error('删除失败：' . $e->getMessage()); + } + } + + + /** + * 流量池列表 + * @return \think\response\Json + * @throws \Exception + */ + public function getTrafficPoolList() + { + $page = $this->request->param('page', 1); + $limit = $this->request->param('limit', 10); + $keyword = $this->request->param('keyword', ''); + $packageId = $this->request->param('packageId', ''); + $companyId = $this->getUserInfo('companyId'); + $userId = $this->getUserInfo('id'); + + if (empty($packageId)) { + return ResponseHelper::error('流量包id不能为空'); + } + + $trafficSourcePackage = TrafficSourcePackage::where(['id' => $packageId, 'isDel' => 0])->whereIn('companyId', [$companyId, 0])->find(); + if (empty($trafficSourcePackage)) { + return ResponseHelper::error('流量包不存在或已删除'); + } + $where = [ + ['tspi.companyId', '=', $companyId], + ['tspi.packageId', '=', $packageId], + ]; + + if (empty($keyword)) { + $where[] = ['wa.nickname|wa.phone|wa.alias|wa.wechatId|p.mobile|p.identifier', 'like', '%' . $keyword . '%']; + } + + $query = TrafficSourcePackageItem::alias('tspi') + ->field( + [ + 'p.id', 'p.identifier', 'p.mobile', 'p.wechatId', 'tspi.companyId', + 'wa.nickname', 'wa.avatar', 'wa.gender', 'wa.phone', 'wa.alias' + ] + ) + ->join('traffic_pool p', 'p.identifier=tspi.identifier', 'left') + ->join('wechat_account wa', 'tspi.identifier=wa.wechatId', 'left') + ->where($where); + + $query->order('tspi.id DESC,p.id DESC')->group('p.identifier'); + + $list = $query->page($page, $limit)->select()->toArray(); + $total = $query->count(); + + foreach ($list as $k => &$v) { + //流量池筛选 + $package = TrafficSourcePackageItem::alias('tspi') + ->join('traffic_source_package p', 'tspi.packageId=p.id AND tspi.companyId=p.companyId') + ->where(['tspi.identifier' => $v['identifier']]) + ->whereIn('tspi.companyId', [0, $v['companyId']]) + ->column('p.name'); + $v['packages'] = $package; + $v['phone'] = !empty($v['phone']) ? $v['phone'] : $v['mobile']; + unset($v['mobile']); + + + $scores = RFMController::calcRfmScores(30, 30, 30); + $v['R'] = $scores['R']; + $v['F'] = $scores['F']; + $v['M'] = $scores['M']; + $v['RFM'] = $scores['R'] + $scores['F'] + $scores['M']; + $v['money'] = 2222; + $v['msgCount'] = 2222; + $v['tag'] = ['test', 'test2']; + } + unset($v); + + + $data = ['list' => $list, 'total' => $total]; + return ResponseHelper::success($data); + } + } \ No newline at end of file diff --git a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php index 228841b6b..9c670d1fe 100644 --- a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php +++ b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php @@ -223,7 +223,6 @@ class PostCreateAddFriendPlanV1Controller extends BaseController if (!empty($params['wechatGroups']) && is_array($params['wechatGroups'])) { $rows = Db::name('wechat_group_member')->alias('gm') ->join('wechat_account wa', 'gm.identifier = wa.wechatId') - ->where('gm.companyId', $this->getUserInfo('companyId')) ->whereIn('gm.groupId', $params['wechatGroups']) ->group('gm.identifier') ->column('wa.id,wa.wechatId,wa.alias,wa.phone'); diff --git a/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php index e9810fd5b..f5c0d3d19 100644 --- a/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php +++ b/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php @@ -198,7 +198,6 @@ class PostUpdateAddFriendPlanV1Controller extends BaseController if (!empty($params['wechatGroups']) && is_array($params['wechatGroups'])) { $rows = Db::name('wechat_group_member')->alias('gm') ->join('wechat_account wa', 'gm.identifier = wa.wechatId') - ->where('gm.companyId', $this->getUserInfo('companyId')) ->whereIn('gm.groupId', $params['wechatGroups']) ->group('gm.identifier') ->column('wa.id,wa.wechatId,wa.alias,wa.phone');