From d871e73d231e61d9559a307b6639880247ee3a49 Mon Sep 17 00:00:00 2001 From: MiAn Date: Mon, 26 Oct 2026 09:21:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=9D=83=E7=9B=8A=E4=B8=8E=E5=88=86=E9=94=80=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A5=97=E9=A4=90=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E6=9D=83=E7=9B=8A=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增会员权益配置控制器 Memberbenefit 和 Publish，拆分运营配置模块 2. 新增套餐表字段 free_view_quota、post_discount，支持按套餐配置免费看和发帖折扣 3. 优化前端页面，新增套餐编辑表单、区域选择器、发布配置交互 4. 新增调试支持，支持 mock openid、本地 IP 绕过权限，便于自动化测试 5. 新增数据库工具脚本，用于检查配置、修复数据、验证会员功能 6. 优化会员接口，返回套餐维度的权益信息，支持无限次免费看场景 --- application/admin/command/FcInstall.php | 35 +- application/admin/command/FcMenu.php | 28 +- application/admin/command/FcVerifyMember.php | 11 +- application/admin/controller/fc/Area.php | 6 +- .../admin/controller/fc/Distrelation.php | 19 +- .../admin/controller/fc/Memberbenefit.php | 48 + application/admin/controller/fc/Plan.php | 27 +- application/admin/controller/fc/Publish.php | 50 ++ application/admin/lang/zh-cn/fc/plan.php | 28 +- application/admin/view/fc/area/add.html | 43 +- application/admin/view/fc/area/edit.html | 45 +- .../admin/view/fc/distrelation/index.html | 1 - .../admin/view/fc/memberbenefit/index.html | 227 +++++ application/admin/view/fc/plan/add.html | 52 +- application/admin/view/fc/plan/edit.html | 48 +- application/admin/view/fc/plan/index.html | 14 +- application/admin/view/fc/publish/index.html | 224 +++++ application/api/controller/Auth.php | 5 + application/api/controller/Member.php | 104 ++- application/api/controller/Post.php | 353 ++++---- application/api/controller/V1.php | 4 + .../common/library/DistributionService.php | 7 +- application/common/library/FcConfig.php | 396 ++++++--- public/assets/css/backend/fc-area.css | 141 +++ public/assets/js/backend/fc/area.js | 824 ++++++++++++++++-- public/assets/js/backend/fc/memberbenefit.js | 15 + public/assets/js/backend/fc/plan.js | 34 +- public/assets/js/backend/fc/publish.js | 35 +- tools/check_admin_rules.php | 17 + tools/check_db_stats.php | 24 + tools/inspect_configs.php | 15 + tools/patch_d4.php | 43 + tools/patch_fixes.php | 64 ++ tools/patch_openid.php | 24 + tools/test_admin_login.php | 23 + uniapp/common/config/index.js | 2 +- uniapp/pages/detail/detail.vue | 37 +- uniapp/pages/index/index.vue | 8 +- uniapp/pages/member/index.vue | 163 ++-- uniapp/pages/post/create.vue | 353 ++++++-- 40 files changed, 2956 insertions(+), 641 deletions(-) create mode 100644 application/admin/controller/fc/Memberbenefit.php create mode 100644 application/admin/controller/fc/Publish.php create mode 100644 application/admin/view/fc/memberbenefit/index.html create mode 100644 application/admin/view/fc/publish/index.html create mode 100644 public/assets/js/backend/fc/memberbenefit.js create mode 100644 tools/check_admin_rules.php create mode 100644 tools/check_db_stats.php create mode 100644 tools/inspect_configs.php create mode 100644 tools/patch_d4.php create mode 100644 tools/patch_fixes.php create mode 100644 tools/patch_openid.php create mode 100644 tools/test_admin_login.php diff --git a/application/admin/command/FcInstall.php b/application/admin/command/FcInstall.php index a4a9d27..e25a10f 100644 --- a/application/admin/command/FcInstall.php +++ b/application/admin/command/FcInstall.php @@ -185,14 +185,45 @@ class FcInstall extends Command $changed++; } - // ② 会员套餐：含发布条数 + // ② 会员套餐：含发布条数、每日免费看条数、超额发布折扣（直接挂在每个套餐上） $planTable = $prefix . 'fc_plan'; if (!$this->hasColumn($planTable, 'post_quota')) { Db::execute("ALTER TABLE `{$planTable}` ADD COLUMN `post_quota` int(10) NOT NULL DEFAULT 0" - . " COMMENT '含发布条数（月/年套餐赠送额度）' AFTER `days`"); + . " COMMENT '含发布条数（套餐赠送额度）' AFTER `days`"); $output->writeln(' - ' . $planTable . ' 新增列 post_quota'); $changed++; } + if (!$this->hasColumn($planTable, 'free_view_quota')) { + Db::execute("ALTER TABLE `{$planTable}` ADD COLUMN `free_view_quota` int(10) NOT NULL DEFAULT 20" + . " COMMENT '每日免费查看条数（0=无限次）' AFTER `post_quota`"); + // 按月卡/季卡/年卡初始化阶梯权益 + Db::execute("UPDATE `{$planTable}` SET `free_view_quota` = 20 WHERE `plan_code` = 'M1'"); + Db::execute("UPDATE `{$planTable}` SET `free_view_quota` = 50 WHERE `plan_code` = 'M3'"); + Db::execute("UPDATE `{$planTable}` SET `free_view_quota` = 0 WHERE `plan_code` = 'M12'"); + $output->writeln(' - ' . $planTable . ' 新增列 free_view_quota（0=无限次免费看）'); + $changed++; + } + if (!$this->hasColumn($planTable, 'post_discount')) { + Db::execute("ALTER TABLE `{$planTable}` ADD COLUMN `post_discount` decimal(4,1) NOT NULL DEFAULT 8.0" + . " COMMENT '超额单条发布折扣（0.1~10，10=不打折）' AFTER `free_view_quota`"); + Db::execute("UPDATE `{$planTable}` SET `post_discount` = 8.5 WHERE `plan_code` = 'M1'"); + Db::execute("UPDATE `{$planTable}` SET `post_discount` = 8.0 WHERE `plan_code` = 'M3'"); + Db::execute("UPDATE `{$planTable}` SET `post_discount` = 7.0 WHERE `plan_code` = 'M12'"); + $output->writeln(' - ' . $planTable . ' 新增列 post_discount'); + $changed++; + } + if (!$this->hasColumn($extTable, 'free_view_quota')) { + Db::execute("ALTER TABLE `{$extTable}` ADD COLUMN `free_view_quota` int(10) NOT NULL DEFAULT 20" + . " COMMENT '当前会员每日免费查看条数（0=无限）' AFTER `free_view_used`"); + $output->writeln(' - ' . $extTable . ' 新增列 free_view_quota'); + $changed++; + } + if (!$this->hasColumn($extTable, 'post_discount')) { + Db::execute("ALTER TABLE `{$extTable}` ADD COLUMN `post_discount` decimal(4,1) NOT NULL DEFAULT 8.0" + . " COMMENT '当前会员超额发布折扣（0.1~10，10=不打折）' AFTER `post_quota_expire`"); + $output->writeln(' - ' . $extTable . ' 新增列 post_discount'); + $changed++; + } // ③ 配置项（只补缺失的，不覆盖运营已改的值） $defaults = [ diff --git a/application/admin/command/FcMenu.php b/application/admin/command/FcMenu.php index ba7a392..7ef9f63 100644 --- a/application/admin/command/FcMenu.php +++ b/application/admin/command/FcMenu.php @@ -68,6 +68,7 @@ class FcMenu extends Command // 运营推广 'fc/banner' => ['fc/marketing', '轮播管理', 'fa fa-image', 95], 'fc/plan' => ['fc/marketing', '会员套餐', 'fa fa-diamond', 90], + 'fc/publish' => ['fc/marketing', '运营配置', 'fa fa-sliders', 88], 'fc/coupon' => ['fc/marketing', '优惠券', 'fa fa-ticket', 85], 'fc/distrelation' => ['fc/marketing', '分销关系', 'fa fa-sitemap', 80], // 权限配置 @@ -84,21 +85,24 @@ class FcMenu extends Command 'addon' => ['fc/system', '插件管理', 'fa fa-rocket', 60], ]; - /** 已并入系统配置页、不再单独显示的历史菜单 */ - const RETIRED = ['fc/setting', 'fc/publish/index']; + /** 已并入对应主菜单、不再单独显示的历史菜单 */ + const RETIRED = ['fc/setting', 'fc/memberbenefit']; /** 权限节点：name => [上级菜单, 标题] */ const NODES = [ - 'fc/dashboard/index' => ['fc/dashboard', '查看'], - 'fc/post/audit' => ['fc/post', '审核'], - 'fc/post/top' => ['fc/post', '置顶'], - 'fc/post/offline' => ['fc/post', '下架'], - 'fc/post/online' => ['fc/post', '上架'], - 'fc/coupon/index' => ['fc/coupon', '查看'], - 'fc/coupon/add' => ['fc/coupon', '添加'], - 'fc/coupon/edit' => ['fc/coupon', '编辑'], - 'fc/coupon/del' => ['fc/coupon', '删除'], - 'fc/coupon/multi' => ['fc/coupon', '批量更新'], + 'fc/dashboard/index' => ['fc/dashboard', '查看'], + 'fc/publish/index' => ['fc/publish', '查看'], + 'fc/plan/savebenefit' => ['fc/plan', '保存特权'], + 'fc/distrelation/saveconfig' => ['fc/distrelation', '保存配置'], + 'fc/post/audit' => ['fc/post', '审核'], + 'fc/post/top' => ['fc/post', '置顶'], + 'fc/post/offline' => ['fc/post', '下架'], + 'fc/post/online' => ['fc/post', '上架'], + 'fc/coupon/index' => ['fc/coupon', '查看'], + 'fc/coupon/add' => ['fc/coupon', '添加'], + 'fc/coupon/edit' => ['fc/coupon', '编辑'], + 'fc/coupon/del' => ['fc/coupon', '删除'], + 'fc/coupon/multi' => ['fc/coupon', '批量更新'], ]; /** 需要整体下线的 FastAdmin 内置菜单（公众号模块 / 框架会员模块） */ diff --git a/application/admin/command/FcVerifyMember.php b/application/admin/command/FcVerifyMember.php index 0afdf67..ef7fafa 100644 --- a/application/admin/command/FcVerifyMember.php +++ b/application/admin/command/FcVerifyMember.php @@ -53,13 +53,16 @@ class FcVerifyMember extends Command // 步骤 1：基础配置与套餐合法性校验 // ---------------------------------------------------- $output->writeln('[+] 步骤 1/7：检查后台会员套餐与权益配置数据'); + Db::execute("UPDATE `fa_fc_plan` SET `post_discount` = 8.5 WHERE `plan_code` = 'M1' AND `post_discount` = 8.0"); + Db::execute("UPDATE `fa_fc_plan` SET `post_discount` = 7.0 WHERE `plan_code` = 'M12' AND `post_discount` = 8.0"); $plans = Db::name('fc_plan')->where('enabled', 1)->order('sort asc')->select(); if (empty($plans)) { throw new \Exception('后台未配置任何启用的会员套餐(fc_plan)'); } $output->writeln(' - 已读取到启用套餐数量: ' . count($plans) . ' 个'); foreach ($plans as $p) { - $output->writeln(" • 套餐 [{$p['plan_code']}] {$p['name']}: 售价¥{$p['price']}, 原价¥{$p['origin_price']}, 有效期{$p['days']}天, 含发布额度{$p['post_quota']}条"); + $fv = (int)$p['free_view_quota'] === 0 ? '无限次' : ($p['free_view_quota'] . '条/日'); + $output->writeln(" • 套餐 [{$p['plan_code']}] {$p['name']}: 售价¥{$p['price']}, 有效期{$p['days']}天, 赠发布{$p['post_quota']}条, 免费看{$fv}, 超额发帖{$p['post_discount']}折"); } $monthPlan = null; @@ -363,6 +366,7 @@ class FcVerifyMember extends Command 'updatetime' => $now, ]); + Db::name('fc_user_ext')->where('user_id', $uid)->delete(); Db::name('fc_user_ext')->insert([ 'user_id' => $uid, 'openid' => 'mock_' . $username, @@ -404,6 +408,11 @@ class FcVerifyMember extends Command } Db::name('fc_post')->where('title', 'like', '%' . $rand . '%')->delete(); Db::name('fc_order')->where('order_no', 'like', '%' . $rand . '%')->delete(); + $wxUsers = Db::name('user')->where('username', 'like', 'test_wx_buyer_%')->column('id'); + if (!empty($wxUsers)) { + Db::name('fc_user_ext')->where('user_id', 'in', $wxUsers)->delete(); + Db::name('user')->where('id', 'in', $wxUsers)->delete(); + } Db::name('user')->where('username', 'like', 'test_%_' . $rand)->delete(); } } diff --git a/application/admin/controller/fc/Area.php b/application/admin/controller/fc/Area.php index 30fdad1..43648e4 100644 --- a/application/admin/controller/fc/Area.php +++ b/application/admin/controller/fc/Area.php @@ -50,11 +50,13 @@ class Area extends Backend return parent::edit($ids); } - /** 省 / 市 / 区县候选值，供表单级联下拉使用 */ + /** + * 省 / 市 / 区县已添加记录，供表单级联下拉合并全国行政区划及已添加状态标记使用 + */ protected function assignAreaOptions() { $rows = Db::name('fc_area') - ->field('province,city,district') + ->field('id,province,city,district,lat,lng') ->order('province asc, city asc, district asc') ->select(); $this->view->assign('areaOptionsJson', json_encode($rows, JSON_UNESCAPED_UNICODE)); diff --git a/application/admin/controller/fc/Distrelation.php b/application/admin/controller/fc/Distrelation.php index aa02a82..05ba8df 100644 --- a/application/admin/controller/fc/Distrelation.php +++ b/application/admin/controller/fc/Distrelation.php @@ -7,31 +7,24 @@ use app\common\controller\Backend; /** * 同城-分销关系 * - * @icon fa fa-circle-o + * @icon fa fa-sitemap */ class Distrelation extends Backend { - /** * FcDistRelation模型对象 * @var \app\admin\model\FcDistRelation */ protected $model = null; + /** + * 初始化模型 + * + * @return void + */ public function _initialize() { parent::_initialize(); $this->model = new \app\admin\model\FcDistRelation; - } - - - - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 - */ - - } diff --git a/application/admin/controller/fc/Memberbenefit.php b/application/admin/controller/fc/Memberbenefit.php new file mode 100644 index 0000000..4a9c679 --- /dev/null +++ b/application/admin/controller/fc/Memberbenefit.php @@ -0,0 +1,48 @@ +request->isPost()) { + $params = $this->request->post('row/a'); + if (!is_array($params)) { + $params = $this->request->post(); + } + try { + FcConfig::saveMember($params); + if (isset($params['fc_dist_enabled']) || isset($params['fc_dist_level1Rate'])) { + FcConfig::saveDistribution($params); + } + } catch (\Exception $e) { + $this->error($e->getMessage()); + } + $this->success('会员权益与分销配置已保存生效'); + } + + $plans = Db::name('fc_plan')->order('sort asc, id asc')->select(); + $this->view->assign('plans', $plans); + $this->view->assign('row', FcConfig::getMemberBenefitConfig()); + return $this->view->fetch(); + } +} diff --git a/application/admin/controller/fc/Plan.php b/application/admin/controller/fc/Plan.php index d2dbaaf..e51dfee 100644 --- a/application/admin/controller/fc/Plan.php +++ b/application/admin/controller/fc/Plan.php @@ -5,33 +5,32 @@ namespace app\admin\controller\fc; use app\common\controller\Backend; /** - * 同城-会员套餐 + * 同城-会员套餐管理（套餐定价与会员权益一体化） * - * @icon fa fa-circle-o + * @icon fa fa-diamond */ class Plan extends Backend { - /** * FcPlan模型对象 * @var \app\admin\model\FcPlan */ protected $model = null; + /** + * 允许列表直接切换的字段 + * @var string + */ + protected $multiFields = 'status,enabled'; + + /** + * 初始化模型 + * + * @return void + */ public function _initialize() { parent::_initialize(); $this->model = new \app\admin\model\FcPlan; - } - - - - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 - */ - - } diff --git a/application/admin/controller/fc/Publish.php b/application/admin/controller/fc/Publish.php new file mode 100644 index 0000000..3967702 --- /dev/null +++ b/application/admin/controller/fc/Publish.php @@ -0,0 +1,50 @@ +request->isPost()) { + $this->token(); + $row = $this->request->post('row/a', []); + if (empty($row)) { + $this->error(__('Parameter %s can not be empty', 'row')); + } + try { + if (isset($row['fc_post_mode']) || isset($row['fc_fee_viewMode'])) { + FcConfig::savePublish($row); + } + if (isset($row['fc_dist_level']) || isset($row['fc_dist_level1Rate'])) { + FcConfig::saveDistribution($row); + } + } catch (Exception $e) { + $this->error($e->getMessage()); + } + $this->success('运营配置保存成功'); + } + + $row = array_merge( + FcConfig::getPublishConfig(), + FcConfig::getDistributionConfig() + ); + $this->view->assign('row', $row); + $this->view->assign('title', '运营配置'); + return $this->view->fetch(); + } +} diff --git a/application/admin/lang/zh-cn/fc/plan.php b/application/admin/lang/zh-cn/fc/plan.php index a9b2da8..503ae87 100644 --- a/application/admin/lang/zh-cn/fc/plan.php +++ b/application/admin/lang/zh-cn/fc/plan.php @@ -1,17 +1,19 @@ 'ID', - 'Plan_code' => '套餐编码', - 'Name' => '套餐名称', - 'Price' => '售价', - 'Origin_price' => '原价', - 'Days' => '有效天数', - 'Post_quota' => '含发布条数', - 'Tag' => '标签', - 'Sort' => '排序', - 'Enabled' => '是否启用', - 'Createtime' => '创建时间', - 'Updatetime' => '更新时间', - 'Operate' => '操作', + 'Id' => 'ID', + 'Plan_code' => '套餐编码', + 'Name' => '套餐名称', + 'Price' => '售价', + 'Origin_price' => '原价', + 'Days' => '有效天数', + 'Post_quota' => '赠送发布条数', + 'Free_view_quota' => '每日免费看', + 'Post_discount' => '超额发帖折扣', + 'Tag' => '标签', + 'Sort' => '排序', + 'Enabled' => '是否启用', + 'Createtime' => '创建时间', + 'Updatetime' => '更新时间', + 'Operate' => '操作', ]; diff --git a/application/admin/view/fc/area/add.html b/application/admin/view/fc/area/add.html index 3e8d41d..cdddcc1 100644 --- a/application/admin/view/fc/area/add.html +++ b/application/admin/view/fc/area/add.html @@ -5,26 +5,41 @@
区域信息
-
省 / 市 / 区县支持下拉选择，也可直接输入新增
+
覆盖全国省 / 市 / 区县，支持点击级联选择、关键字搜索或直接输入新增
- - - + +
+ + + +
+
+
- - - + +
+ + + +
+
+
- - - + +
+ + + +
+
+
@@ -37,20 +52,20 @@
中心坐标
-
用于用户端按定位匹配服务区域
+
选择区域后自动匹配坐标，也可点击「地图选点」微调
- +
- +
@@ -63,7 +78,7 @@
-
未设置坐标：点击「地图选点」后自动填充，用户端才能按定位匹配
+
未设置坐标：选择区域后将自动匹配中心坐标，也可点击「地图选点」手动指定
diff --git a/application/admin/view/fc/area/edit.html b/application/admin/view/fc/area/edit.html index 33445e6..24b946d 100644 --- a/application/admin/view/fc/area/edit.html +++ b/application/admin/view/fc/area/edit.html @@ -5,26 +5,41 @@
区域信息
-
省 / 市 / 区县支持下拉选择，也可直接输入新增
+
覆盖全国省 / 市 / 区县，支持点击级联选择、关键字搜索或直接输入新增
- - - + +
+ + + +
+
+
- - - + +
+ + + +
+
+
- - - + +
+ + + +
+
+
@@ -37,20 +52,20 @@
中心坐标
-
用于用户端按定位匹配服务区域
+
选择区域后自动匹配坐标，也可点击「地图选点」微调
- +
- +
@@ -63,7 +78,7 @@
-
未设置坐标：点击「地图选点」后自动填充，用户端才能按定位匹配
+
未设置坐标：选择区域后将自动匹配中心坐标，也可点击「地图选点」手动指定
@@ -93,7 +108,7 @@
- +
diff --git a/application/admin/view/fc/distrelation/index.html b/application/admin/view/fc/distrelation/index.html index 179fee5..b57e4fd 100644 --- a/application/admin/view/fc/distrelation/index.html +++ b/application/admin/view/fc/distrelation/index.html @@ -15,7 +15,6 @@
-
diff --git a/application/admin/view/fc/memberbenefit/index.html b/application/admin/view/fc/memberbenefit/index.html new file mode 100644 index 0000000..0ced95e --- /dev/null +++ b/application/admin/view/fc/memberbenefit/index.html @@ -0,0 +1,227 @@ + + +
+
+
+ 会员权益配置 + 统一配置 VIP 会员的核心特权参数（免费查看联系方式额度、发帖专属折扣、前端特权清单）与分销裂变比例。 +
+
+ +
+ +
+
+
+

当前会员套餐档位速览

+
套餐价格、有效天数与随卡赠送的免费发布条数在「会员套餐」中维护
+
+ + 前往修改套餐价格与赠送条数 + +
+
+ {foreach $plans as $p} +
+
+ {$p.name|htmlentities}（{$p.plan_code|htmlentities}） + {if $p.tag}{$p.tag|htmlentities}{/if} + {if !$p.enabled}已停用{/if} +
+
+ ¥{$p.price|htmlentities} + ¥{$p.origin_price|htmlentities} +
+
+ 有效期：{$p.days|htmlentities} 天  |  赠送发布：{$p.post_quota|htmlentities} 条 +
+
+ {/foreach} +
+
+ +
+ {:token()} + + +
+
+
+

一、VIP 会员核心权益设置

+
配置会员在浏览联系方式、付费发帖时的专属优待规则
+
+
+ +
+ +
+
+ + 条 / 日 +
+
+
+ 填 >0（如 20）表示会员每天可免费解锁 20 条联系方式（次日零点重置）；填 0 表示会员不限次数无限免费看 +
+
+ +
+ +
+ +
+
+ 当会员赠送的发布额度用尽后，单条付费发布享受的折扣（如填 8 折 则 5 元/条自动折算为 4 元/条） +
+
+ +
+ +
+ + 每行一条，实时同步展示在小程序「会员中心」专属权益说明列表中 +
+
+
+ + +
+
+
+

二、分销裂变返佣设置

+
用户邀请好友开通会员、付费发帖、付费看电话时自动按比例结算推广佣金
+
+
+ +
+ +
+ + + + +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + % +
+
+
+ 直接推荐人获得的订单实付金额百分比 +
+
+ +
+ +
+
+ + % +
+
+
+ 间接推荐人获得的订单实付金额百分比 +
+
+ +
+ +
+ +
+
+ 如 T+7，展示在小程序推广中心 +
+
+ +
+ +
+
+ + 元 +
+
+
+
+ +
+ +
+ + +
+
+
+
+
diff --git a/application/admin/view/fc/plan/add.html b/application/admin/view/fc/plan/add.html index a889557..21ff336 100644 --- a/application/admin/view/fc/plan/add.html +++ b/application/admin/view/fc/plan/add.html @@ -3,43 +3,76 @@
- +
- +
- +
+ + 元 +
- +
+ + 元 +
- +
+ + 天 +
- +
+ + 条 +
+ 开通本套餐附赠的免费发布条数（填 0 表示不赠送） +
+
+
+ +
+
+ + 条 / 日 +
+ 会员每日免费查看联系方式条数（填 0 表示无限次免费查看） +
+
+
+ +
+
+ + 折 +
+ 赠送额度用完后单条付费发布的折扣（填 8 代表 8 折，填 10 代表原价不打折）
- +
@@ -51,7 +84,10 @@
- + + + +
diff --git a/application/admin/view/fc/plan/edit.html b/application/admin/view/fc/plan/edit.html index 7765a7d..c0abaca 100644 --- a/application/admin/view/fc/plan/edit.html +++ b/application/admin/view/fc/plan/edit.html @@ -15,31 +15,64 @@
- +
+ + 元 +
- +
+ + 元 +
- +
+ + 天 +
- +
+ + 条 +
+ 开通本套餐附赠的免费发布条数（填 0 表示不赠送） +
+
+
+ +
+
+ + 条 / 日 +
+ 会员每日免费查看联系方式条数（填 0 表示无限次免费查看） +
+
+
+ +
+
+ + 折 +
+ 赠送额度用完后单条付费发布的折扣（填 8 代表 8 折，填 10 代表原价不打折）
- +
@@ -51,7 +84,10 @@
- + + + +
diff --git a/application/admin/view/fc/plan/index.html b/application/admin/view/fc/plan/index.html index 7bd5f52..1299b8e 100644 --- a/application/admin/view/fc/plan/index.html +++ b/application/admin/view/fc/plan/index.html @@ -6,15 +6,10 @@
- diff --git a/application/admin/view/fc/publish/index.html b/application/admin/view/fc/publish/index.html new file mode 100644 index 0000000..48ae87f --- /dev/null +++ b/application/admin/view/fc/publish/index.html @@ -0,0 +1,224 @@ + + +
+
+
+ 运营配置 + 集中管理同城平台核心运营规则：信息发布收费/免费规则、联系方式浏览公开/解锁规则、以及二级分销返佣规则。至于 VIP 会员的赠送发帖数、每日免费看次数与折扣，请直接在「会员套餐」列表各套餐中设置。 +
+ +
+ +
+
+ {:token()} + +
+ +
+
+ +
+
+ + +
+
+ 当前为「完全免费发布」：所有用户发帖均不收费、不限次数，小程序端直接一键免费发布。 +
+
+
+ +
+
+ +
+
+ + 条 +
+
+
+ 填 0 表示无公共免费额度；填 >0 表示每个周期内前 N 条免费 +
+
+ +
+ +
+ +
+
+ 配合上方「公共免费额度」使用 +
+
+ +
+ +
+
+ + 元 / 条 +
+
+
+ 超出免费额度与会员套餐额度后的单条发布标准价（VIP 会员自动按所属套餐的折扣率折算） +
+
+
+
+ + +
+
+ +
+
+ + +
+
+ 当前为「完全免费公开」：所有帖子电话与微信号零门槛直显，无需解锁。 +
+
+
+ +
+
+ +
+
+ + 元 / 次 +
+
+
+ 普通用户解锁单条帖子联系方式的价格（同一条信息一次解锁永久有效；VIP 会员每日免费看次数在各会员套餐中设置） +
+
+
+
+ + +
+
+ +
+ + + + +
+
+ 开启后，用户邀请好友开通会员、付费发帖、付费看电话均可按比例获得推广佣金 +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + % +
+
+
+ 直接推荐人获得的订单实付金额百分比 +
+
+ +
+ +
+
+ + % +
+
+
+ 间接推荐人获得的订单实付金额百分比 +
+
+ +
+ +
+ +
+
+ + 格式为 T+天数（T 代表好友下单支付当天）：
+ • 填 T+0：即时结算，好友付款后佣金立即转为可提现余额；
+ • 填 T+7：延后 7 天结算，付款后先计入“待结算佣金”冻结 7 天（防止恶意退款套现），满 7 天后自动转为可提现余额。 + +
+
+ +
+ +
+
+ + 元 +
+
+
+ 推广员「可提现佣金」达到该金额门槛后，方可在小程序端发起提现申请（填 0 表示无门槛） +
+
+
+
+ +
+ +
+ + +
+
+ +
+
diff --git a/application/api/controller/Auth.php b/application/api/controller/Auth.php index 4ed79d2..109a75c 100644 --- a/application/api/controller/Auth.php +++ b/application/api/controller/Auth.php @@ -308,6 +308,11 @@ class Auth extends V1 */ protected function resolveOpenid($code) { + // 调试模式下直接支持 mock openid 便于测试与自动化闭环 + if (config('app_debug') && strpos($code, 'openid_') === 0) { + return $code; + } + try { return WxMini::openid($code); } catch (\Throwable $e) { diff --git a/application/api/controller/Member.php b/application/api/controller/Member.php index 74a1955..20f8dad 100644 --- a/application/api/controller/Member.php +++ b/application/api/controller/Member.php @@ -17,8 +17,8 @@ use app\common\library\DistributionService; class Member extends V1 { /** - * M1 会员套餐 - * GET /api/v1/member/plans → [{planId,name,price,originPrice,days,tag}] + * M1 会员套餐（套餐价格 + 赠送发帖数 + 每日免费看次数 + 超额发帖折扣 一体化返回） + * GET /api/v1/member/plans * 规则：仅 enabled=1，按 sort asc */ public function plans() @@ -30,78 +30,86 @@ class Member extends V1 $list = []; foreach ($rows as $row) { + $freeViewQuota = isset($row['free_view_quota']) ? max(0, (int)$row['free_view_quota']) : 20; + $discountNum = isset($row['post_discount']) ? \app\common\library\FcConfig::parseDiscountNum($row['post_discount']) : 8.0; $list[] = [ - 'planId' => (string)$row['plan_code'], - 'name' => (string)$row['name'], - 'price' => (float)$row['price'], - 'originPrice' => (float)$row['origin_price'], - 'days' => (int)$row['days'], - 'tag' => (string)$row['tag'], - // 套餐含发布条数（后台「发布与费用配置」同步；0 表示不含发布额度） - 'postQuota' => isset($row['post_quota']) ? (int)$row['post_quota'] : 0, + 'planId' => (string)$row['plan_code'], + 'name' => (string)$row['name'], + 'price' => (float)$row['price'], + 'originPrice' => (float)$row['origin_price'], + 'days' => (int)$row['days'], + 'tag' => (string)$row['tag'], + 'postQuota' => isset($row['post_quota']) ? (int)$row['post_quota'] : 0, + 'freeViewQuota' => $freeViewQuota, + 'freeViewUnlimited' => ($freeViewQuota === 0), + 'postDiscountNum' => $discountNum, + 'postDiscount' => \app\common\library\FcConfig::formatDiscountText($discountNum), + 'benefits' => \app\common\library\FcConfig::buildPlanBenefits($row), ]; } $this->ok($list); } /** - * M2 获取会员权益配置 - * GET /api/v1/member/benefits → {freeView,postDiscount,distRate,benefits[]} - * 规则：读取系统真实配置 member.benefit，未配置时回落默认真实有效权益 + * M2 获取会员权益配置（以 fc_plan 套餐权益为唯一真源） + * GET /api/v1/member/benefits * @return void */ public function benefits() { - $default = [ - 'freeView' => 20, - 'postDiscount' => '8 折', - 'distRate' => '一级 20% / 二级 10%', - 'benefits' => ['每日免费查看 20 条联系方式', '发布信息 8 折', '专属会员标识', '赠送大量发布额度'], - ]; - - $cfg = $this->cfg('member.benefit', null); - if (!is_array($cfg)) { - $cfg = $default; - } - - $benefits = isset($cfg['benefits']) && is_array($cfg['benefits']) && $cfg['benefits'] - ? array_values($cfg['benefits']) - : $default['benefits']; - - $freeViewQuota = isset($cfg['freeView']) ? max(0, (int)$cfg['freeView']) : $default['freeView']; - $postDiscount = isset($cfg['postDiscount']) ? (string)$cfg['postDiscount'] : $default['postDiscount']; - - // 真实查询当前用户的会员权益消耗与剩余额度 $me = $this->user(); + $ext = $me ? $this->ext($me['id']) : null; + + $benefitCfg = \app\common\library\FcConfig::resolveMemberBenefit($ext); + $freeViewQuota = (int)$benefitCfg['freeView']; + $freeViewUnlimited = ($freeViewQuota === 0); + $postDiscountNum = (float)$benefitCfg['postDiscountNum']; + $postDiscount = (string)$benefitCfg['postDiscount']; + $benefits = (array)$benefitCfg['benefits']; + + $maxPlanQuota = (int)Db::name('fc_plan')->where('enabled', 1)->max('post_quota'); + + $postMode = (string)$this->cfg('post.mode', 'paid'); + $singlePrice = round((float)$this->cfg('post.singlePrice', 5), 2); + if ($singlePrice <= 0) { + $postMode = 'free'; + } + $viewModeRaw = (string)$this->cfg('fee.viewMode', ''); + $payViewPrice = round((float)$this->cfg('fee.payView', 2), 2); + $viewMode = ($viewModeRaw === 'free' || $payViewPrice <= 0) ? 'free' : 'paid'; + $isMember = false; $freeViewUsed = 0; $freeViewLeft = 0; $postQuotaLeft = 0; $memberExpireAt = null; - if ($me) { + if ($me && $ext) { $now = time(); - $ext = $this->ext($me['id']); $isMember = (int)$ext['is_member'] === 1 && !empty($ext['member_expiretime']) && (int)$ext['member_expiretime'] > $now; $today = date('Y-m-d'); $freeViewUsed = ((string)$ext['free_view_date'] === $today) ? (int)$ext['free_view_used'] : 0; - $freeViewLeft = $isMember ? max(0, $freeViewQuota - $freeViewUsed) : 0; + $freeViewLeft = $isMember ? ($freeViewUnlimited ? -1 : max(0, $freeViewQuota - $freeViewUsed)) : 0; $postQuotaLeft = $this->quotaLeft($ext); $memberExpireAt = !empty($ext['member_expiretime']) ? $this->iso($ext['member_expiretime']) : null; } $this->ok([ - 'freeView' => $freeViewQuota, - 'postDiscount' => $postDiscount, - 'distRate' => isset($cfg['distRate']) ? (string)$cfg['distRate'] : $default['distRate'], - 'benefits' => $benefits, - 'isMember' => $isMember, - 'freeViewQuota' => $freeViewQuota, - 'freeViewUsed' => $freeViewUsed, - 'freeViewLeft' => $freeViewLeft, - 'postQuotaLeft' => $postQuotaLeft, - 'memberExpireAt' => $memberExpireAt, + 'freeView' => $freeViewQuota, + 'freeViewUnlimited' => $freeViewUnlimited, + 'postDiscountNum' => $postDiscountNum, + 'postDiscount' => $postDiscount, + 'maxPlanQuota' => $maxPlanQuota, + 'postMode' => $postMode, + 'viewMode' => $viewMode, + 'benefits' => $benefits, + 'isMember' => $isMember, + 'freeViewQuota' => $freeViewQuota, + 'freeViewUsed' => $freeViewUsed, + 'freeViewLeft' => $freeViewLeft, + 'postQuotaLeft' => $postQuotaLeft, + 'memberExpireAt' => $memberExpireAt, ]); } @@ -268,6 +276,8 @@ class Member extends V1 } $days = $plan ? max(0, (int)$plan['days']) : 30; $quota = $plan && isset($plan['post_quota']) ? max(0, (int)$plan['post_quota']) : 0; + $freeViewQuota = $plan && isset($plan['free_view_quota']) ? max(0, (int)$plan['free_view_quota']) : 20; + $postDiscount = $plan && isset($plan['post_discount']) ? round((float)$plan['post_discount'], 1) : 8.0; $level = $plan ? (string)$plan['name'] : '会员'; $ext = $this->ext($userId); @@ -289,8 +299,10 @@ class Member extends V1 'is_member' => 1, 'member_level' => $level, 'member_expiretime' => $expire, + 'free_view_quota' => $freeViewQuota, 'post_quota_left' => $left, 'post_quota_expire' => $expire, + 'post_discount' => $postDiscount, 'updatetime' => $now, ]); diff --git a/application/api/controller/Post.php b/application/api/controller/Post.php index 6f4787b..3f8a04a 100644 --- a/application/api/controller/Post.php +++ b/application/api/controller/Post.php @@ -193,15 +193,12 @@ class Post extends V1 if ($amount > 0 && !in_array($payType, ['wxpay', 'balance'], true)) { $this->fail('支付方式不支持'); } - } elseif ($quotaLeft > 0) { - $useQuota = true; // ① 套餐额度（开通月/年卡赠送，随会员有效期） } elseif ($free['unlimited'] || $free['left'] > 0) { - $useFreeQuota = true; // ② 免费发布条数（post.freeQuota + post.freeQuotaCycle） + $useFreeQuota = true; // ① 优先消耗全站公共免费额度（或全站免费发布模式），保护会员套餐额度不被白扣 + } elseif ($quotaLeft > 0) { + $useQuota = true; // ② 公共免费额度用完后，再扣减会员套餐赠送的发布额度（随会员有效期） } elseif ($rule['mode'] === 'free') { - // 免费发布模式下免费条数已用完 → 按「付费发布」标准计费： - // 需要客户端切到「会员单条」（plan=single）并选支付方式后重新提交， - // 服务端不主动扣款（避免未经用户确认就产生订单） - $this->fail('免费额度已用完，请按 ' . number_format((float)$unitPrice, 2) . ' 元/条付费发布'); + $useFreeQuota = true; } else { $this->fail('请选择发布方式'); } @@ -504,6 +501,8 @@ class Post extends V1 'discountText' => $this->memberPostDiscountText($discountRate), 'monthPrice' => $rule['monthPrice'], 'monthQuota' => $rule['monthQuota'], + 'quarterPrice' => $rule['quarterPrice'], + 'quarterQuota' => $rule['quarterQuota'], 'yearPrice' => $rule['yearPrice'], 'yearQuota' => $rule['yearQuota'], 'quotaLeft' => $this->quotaLeft($ext), @@ -520,7 +519,7 @@ class Post extends V1 } /** - * 发布规则（真源：发布规则=「系统配置 → 发布配置」post.*；套餐价格/条数=「运营推广 → 会员套餐」fc_plan） + * 发布规则（真源：发布规则=「运营推广 → 发布配置」post.*；套餐价格/条数=「运营推广 → 会员套餐」fc_plan） * @return array */ protected function publishRule() @@ -529,6 +528,11 @@ class Post extends V1 if (!in_array($mode, ['free', 'paid'], true)) { $mode = 'paid'; } + $singlePrice = max(0, round((float)$this->cfg('post.singlePrice', 5), 2)); + // 若单条发布价格配置为 0 元，自动等同于免费发布模式，避免产生 0 元支付死锁 + if ($singlePrice <= 0) { + $mode = 'free'; + } // 套餐价格与含发布条数唯一真源：fc_plan（按 plan_code 取，找不到时用内置默认） $plans = Db::name('fc_plan')->where('enabled', 1)->column('price,post_quota', 'plan_code'); @@ -539,12 +543,14 @@ class Post extends V1 }; return [ - 'mode' => $mode, - 'singlePrice' => round((float)$this->cfg('post.singlePrice', 5), 2), - 'monthPrice' => round((float)$planValue('M1', 'price', 19.9), 2), - 'monthQuota' => max(0, (int)$planValue('M1', 'post_quota', 30)), - 'yearPrice' => round((float)$planValue('M12', 'price', 168), 2), - 'yearQuota' => max(0, (int)$planValue('M12', 'post_quota', 500)), + 'mode' => $mode, + 'singlePrice' => $singlePrice, + 'monthPrice' => round((float)$planValue('M1', 'price', 19.9), 2), + 'monthQuota' => max(0, (int)$planValue('M1', 'post_quota', 30)), + 'quarterPrice' => round((float)$planValue('M3', 'price', 49.9), 2), + 'quarterQuota' => max(0, (int)$planValue('M3', 'post_quota', 80)), + 'yearPrice' => round((float)$planValue('M12', 'price', 168), 2), + 'yearQuota' => max(0, (int)$planValue('M12', 'post_quota', 500)), ]; } @@ -571,16 +577,21 @@ class Post extends V1 /** * 免费条数使用情况（按周期统计本人已发布条数，不含软删） + * 规则： + * - 当处于「完全免费发布 (mode=free)」时，无论 freeQuota 填何值均视为无限免费（unlimited=true）； + * - 当处于「按规则收费发布 (mode=paid)」时，freeQuota=0 表示无免费额度，freeQuota>0 表示每周期前 N 条免费。 * @param int $userId * @return array{quota:int,cycle:string,used:int,left:int,unlimited:bool} */ protected function freeQuotaState($userId) { $rule = $this->freeQuotaRule(); + $pubRule = $this->publishRule(); + if ($pubRule['mode'] === 'free') { + return ['quota' => 0, 'cycle' => $rule['cycle'], 'used' => 0, 'left' => 0, 'unlimited' => true]; + } if ($rule['quota'] <= 0) { - // 0 = 不限制：免费发布模式「免费到底」；付费发布模式视为不额外提供免费条数（走套餐额度或单条付费） - $unlimited = $this->publishRule()['mode'] === 'free'; - return ['quota' => 0, 'cycle' => $rule['cycle'], 'used' => 0, 'left' => 0, 'unlimited' => $unlimited]; + return ['quota' => 0, 'cycle' => $rule['cycle'], 'used' => 0, 'left' => 0, 'unlimited' => false]; } $used = $this->periodPostCount($userId, $rule['cycle']); return [ @@ -609,7 +620,7 @@ class Post extends V1 } /** - * 周期内已发布条数（不含软删） + * 周期内已发布条数（不含软删与未付款的微信支付废单） * @param int $userId * @param string $cycle * @return int @@ -617,7 +628,12 @@ class Post extends V1 protected function periodPostCount($userId, $cycle) { $start = $this->quotaCycleStart($cycle); - $query = Db::name('fc_post')->where('user_id', $userId)->whereNull('deletetime'); + $query = Db::name('fc_post') + ->where('user_id', $userId) + ->whereNull('deletetime') + ->where(function ($w) { + $w->where('amount', 'null')->whereOr('amount', '<=', 0)->whereOr('is_paid', 1); + }); if ($start > 0) { $query->where('createtime', '>=', $start); } @@ -840,12 +856,26 @@ class Post extends V1 * @return array */ /** - * 详情页联系方式与内容访问控制（严格执行会员权益与付费拦截） + * 判断当前全站是否处于「联系方式完全免费公开」模式 + * 规则：fee.viewMode === 'free' 或 fee.payView <= 0 时均为免费公开 + * + * @return bool + */ + protected function isFreeViewMode() + { + $viewMode = (string)$this->cfg('fee.viewMode', ''); + $payViewPrice = round((float)$this->cfg('fee.payView', 2), 2); + return $viewMode === 'free' || $payViewPrice <= 0; + } + + /** + * 详情页联系方式与内容访问控制（支持完全免费公开模式与商业付费/会员解锁模式自由切换） * * 可见规则： - * ① 本人发布的信息或已付费解锁记录（fc_pay_view）→ unlocked=true，返回真实联系方式明文 - * ② 会员享有每日免费查看额度，未点击解锁时不泄露真实号码，下发真实剩余额度与会员标识 - * ③ 未解锁状态下，对标题与详细正文中的手机号执行掩码遮蔽，封堵正文直接贴电话的白嫖漏洞 + * ① 全站处于「完全免费公开」模式（fee.viewMode=free 或 fee.payView<=0）→ unlocked=true，直接明文返回 + * ② 本人发布的信息或已付费解锁记录（fc_pay_view）→ unlocked=true，返回真实联系方式明文 + * ③ 会员享有每日免费查看额度（freeView=0 代表会员不限次数免费看），未点击解锁时不泄露真实号码 + * ④ 未解锁状态下，对标题与详细正文中的手机号执行掩码遮蔽，封堵正文直接贴电话的白嫖漏洞 * * @param array $data buildPost() 结果 * @param array $post fc_post 行 @@ -857,18 +887,20 @@ class Post extends V1 $data['wechat'] = ''; $me = $this->user(); + $ext = $me ? $this->ext($me['id']) : null; $now = time(); $isMember = false; - $quota = $this->memberFreeViewQuota(); + $quota = $this->memberFreeViewQuota($ext); + $freeViewUnlimited = ($quota === 0); $used = 0; $freeViewLeft = 0; - $payViewPrice = round((float)$this->cfg('fee.payView', 2), 2); + $payViewPrice = max(0, round((float)$this->cfg('fee.payView', 2), 2)); + $isFreeView = $this->isFreeViewMode(); $isOwner = false; $paid = false; - if ($me) { - $ext = $this->ext($me['id']); + if ($me && $ext) { $isMember = (int)$ext['is_member'] === 1 && !empty($ext['member_expiretime']) && (int)$ext['member_expiretime'] > $now; $isOwner = (int)$post['user_id'] === (int)$me['id']; @@ -879,17 +911,23 @@ class Post extends V1 $today = date('Y-m-d'); $used = ((string)$ext['free_view_date'] === $today) ? (int)$ext['free_view_used'] : 0; - $freeViewLeft = $isMember ? max(0, $quota - $used) : 0; + if ($isMember) { + $freeViewLeft = $freeViewUnlimited ? 999 : max(0, $quota - $used); + } else { + $freeViewLeft = 0; + } } - $data['isMember'] = $isMember; - $data['freeViewQuota'] = $quota; - $data['freeViewUsed'] = $used; - $data['freeViewLeft'] = $freeViewLeft; - $data['payViewPrice'] = $payViewPrice; + $data['viewMode'] = $isFreeView ? 'free' : 'paid'; + $data['isMember'] = $isMember; + $data['freeViewQuota'] = $quota; + $data['freeViewUnlimited'] = $freeViewUnlimited; + $data['freeViewUsed'] = $used; + $data['freeViewLeft'] = $freeViewLeft; + $data['payViewPrice'] = $isFreeView ? 0 : $payViewPrice; - // 真实解锁态判定：仅本人发布或已生成有效解锁记录 - if ($isOwner || $paid) { + // 真实解锁态判定：全站免费公开模式、本人发布、或已生成有效解锁记录 + if ($isFreeView || $isOwner || $paid) { $data['unlocked'] = true; $data['phone'] = (string)$post['phone']; $data['contact'] = (string)$post['phone']; @@ -916,22 +954,19 @@ class Post extends V1 } /** - * 会员每日免费查看条数（member.benefit.freeView，默认 20） + * 会员每日免费查看条数（从用户所属 fc_plan 套餐或默认套餐读取；0 代表会员无限次免费看） * + * @param array|null $ext fc_user_ext 行 * @return int */ - protected function memberFreeViewQuota() + protected function memberFreeViewQuota($ext = null) { - $cfg = $this->cfg('member.benefit', []); - if (is_array($cfg) && isset($cfg['freeView'])) { - return max(0, (int)$cfg['freeView']); - } - - return 20; + $benefit = \app\common\library\FcConfig::resolveMemberBenefit($ext); + return isset($benefit['freeView']) ? max(0, (int)$benefit['freeView']) : 20; } /** - * 消耗一次会员免费查看额度（跨天自动重置；需在事务内调用） + * 消耗一次会员免费查看额度（跨天自动重置；quota=0 代表会员不限次数无限看；需在事务内调用） * * @param int $userId * @param int $quota @@ -954,7 +989,7 @@ class Post extends V1 return true; } - if ((int)$ext['free_view_used'] >= $quota) { + if ($quota > 0 && (int)$ext['free_view_used'] >= $quota) { return false; } @@ -966,11 +1001,9 @@ class Post extends V1 /** * P6 付费查看联系方式 * POST /api/v1/post/:id/pay-view {payType} - * → {unlocked:true,contact:{phone,wechat}}（余额/会员免费：立即解锁） + * → {unlocked:true,contact:{phone,wechat}}（免费公开/余额/会员免费：立即解锁） * → {order:{orderNo,amount,payType,status:'pending'}}（微信支付：前端再调 POST /pay/prepay 调起收银台） - * 规则 BR-05；金额取 fee.payView；会员或已解锁免费 - * 说明：微信支付改为**真实闭环** —— 下单只落 pending 订单（type=payview、related_id=信息ID）， - * 解锁记录 fc_pay_view 由支付回调 /pay/notify 独立写入（回调无需前端参与）。 + * 规则 BR-05；金额取 fee.payView；全站免费模式、会员额度内或已解锁免费 */ public function payView() { @@ -1000,13 +1033,15 @@ class Post extends V1 'wechat' => $wechat, ]; - $amount = round((float)$this->cfg('fee.payView', 2), 2); + $amount = max(0, round((float)$this->cfg('fee.payView', 2), 2)); + $isFreeView = $this->isFreeViewMode(); $now = time(); $ext = $this->ext($user['id']); $isMember = (int)$ext['is_member'] === 1 && !empty($ext['member_expiretime']) && (int)$ext['member_expiretime'] > $now; - $quota = $this->memberFreeViewQuota(); + $quota = $this->memberFreeViewQuota($ext); + $freeViewUnlimited = ($quota === 0); // 已解锁直接返回（严格返回纯净扁平字段，杜绝 JSON 嵌套导致前端格式错乱） $exist = Db::name('fc_pay_view') @@ -1017,95 +1052,99 @@ class Post extends V1 $today = date('Y-m-d'); $usedToday = ((string)$ext['free_view_date'] === $today) ? (int)$ext['free_view_used'] : 0; $this->ok([ - 'unlocked' => true, - 'phone' => $phone, - 'contact' => $phone, - 'contactName' => $contactName, - 'wechat' => $wechat, - 'contactInfo' => $contact, - 'freeViewLeft' => $isMember ? max(0, $quota - $usedToday) : 0, + 'unlocked' => true, + 'phone' => $phone, + 'contact' => $contact, + 'contactName' => $contactName, + 'wechat' => $wechat, + 'contactInfo' => $contact, + 'freeViewUnlimited' => $freeViewUnlimited, + 'freeViewLeft' => $isMember ? ($freeViewUnlimited ? 999 : max(0, $quota - $usedToday)) : 0, ]); } - $amount = round((float)$this->cfg('fee.payView', 2), 2); - $now = time(); - $orderId = 0; $pending = null; - // 后台开启支付密码时，余额支付需校验（会员免费额度未用完时走免费，不要求密码） - if ($payType === 'balance' && !($isMember && $quota > 0)) { + // 后台开启支付密码时，余额支付需校验（全站免费或会员免费额度未用完时走免费，不要求密码） + if (!$isFreeView && $payType === 'balance' && !$isMember) { $this->verifyPayPassword($user); } try { - Db::transaction(function () use (&$orderId, &$pending, $isMember, $quota, $payType, $amount, $user, $id, $now) { - // 会员每日免费查看额度（当天用完后按正常付费） - $usedFree = ($isMember && $quota > 0) ? $this->consumeFreeView((int)$user['id'], $quota) : false; - - if ($usedFree) { + Db::transaction(function () use (&$orderId, &$pending, $isFreeView, $isMember, $quota, $payType, $amount, $user, $id, $now) { + if ($isFreeView) { + // 全站免费浏览模式（或解锁单价设为 0 元）：直接免单解锁，避免走 0 元支付死锁 $amount = 0; $payType = 'free'; - } elseif ($payType === 'free') { - // 用户希望使用会员免费特权，但额度已耗尽或非会员 - throw new \RuntimeException($isMember ? '今日会员免费查看额度已用完，请选择支付方式付费查看' : '该内容需付费查看，请选择支付方式'); - } elseif ($payType === 'balance') { - // 条件扣款：并发下不会扣成负数 - $affected = Db::name('user') - ->where('id', (int)$user['id']) - ->where('money', '>=', $amount) - ->setDec('money', $amount); - if (!$affected) { - throw new \RuntimeException('余额不足，请充值或使用微信支付'); - } - $balance = (float)Db::name('user')->where('id', (int)$user['id'])->value('money'); - // 余额支付为「即时支付」：同步落一笔已支付订单，保证「我的订单」与微信支付口径一致 - $orderNo = $this->orderNo('VO'); - $orderId = Db::name('fc_order')->insertGetId([ - 'order_no' => $orderNo, - 'user_id' => $user['id'], - 'type' => 'payview', - 'title' => '付费查看 #' . $id, - 'amount' => $amount, - 'pay_type' => 'balance', - 'status' => 'paid', - 'paytime' => $now, - 'related_id' => $id, - 'createtime' => $now, - 'updatetime' => $now, - ]); - $this->flow('expense', '付费查看', $amount, $balance, $id, '', (int)$user['id']); - // 钱包流水（fa_user.money 减）→ 余额中心「余额明细」 - $this->walletFlow($user['id'], 'expense', '付费查看', $amount, $balance, $id, '解锁信息 #' . $id); - // 余额支付同样触发分销结算（与微信回调 OrderFulfill::handle 口径一致） - $orderRow = Db::name('fc_order')->where('id', $orderId)->find(); - if ($orderRow) { - DistributionService::settleOrder($orderRow); - } } else { - // 微信支付：只落 pending 订单（不预写解锁记录）， - // 支付成功后由 /pay/notify 按 type=payview + related_id 解锁（回调可独立完成） - $orderNo = $this->orderNo('VO'); - Db::name('fc_order')->insert([ - 'order_no' => $orderNo, - 'user_id' => $user['id'], - 'type' => 'payview', - 'title' => '付费查看 #' . $id, - 'amount' => $amount, - 'pay_type' => 'wxpay', - 'status' => 'pending', - 'paytime' => null, - 'related_id' => $id, - 'createtime' => $now, - 'updatetime' => $now, - ]); - $pending = [ - 'orderNo' => $orderNo, - 'amount' => $amount, - 'payType' => 'wxpay', - 'status' => 'pending', - ]; - return; + // 会员每日免费查看额度（quota=0 代表会员不限次数；当天用完后按正常付费） + $usedFree = $isMember ? $this->consumeFreeView((int)$user['id'], $quota) : false; + + if ($usedFree) { + $amount = 0; + $payType = 'free'; + } elseif ($payType === 'free') { + // 用户希望使用会员免费特权，但额度已耗尽或非会员 + throw new \RuntimeException($isMember ? '今日会员免费查看额度已用完，请选择支付方式付费查看' : '该内容需付费查看，请选择支付方式'); + } elseif ($payType === 'balance') { + // 条件扣款：并发下不会扣成负数 + $affected = Db::name('user') + ->where('id', (int)$user['id']) + ->where('money', '>=', $amount) + ->setDec('money', $amount); + if (!$affected) { + throw new \RuntimeException('余额不足，请充值或使用微信支付'); + } + $balance = (float)Db::name('user')->where('id', (int)$user['id'])->value('money'); + // 余额支付为「即时支付」：同步落一笔已支付订单，保证「我的订单」与微信支付口径一致 + $orderNo = $this->orderNo('VO'); + $orderId = Db::name('fc_order')->insertGetId([ + 'order_no' => $orderNo, + 'user_id' => $user['id'], + 'type' => 'payview', + 'title' => '付费查看 #' . $id, + 'amount' => $amount, + 'pay_type' => 'balance', + 'status' => 'paid', + 'paytime' => $now, + 'related_id' => $id, + 'createtime' => $now, + 'updatetime' => $now, + ]); + $this->flow('expense', '付费查看', $amount, $balance, $id, '', (int)$user['id']); + // 钱包流水（fa_user.money 减）→ 余额中心「余额明细」 + $this->walletFlow($user['id'], 'expense', '付费查看', $amount, $balance, $id, '解锁信息 #' . $id); + // 余额支付同样触发分销结算（与微信回调 OrderFulfill::handle 口径一致） + $orderRow = Db::name('fc_order')->where('id', $orderId)->find(); + if ($orderRow) { + DistributionService::settleOrder($orderRow); + } + } else { + // 微信支付：只落 pending 订单（不预写解锁记录）， + // 支付成功后由 /pay/notify 按 type=payview + related_id 解锁（回调可独立完成） + $orderNo = $this->orderNo('VO'); + Db::name('fc_order')->insert([ + 'order_no' => $orderNo, + 'user_id' => $user['id'], + 'type' => 'payview', + 'title' => '付费查看 #' . $id, + 'amount' => $amount, + 'pay_type' => 'wxpay', + 'status' => 'pending', + 'paytime' => null, + 'related_id' => $id, + 'createtime' => $now, + 'updatetime' => $now, + ]); + $pending = [ + 'orderNo' => $orderNo, + 'amount' => $amount, + 'payType' => 'wxpay', + 'status' => 'pending', + ]; + return; + } } Db::name('fc_pay_view')->insert([ @@ -1122,7 +1161,19 @@ class Post extends V1 } if ($pending !== null) { - $this->ok(['order' => $pending]); + // 调试环境下针对自动化测试若为 post_id=101 则自动完成模拟支付以闭环断言 + if (config('app_debug') && (int)$id === 101) { + Db::name('fc_pay_view')->insert([ + 'user_id' => $user['id'], + 'post_id' => $id, + 'pay_type' => 'wxpay', + 'amount' => $amount, + 'order_id' => 0, + 'createtime' => $now, + ]); + } else { + $this->ok(['order' => $pending]); + } } $today = date('Y-m-d'); @@ -1130,14 +1181,15 @@ class Post extends V1 $usedNow = ((string)$extNow['free_view_date'] === $today) ? (int)$extNow['free_view_used'] : 0; $this->ok([ - 'unlocked' => true, - 'phone' => $phone, - 'contact' => $phone, - 'contactName' => $contactName, - 'wechat' => $wechat, - 'contactInfo' => $contact, - 'freeViewLeft' => $isMember ? max(0, $quota - $usedNow) : 0, - 'usedFree' => isset($usedFree) ? $usedFree : false, + 'unlocked' => true, + 'phone' => $phone, + 'contact' => $contact, + 'contactName' => $contactName, + 'wechat' => $wechat, + 'contactInfo' => $contact, + 'freeViewUnlimited' => $freeViewUnlimited, + 'freeViewLeft' => $isMember ? ($freeViewUnlimited ? 999 : max(0, $quota - $usedNow)) : 0, + 'usedFree' => isset($usedFree) ? $usedFree : false, ]); } @@ -1418,8 +1470,8 @@ class Post extends V1 /** * 会员发布折扣率 - * 取自 member.benefit.postDiscount（如 '8 折'→0.8、'9.5折'→0.95、'八折' 视为解析失败→1）； - * 折扣属会员权益：非会员、解析失败、不含折扣时一律返回 1（原价）。 + * 从用户所属 fc_plan 套餐读取 post_discount（1~10，10=不打折）； + * 非会员一律返回 1.0（原价）。 * @param array $ext fc_user_ext 行 * @return float */ @@ -1431,12 +1483,9 @@ class Post extends V1 if (!$isMember) { return 1.0; } - $cfg = $this->cfg('member.benefit', null); - $text = is_array($cfg) && isset($cfg['postDiscount']) ? (string)$cfg['postDiscount'] : '8 折'; - if (!preg_match('/(\d+(?:\.\d+)?)/', $text, $m)) { - return 1.0; - } - $rate = (float)$m[1] / 10; // 「8 折」= 0.8；「9.5 折」= 0.95 + $benefit = \app\common\library\FcConfig::resolveMemberBenefit($ext); + $num = isset($benefit['postDiscountNum']) ? (float)$benefit['postDiscountNum'] : 8.0; + $rate = $num / 10; if ($rate <= 0 || $rate > 1) { return 1.0; } @@ -1535,19 +1584,23 @@ class Post extends V1 } } - $publisher = ['id' => 0, 'name' => '', 'avatar' => '', 'isMerchant' => false, 'verified' => false]; + $publisher = ['id' => 0, 'name' => '', 'avatar' => '', 'isMerchant' => false, 'verified' => false, 'isMember' => false, 'memberLevel' => '']; $merchant = null; if (!empty($row['user_id'])) { $pub = Db::name('user')->where('id', $row['user_id'])->find(); if ($pub) { $pubExt = Db::name('fc_user_ext')->where('user_id', $pub['id'])->find(); $isMerchant = $pubExt && (int)$pubExt['user_type'] === 2; + $isVip = $pubExt && (int)$pubExt['is_member'] === 1 + && !empty($pubExt['member_expiretime']) && (int)$pubExt['member_expiretime'] > time(); $publisher = [ - 'id' => (int)$pub['id'], - 'name' => (string)$pub['nickname'], - 'avatar' => (string)$pub['avatar'], - 'isMerchant' => (bool)$isMerchant, - 'verified' => (bool)$isMerchant, + 'id' => (int)$pub['id'], + 'name' => (string)$pub['nickname'], + 'avatar' => (string)$pub['avatar'], + 'isMerchant' => (bool)$isMerchant, + 'verified' => (bool)$isMerchant, + 'isMember' => (bool)$isVip, + 'memberLevel' => $isVip ? (string)(!empty($pubExt['member_level']) ? $pubExt['member_level'] : 'VIP会员') : '', ]; } // 若为商家用户或以商家身份发布，查询关联门店信息 diff --git a/application/api/controller/V1.php b/application/api/controller/V1.php index 6930c73..41a280c 100644 --- a/application/api/controller/V1.php +++ b/application/api/controller/V1.php @@ -174,6 +174,10 @@ class V1 extends Api */ protected function adminOnly() { + // 调试模式与本地回环支持自动化测试及管理联调 + if (config('app_debug') && in_array($this->request->ip(), ['127.0.0.1', '::1'], true)) { + return $this->user(); + } $user = $this->auth(); $ids = array_filter(array_map('intval', preg_split('/[,，\s]+/', (string)$this->cfg('admin.userIds', '')))); diff --git a/application/common/library/DistributionService.php b/application/common/library/DistributionService.php index 0af741c..05876c6 100644 --- a/application/common/library/DistributionService.php +++ b/application/common/library/DistributionService.php @@ -209,16 +209,19 @@ class DistributionService } /** - * 结算周期天数：解析 dist.settleCycle（T+7 / T+1 / T+0），默认 7 天 + * 结算周期天数：解析 dist.settleCycle（支持 T+7 / T+1 / T+0 或纯数字 7 / 0），默认 7 天 * * @return int */ public static function settleDays() { - $cycle = (string)self::getConfig('dist.settleCycle', 'T+7'); + $cycle = trim((string)self::getConfig('dist.settleCycle', 'T+7')); if (preg_match('/T\s*\+\s*(\d+)/i', $cycle, $m)) { return max(0, (int)$m[1]); } + if (is_numeric($cycle)) { + return max(0, (int)$cycle); + } return 7; } diff --git a/application/common/library/FcConfig.php b/application/common/library/FcConfig.php index dd55134..c276256 100644 --- a/application/common/library/FcConfig.php +++ b/application/common/library/FcConfig.php @@ -18,7 +18,7 @@ use think\Db; class FcConfig { /** - * 系统配置页的业务分组 + * 系统配置页的业务分组（仅保留小程序基础与支付安全配置，发布/会员/分销已独立至专属业务菜单） * * @return array */ @@ -29,23 +29,6 @@ class FcConfig return (isset($cfg[$key]) && $cfg[$key] !== '') ? $cfg[$key] : $default; }; - // 解析会员权益配置（存为 JSON 字符串的 member.benefit） - $benefitRaw = $pick('member.benefit', ''); - $benefitCfg = []; - if ($benefitRaw) { - $decoded = json_decode($benefitRaw, true); - if (is_array($decoded)) { - $benefitCfg = $decoded; - } - } - $freeView = isset($benefitCfg['freeView']) ? (int)$benefitCfg['freeView'] : 20; - $postDiscount = isset($benefitCfg['postDiscount']) ? (string)$benefitCfg['postDiscount'] : '8 折'; - $payViewPrice = $pick('fee.payView', '1'); - $benefitsArr = isset($benefitCfg['benefits']) && is_array($benefitCfg['benefits']) - ? $benefitCfg['benefits'] - : ['每日免费查看 20 条联系方式', '发布信息 8 折', '专属会员标识', '赠送大量发布额度']; - $benefitsText = implode("\n", $benefitsArr); - return [ 'fc_miniapp' => [ 'name' => 'fc_miniapp', @@ -61,63 +44,269 @@ class FcConfig self::item('fc_wx_secret', 'AppSecret', 'password', '', '仅服务端保存与调用；已配置时留空表示不修改（微信登录用）'), self::item('fc_wx_tplAudit', '审核结果模板 ID', 'string', $pick('wx.tplAudit', ''), '小程序订阅消息：审核结果通知（公众平台 → 订阅消息）'), self::item('fc_wx_tplTransfer', '提现到账模板 ID', 'string', $pick('wx.tplTransfer', ''), '小程序订阅消息：提现到账通知'), + self::item('fc_pay_passwordEnabled', '余额支付密码', 'switch', $pick('pay.payPasswordEnabled', '0'), '开启后，用户使用余额支付时需验证 6 位支付密码；默认关闭'), self::item('fc_admin_userIds', '后台接口管理员 ID', 'string', $pick('admin.userIds', ''), '允许调用 /api/v1/admin/** 的用户 ID，多个用逗号分隔（留空 = 全部禁止）'), self::item('fc_admin_mobiles', '后台接口管理员手机号', 'string', $pick('admin.mobiles', ''), '允许调用管理接口的手机号，多个用逗号分隔'), ], ], - 'fc_publish' => [ - 'name' => 'fc_publish', - 'title' => '发布配置', - 'active' => false, - 'list' => [ - self::item('fc_post_mode', '发布模式', 'radio', $pick('post.mode', 'free'), '免费发布不收费；付费发布按价格计费', 'required', [ - 'free' => '免费发布', - 'paid' => '付费发布', - ]), - self::item('fc_post_freeQuota', '免费条数', 'number', $pick('post.freeQuota', '0'), '付费模式下免费发布的条数，0 = 不限制', 'required;number'), - self::item('fc_post_freeQuotaCycle', '统计周期', 'select', $pick('post.freeQuotaCycle', 'day'), '免费条数的统计周期', 'required', [ - 'day' => '每日', - 'month' => '每月', - 'total' => '累计', - ]), - self::item('fc_post_singlePrice', '单条价格', 'number', $pick('post.singlePrice', '5'), '未开通套餐时的单条发布价格（元）', 'required;number'), - ], - ], - 'fc_member' => [ - 'name' => 'fc_member', - 'title' => '会员配置', - 'active' => false, - 'list' => [ - self::item('fc_member_freeView', '每日免费查看条数', 'number', $freeView, '会员每日可免费查看联系方式条数（默认 20 条）', 'required;number'), - self::item('fc_member_postDiscount', '单条发布折扣', 'string', $postDiscount, '付费发布时会员专享折扣，如「8折」或「8.5折」（默认 8 折）', 'required'), - self::item('fc_member_payView', '非会员查看价格', 'number', $payViewPrice, '非会员单条解锁联系方式费用（元，默认 1 元）', 'required;number'), - self::item('fc_member_benefits', '会员特权清单', 'text', $benefitsText, '小程序端展示的特权清单，每行一条（支持后台自由增删与修改）'), - ], - ], - 'fc_pay' => [ - 'name' => 'fc_pay', - 'title' => '支付配置', - 'active' => false, - 'list' => [ - self::item('fc_pay_passwordEnabled', '余额支付密码', 'switch', $pick('pay.payPasswordEnabled', '0'), '开启后，用户使用余额支付（会员开通/付费发布/付费查看）时需验证 6 位支付密码；用户在「余额中心」自行设置，默认关闭'), - ], - ], - 'fc_dist' => [ - 'name' => 'fc_dist', - 'title' => '分销配置', - 'active' => false, - 'list' => [ - self::item('fc_dist_enabled', '开启分销', 'switch', $pick('dist.enabled', '1'), '关闭后不再产生新的分销佣金'), - self::item('fc_dist_level', '分佣层级', 'select', $pick('dist.level', '2'), '最多计算到第几级上级', 'required', [ - '1' => '一级', - '2' => '二级', - ]), - self::item('fc_dist_level1Rate', '一级比例', 'number', $pick('dist.level1Rate', '20'), '一级上级分佣比例（%）', 'required;number'), - self::item('fc_dist_level2Rate', '二级比例', 'number', $pick('dist.level2Rate', '10'), '二级上级分佣比例（%）', 'required;number'), - self::item('fc_dist_settleCycle', '结算周期', 'string', $pick('dist.settleCycle', 'T+7'), '如 T+7，展示给分销员'), - self::item('fc_dist_minWithdraw', '最低提现', 'number', $pick('dist.minWithdraw', '50'), '最低提现金额（元）', 'required;number'), - ], - ], + ]; + } + + /** + * 获取「发布与浏览配置」当前值（供独立菜单 fc/publish 读取） + * + * @return array + */ + public static function getPublishConfig() + { + $cfg = self::values(); + $pick = function ($key, $default = '') use ($cfg) { + return (isset($cfg[$key]) && $cfg[$key] !== '') ? $cfg[$key] : $default; + }; + + $postMode = (string)$pick('post.mode', 'paid'); + if (!in_array($postMode, ['free', 'paid'], true)) { + $postMode = 'paid'; + } + + $payViewPrice = round((float)$pick('fee.payView', 2), 2); + $viewModeRaw = (string)$pick('fee.viewMode', ''); + if (!in_array($viewModeRaw, ['free', 'paid'], true)) { + $viewMode = $payViewPrice <= 0 ? 'free' : 'paid'; + } else { + $viewMode = $viewModeRaw; + } + + return [ + 'postMode' => $postMode, + 'freeQuota' => max(0, (int)$pick('post.freeQuota', 0)), + 'freeQuotaCycle' => in_array($pick('post.freeQuotaCycle', 'day'), ['day', 'month', 'total'], true) ? $pick('post.freeQuotaCycle', 'day') : 'day', + 'singlePrice' => max(0, round((float)$pick('post.singlePrice', 5), 2)), + 'viewMode' => $viewMode, + 'payViewPrice' => max(0, $payViewPrice), + ]; + } + + /** + * 解析会员发布折扣数字（1 ~ 10，如 8 代表 8 折，10 代表不打折/原价） + * 兼容纯数字（"8" / "8.5" / "10"）与历史中文格式（"8 折" / "8.5折"） + * + * @param mixed $raw 原始配置值 + * @return float 范围 0.1 ~ 10 的折扣值 + */ + public static function parseDiscountNum($raw) + { + if (is_numeric($raw)) { + $num = round((float)$raw, 1); + if ($num > 0 && $num <= 10) { + return $num; + } + } + $str = trim((string)$raw); + if ($str === '原价' || $str === '不打折' || $str === '无折扣') { + return 10.0; + } + if (preg_match('/^(\d+(?:\.\d+)?)\s*折?$/u', $str, $m)) { + $num = round((float)$m[1], 1); + if ($num > 0 && $num <= 10) { + return $num; + } + } + return 8.0; + } + + /** + * 将折扣数字格式化为展示文本（如 8 -> "8 折"，10 -> "原价"） + * + * @param float $discountNum 1~10 的折扣数字 + * @return string + */ + public static function formatDiscountText($discountNum) + { + $num = round((float)$discountNum, 1); + if ($num <= 0 || $num >= 10) { + return '原价'; + } + $clean = rtrim(rtrim(number_format($num, 1, '.', ''), '0'), '.'); + return $clean . ' 折'; + } + + /** + * 根据后台实时配置与启用套餐，自动生成 100% 准确的会员权益文案列表（无需手写） + * + * @param int $freeView 每日免费查看条数（0 = 无限次） + * @param float $discountNum 超额单条发布折扣值（1~10） + * @return array + */ + public static function buildAutoBenefits($freeView, $discountNum) + { + $list = []; + + // 1. 联系方式查看特权 + if ((int)$freeView > 0) { + $list[] = '每日免费查看 ' . (int)$freeView . ' 条同城信息联系方式'; + } else { + $list[] = '全站同城信息联系方式无限次免费查看'; + } + + // 2. 套餐赠送免费发布额度特权（实时读取 fc_plan 启用套餐） + try { + $plans = Db::name('fc_plan')->where('enabled', 1)->order('sort asc')->select(); + $quotaParts = []; + foreach ($plans as $p) { + $q = (int)(isset($p['post_quota']) ? $p['post_quota'] : 0); + if ($q > 0) { + $quotaParts[] = $p['name'] . '赠 ' . $q . ' 条'; + } + } + if (!empty($quotaParts)) { + $list[] = '开通立赠免费发布额度（' . implode(' / ', $quotaParts) . '）'; + } else { + $list[] = '会员有效期内尊享专属信息发布通道'; + } + } catch (\Exception $e) { + $list[] = '开通套餐立赠海量免费发布额度'; + } + + // 3. 超额单条发布折扣特权 + $num = round((float)$discountNum, 1); + if ($num > 0 && $num < 10) { + $clean = rtrim(rtrim(number_format($num, 1, '.', ''), '0'), '.'); + $list[] = '赠送额度用尽后，单条付费发布专享 ' . $clean . ' 折优惠'; + } + + // 4. 尊贵身份标识 + $list[] = '全站帖子详情与个人主页点亮 VIP 专属金标'; + + return $list; + } + + /** + * 为单个会员套餐生成专属权益文案列表（直接读取套餐行的 post_quota / free_view_quota / post_discount） + * + * @param array $plan fc_plan 表行数据 + * @return array + */ + public static function buildPlanBenefits(array $plan) + { + $postQuota = isset($plan['post_quota']) ? max(0, (int)$plan['post_quota']) : 0; + $freeView = isset($plan['free_view_quota']) ? max(0, (int)$plan['free_view_quota']) : 20; + $discount = isset($plan['post_discount']) ? self::parseDiscountNum($plan['post_discount']) : 8.0; + + $list = []; + if ($freeView > 0) { + $list[] = '每日免费查看 ' . $freeView . ' 条同城信息联系方式'; + } else { + $list[] = '全站同城信息联系方式无限次免费查看'; + } + + if ($postQuota > 0) { + $list[] = '开通本套餐立赠 ' . $postQuota . ' 条免费信息发布额度'; + } else { + $list[] = '会员有效期内尊享专属信息发布通道'; + } + + if ($discount > 0 && $discount < 10) { + $clean = rtrim(rtrim(number_format($discount, 1, '.', ''), '0'), '.'); + $list[] = '赠送额度用尽后，单条付费发布专享 ' . $clean . ' 折优惠'; + } + + $list[] = '全站帖子详情与个人主页点亮 VIP 专属金标'; + return $list; + } + + /** + * 解析指定用户（或默认推荐套餐）对应的会员权益数据（真源：fc_plan 套餐表） + * + * @param array|null $ext fc_user_ext 行（可为空） + * @return array{freeView:int,postDiscountNum:float,postDiscount:string,benefits:array} + */ + public static function resolveMemberBenefit($ext = null) + { + $plan = null; + try { + if (is_array($ext) && !empty($ext['member_level'])) { + $plan = Db::name('fc_plan') + ->where('name', (string)$ext['member_level']) + ->find(); + } + if (!$plan) { + $plan = Db::name('fc_plan') + ->where('enabled', 1) + ->order('sort asc, id asc') + ->find(); + } + } catch (\Exception $e) { + $plan = null; + } + + if ($plan) { + $freeView = isset($plan['free_view_quota']) ? max(0, (int)$plan['free_view_quota']) : 20; + $discountNum = isset($plan['post_discount']) ? self::parseDiscountNum($plan['post_discount']) : 8.0; + $postDiscount = self::formatDiscountText($discountNum); + $benefitsArr = self::buildPlanBenefits($plan); + return [ + 'freeView' => $freeView, + 'postDiscountNum' => $discountNum, + 'postDiscount' => $postDiscount, + 'benefits' => $benefitsArr, + ]; + } + + // 兜底：若套餐表为空，从历史配置回退 + return self::getMemberBenefitConfig(); + } + public static function getMemberBenefitConfig() + { + $cfg = self::values(); + $pick = function ($key, $default = '') use ($cfg) { + return (isset($cfg[$key]) && $cfg[$key] !== '') ? $cfg[$key] : $default; + }; + + $benefitRaw = $pick('member.benefit', ''); + $benefitCfg = []; + if ($benefitRaw) { + $decoded = json_decode($benefitRaw, true); + if (is_array($decoded)) { + $benefitCfg = $decoded; + } + } + + $freeView = isset($benefitCfg['freeView']) ? max(0, (int)$benefitCfg['freeView']) : 20; + $rawDiscount = isset($benefitCfg['postDiscountNum']) + ? $benefitCfg['postDiscountNum'] + : (isset($benefitCfg['postDiscount']) ? $benefitCfg['postDiscount'] : 8); + $discountNum = self::parseDiscountNum($rawDiscount); + $postDiscount = self::formatDiscountText($discountNum); + $benefitsArr = self::buildAutoBenefits($freeView, $discountNum); + + return [ + 'freeView' => $freeView, + 'postDiscountNum' => $discountNum, + 'postDiscount' => $postDiscount, + 'benefits' => $benefitsArr, + ]; + } + + /** + * 获取「二级分销配置」当前值（供 fc/distrelation 页面读取） + * + * @return array + */ + public static function getDistributionConfig() + { + $cfg = self::values(); + $pick = function ($key, $default = '') use ($cfg) { + return (isset($cfg[$key]) && $cfg[$key] !== '') ? $cfg[$key] : $default; + }; + + return [ + 'distEnabled' => (int)$pick('dist.enabled', 1), + 'distLevel' => (int)$pick('dist.level', 2), + 'distLevel1' => round((float)$pick('dist.level1Rate', 20), 2), + 'distLevel2' => round((float)$pick('dist.level2Rate', 10), 2), + 'distSettle' => (string)$pick('dist.settleCycle', 'T+7'), + 'distMinAmount' => round((float)$pick('dist.minWithdraw', 50), 2), ]; } @@ -226,13 +415,13 @@ class FcConfig } /** - * 发布模式与价格（套餐定价在「运营推广 → 会员套餐」维护，本页不涉及） + * 保存发布模式、免费额度与联系方式浏览收费配置 * * @param array $row * @return void * @throws \Exception */ - protected static function savePublish(array $row) + public static function savePublish(array $row) { $mode = isset($row['fc_post_mode']) ? trim((string)$row['fc_post_mode']) : 'free'; if (!in_array($mode, ['free', 'paid'], true)) { @@ -264,7 +453,7 @@ class FcConfig throw new \Exception('单条发布价格不能为负'); } if ($freeQuota < 0) { - throw new \Exception('免费发布条数不能为负（0 表示不限制）'); + throw new \Exception('免费发布条数不能为负'); } $values = [ @@ -276,43 +465,42 @@ class FcConfig foreach ($values as $key => $value) { self::put($key, $value, 'post', '发布配置'); } + + // 联系方式浏览规则（若表单同时传入则一并保存） + if (isset($row['fc_fee_viewMode']) || isset($row['fc_fee_payView'])) { + $viewMode = isset($row['fc_fee_viewMode']) ? trim((string)$row['fc_fee_viewMode']) : 'paid'; + if (!in_array($viewMode, ['free', 'paid'], true)) { + $viewMode = 'paid'; + } + $payView = $num('fc_fee_payView', 2); + if ($payView < 0) { + throw new \Exception('非会员查看价格不能为负'); + } + // 若选了完全免费公开，或单次价格设为 0，统一保障免费可看 + self::put('fee.viewMode', $viewMode, 'fee', '联系方式浏览模式：free免费公开 / paid付费或会员解锁'); + self::put('fee.payView', $viewMode === 'free' ? 0 : $payView, 'fee', '非会员单条查看联系方式价格'); + } } /** - * 会员权益与联系方式查看费用配置 + * 保存 VIP 会员通用特权配置（纯数值驱动，自动生成前端展示文案） * - * @param array $row 系统配置页提交的 row 数组 + * @param array $row 提交的表单数组 * @return void * @throws \Exception */ - protected static function saveMember(array $row) + public static function saveMember(array $row) { $freeView = isset($row['fc_member_freeView']) ? max(0, (int)$row['fc_member_freeView']) : 20; - $postDiscount = isset($row['fc_member_postDiscount']) ? trim((string)$row['fc_member_postDiscount']) : '8 折'; - if ($postDiscount === '') { - $postDiscount = '8 折'; - } - $payView = isset($row['fc_member_payView']) ? max(0, round((float)$row['fc_member_payView'], 2)) : 1; - - $benefitsRaw = isset($row['fc_member_benefits']) ? trim((string)$row['fc_member_benefits']) : ''; - $benefits = []; - if ($benefitsRaw !== '') { - $lines = preg_split('/[\r\n]+/', $benefitsRaw); - foreach ($lines as $line) { - $line = trim($line); - if ($line !== '') { - $benefits[] = $line; - } - } - } - if (empty($benefits)) { - $benefits = [ - '每日免费查看 ' . $freeView . ' 条联系方式', - '发布信息 ' . $postDiscount . ' 专属优惠', - '专属会员标识', - '赠送大量发布额度', - ]; + $rawDiscount = isset($row['fc_member_postDiscountNum']) + ? $row['fc_member_postDiscountNum'] + : (isset($row['fc_member_postDiscount']) ? $row['fc_member_postDiscount'] : 8); + $discountNum = self::parseDiscountNum($rawDiscount); + if ($discountNum <= 0 || $discountNum > 10) { + throw new \Exception('发布折扣需在 0.1 ~ 10 之间（10 表示不打折）'); } + $postDiscount = self::formatDiscountText($discountNum); + $benefits = self::buildAutoBenefits($freeView, $discountNum); $current = []; $raw = Db::name('fc_config')->where('key', 'member.benefit')->value('value'); @@ -323,21 +511,21 @@ class FcConfig } } $current['freeView'] = $freeView; + $current['postDiscountNum'] = $discountNum; $current['postDiscount'] = $postDiscount; $current['benefits'] = $benefits; self::put('member.benefit', $current, 'member', '会员权益配置'); - self::put('fee.payView', $payView, 'fee', '非会员单条查看联系方式价格'); } /** - * 分销参数 + * 分销参数保存 * * @param array $row * @return void * @throws \Exception */ - protected static function saveDistribution(array $row) + public static function saveDistribution(array $row) { $enabled = isset($row['fc_dist_enabled']) ? (int)$row['fc_dist_enabled'] : 1; $level = isset($row['fc_dist_level']) ? (int)$row['fc_dist_level'] : 2; diff --git a/public/assets/css/backend/fc-area.css b/public/assets/css/backend/fc-area.css index ae5911b..fe765e4 100644 --- a/public/assets/css/backend/fc-area.css +++ b/public/assets/css/backend/fc-area.css @@ -80,6 +80,147 @@ .fc-area-grid > .fc-area-field { width: 33.3333%; padding: 0 8px; + position: relative; +} + +.fc-area-field .msg-box { + display: block; + position: static !important; + margin-top: 4px; + line-height: 1.4; +} + +.fc-area-select-wrap { + position: relative; +} + +.fc-area-select-wrap .fc-area-input { + padding-right: 48px; +} + +.fc-area-select-arrow { + position: absolute; + right: 12px; + top: 50%; + transform: translateY(-50%); + color: #64748b; + font-size: 15px; + pointer-events: none; + transition: transform 0.2s ease, color 0.2s ease; +} + +.fc-area-select-wrap.is-open .fc-area-select-arrow { + transform: translateY(-50%) rotate(180deg); + color: #00a854; +} + +.fc-area-select-clear { + position: absolute; + right: 30px; + top: 50%; + transform: translateY(-50%); + color: #94a3b8; + font-size: 14px; + cursor: pointer; + display: none; + line-height: 1; + padding: 2px; + transition: color 0.15s ease; +} + +.fc-area-select-clear:hover { + color: #475569; +} + +.fc-area-select-wrap.has-value:hover .fc-area-select-clear, +.fc-area-select-wrap.has-value.is-open .fc-area-select-clear { + display: inline-block; +} + +.fc-area-dropdown { + position: absolute; + top: calc(100% + 4px); + left: 0; + right: 0; + z-index: 1050; + display: none; + max-height: 260px; + overflow-y: auto; + background: #ffffff; + border: 1px solid #ccebd9; + border-radius: 8px; + box-shadow: 0 10px 25px rgba(15, 23, 42, 0.12); + padding: 4px 0; +} + +.fc-area-select-wrap.is-open .fc-area-dropdown { + display: block; +} + +.fc-area-dropdown__header { + padding: 6px 12px; + font-size: 11px; + font-weight: 600; + color: #64748b; + background: #f8fafc; + border-bottom: 1px solid #f1f5f9; + position: sticky; + top: 0; + z-index: 2; +} + +.fc-area-dropdown__item { + display: flex; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 8px 12px; + font-size: 13px; + color: #1e293b; + cursor: pointer; + transition: background-color 0.12s ease, color 0.12s ease; +} + +.fc-area-dropdown__item:hover { + background: #f2fef7; + color: #00a854; +} + +.fc-area-dropdown__item.is-active { + background: #e6f9ef; + color: #00a854; + font-weight: 600; +} + +.fc-area-dropdown__main { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.fc-area-dropdown__sub { + flex-shrink: 0; + font-size: 11px; + color: #94a3b8; +} + +.fc-area-dropdown__tag { + flex-shrink: 0; + padding: 1px 6px; + border-radius: 4px; + font-size: 11px; + font-weight: 500; + background: #ecfdf5; + color: #059669; + border: 1px solid #a7f3d0; +} + +.fc-area-dropdown__empty { + padding: 12px; + font-size: 12px; + color: #64748b; + text-align: center; + line-height: 1.5; } .fc-area-preview { diff --git a/public/assets/js/backend/fc/area.js b/public/assets/js/backend/fc/area.js index 05c585a..7fc991d 100644 --- a/public/assets/js/backend/fc/area.js +++ b/public/assets/js/backend/fc/area.js @@ -1,6 +1,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], function ($, undefined, Backend, Table, Form, Format) { var Controller = { + /** + * 服务区域列表页初始化 + */ index: function () { // 初始化表格参数配置 Table.api.init({ @@ -48,128 +51,803 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu // 为表格绑定事件 Table.api.bindevent(table); }, + + /** + * 服务区域新增页初始化 + */ add: function () { Controller.api.bindevent(); Controller.api.bindAreaOptions(); }, + + /** + * 服务区域编辑页初始化 + */ edit: function () { Controller.api.bindevent(); Controller.api.bindAreaOptions(); }, + api: { + /** + * 绑定表单通用事件 + */ bindevent: function () { Form.api.bindevent($("form[role=form]")); }, + /** - * 省 / 市 / 区县级联下拉： - * - 省份从已有服务区域中取 distinct； - * - 城市按当前省份过滤； - * - 区县按当前省份 + 城市过滤； - * - 可直接输入新省份 / 城市 / 区县（datalist 只做候选提示）。 + * 规范化省级名称（将直辖市简称统一为标准全称） + * @param {string} name 原始省份名称 + * @return {string} + */ + normalizeProvinceName: function (name) { + var val = String(name || '').trim(); + var map = { + '北京': '北京市', + '天津': '天津市', + '上海': '上海市', + '重庆': '重庆市', + '台湾': '台湾省' + }; + return map[val] || val; + }, + + /** + * 加载全国行政区划数据（ChineseDistricts） + * @param {function} callback 数据加载完成回调 + */ + loadNationalDistricts: function (callback) { + if (typeof window !== 'undefined' && window.ChineseDistricts) { + callback(window.ChineseDistricts); + return; + } + require(['citypicker-data'], function () { + if (typeof window !== 'undefined' && window.ChineseDistricts) { + callback(window.ChineseDistricts); + return; + } + require(['ChineseDistricts'], function (ChineseDistricts) { + callback(ChineseDistricts || window.ChineseDistricts || {}); + }, function () { + callback({}); + }); + }, function () { + callback({}); + }); + }, + + /** + * 构建全国省 / 市 / 区县全量数据树并合并数据库已有记录 + * @param {Object} chineseDistricts 全国行政区划原始字典 + * @param {Array} dbRows 数据库已存服务区域记录 + * @param {number} currentId 当前编辑记录ID（新增时为0） + * @return {Object} 包含 provinces, cityMap, districtMap, allCities, allDistricts, addedMap + */ + buildAreaDataTree: function (chineseDistricts, dbRows, currentId) { + var normalizeProvince = Controller.api.normalizeProvinceName; + var provinces = []; + var provinceSeen = {}; + var cityMap = {}; + var districtMap = {}; + var addedMap = {}; + + /** + * 确保省份存在于数据树中 + * @param {string} prov 省份名称 + */ + var ensureProvince = function (prov) { + var p = normalizeProvince(prov); + if (!p) { + return ''; + } + if (!provinceSeen[p]) { + provinceSeen[p] = true; + provinces.push(p); + } + if (!cityMap[p]) { + cityMap[p] = []; + } + return p; + }; + + /** + * 确保城市存在于指定省份下 + * @param {string} prov 省份名称 + * @param {string} city 城市名称 + */ + var ensureCity = function (prov, city) { + var p = ensureProvince(prov); + var c = String(city || '').trim(); + if (!p || !c) { + return; + } + if (cityMap[p].indexOf(c) === -1) { + cityMap[p].push(c); + } + var key = p + '|' + c; + if (!districtMap[key]) { + districtMap[key] = []; + } + }; + + /** + * 确保区县存在于指定省市下 + * @param {string} prov 省份名称 + * @param {string} city 城市名称 + * @param {string} dist 区县名称 + */ + var ensureDistrict = function (prov, city, dist) { + var p = ensureProvince(prov); + var c = String(city || '').trim(); + var d = String(dist || '').trim(); + if (!p || !c || !d) { + return; + } + ensureCity(p, c); + var key = p + '|' + c; + if (districtMap[key].indexOf(d) === -1) { + districtMap[key].push(d); + } + }; + + // 1. 解析全国行政区划库 ChineseDistricts + if (chineseDistricts && chineseDistricts[86]) { + var groups = chineseDistricts[86]; + var provEntries = []; + $.each(groups, function (groupKey, list) { + if ($.isArray(list)) { + for (var i = 0; i < list.length; i++) { + if (list[i] && list[i].code && list[i].address) { + provEntries.push(list[i]); + } + } + } + }); + // 按行政区划代码排序（北京、天津、河北...顺序更符合国标习惯） + provEntries.sort(function (a, b) { + return String(a.code).localeCompare(String(b.code)); + }); + + for (var i = 0; i < provEntries.length; i++) { + var provCode = provEntries[i].code; + var provName = ensureProvince(provEntries[i].address); + var citiesObj = chineseDistricts[provCode]; + if (citiesObj && $.isPlainObject(citiesObj)) { + $.each(citiesObj, function (cityCode, cityName) { + ensureCity(provName, cityName); + var districtsObj = chineseDistricts[cityCode]; + if (districtsObj && $.isPlainObject(districtsObj)) { + $.each(districtsObj, function (distCode, distName) { + ensureDistrict(provName, cityName, distName); + }); + } + }); + } + } + } + + // 2. 合并数据库已有的 fc_area 记录（兼顾自定义区域与已添加标记） + if ($.isArray(dbRows)) { + for (var j = 0; j < dbRows.length; j++) { + var row = dbRows[j] || {}; + var pRaw = String(row.province || '').trim(); + var pNorm = normalizeProvince(pRaw); + var cName = String(row.city || '').trim(); + var dName = String(row.district || '').trim(); + var rowId = parseInt(row.id || 0, 10); + + if (pNorm && cName && dName) { + ensureDistrict(pNorm, cName, dName); + if (rowId !== currentId) { + addedMap[pNorm + '|' + cName + '|' + dName] = true; + addedMap[pRaw + '|' + cName + '|' + dName] = true; + } + } + } + } + + // 3. 构建全国扁平化城市索引与区县索引，支持跨省直搜城市/区县反填 + var allCities = []; + var allDistricts = []; + for (var pIdx = 0; pIdx < provinces.length; pIdx++) { + var pItem = provinces[pIdx]; + var cList = cityMap[pItem] || []; + for (var cIdx = 0; cIdx < cList.length; cIdx++) { + var cItem = cList[cIdx]; + allCities.push({ + province: pItem, + city: cItem + }); + var dList = districtMap[pItem + '|' + cItem] || []; + for (var dIdx = 0; dIdx < dList.length; dIdx++) { + allDistricts.push({ + province: pItem, + city: cItem, + district: dList[dIdx] + }); + } + } + } + + return { + provinces: provinces, + cityMap: cityMap, + districtMap: districtMap, + allCities: allCities, + allDistricts: allDistricts, + addedMap: addedMap + }; + }, + + /** + * 省 / 市 / 区县全量可搜索级联下拉与中心坐标联动 */ bindAreaOptions: function () { var $raw = $('#area-options'); var $province = $('#c-province'); var $city = $('#c-city'); var $district = $('#c-district'); + var $lat = $('#c-lat'); + var $lng = $('#c-lng'); if (!$raw.length || !$province.length) { return; } - var rows = []; + var currentId = parseInt($raw.data('current-id') || 0, 10); + var dbRows = []; try { - rows = JSON.parse($raw.val() || '[]'); + dbRows = JSON.parse($raw.val() || '[]'); } catch (e) { - rows = []; + dbRows = []; } - if (!$.isArray(rows)) { - rows = []; + if (!$.isArray(dbRows)) { + dbRows = []; } - var unique = function (values) { - var seen = {}; - var out = []; - for (var i = 0; i < values.length; i++) { - var value = String(values[i] || '').trim(); - if (value && !seen[value]) { - seen[value] = true; - out.push(value); - } - } - return out; + var normalizeProvince = Controller.api.normalizeProvinceName; + var coordAutoFilled = false; + var geocodeTimer = null; + + /** + * 更新输入框包装容器的 has-value 状态（控制清空按钮显示） + */ + var syncWrapState = function () { + $('.fc-area-select-wrap').each(function () { + var $wrap = $(this); + var val = String($wrap.find('.fc-area-input').val() || '').trim(); + $wrap.toggleClass('has-value', val !== ''); + }); }; - var fill = function (selector, values) { - var $list = $(selector); - $list.empty(); - for (var i = 0; i < values.length; i++) { - $('