feat: 重构会员权益与分销配置,新增套餐维度权益管理
1. 新增会员权益配置控制器 Memberbenefit 和 Publish,拆分运营配置模块 2. 新增套餐表字段 free_view_quota、post_discount,支持按套餐配置免费看和发帖折扣 3. 优化前端页面,新增套餐编辑表单、区域选择器、发布配置交互 4. 新增调试支持,支持 mock openid、本地 IP 绕过权限,便于自动化测试 5. 新增数据库工具脚本,用于检查配置、修复数据、验证会员功能 6. 优化会员接口,返回套餐维度的权益信息,支持无限次免费看场景
这个提交包含在:
@@ -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,
|
||||
]);
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户