feat(hjf): H5路由修复、分销等级显示优化、个人中心等级徽章
H5 部署与路由： - manifest.json: router.base 改为 "/" 适配 public/ 根目录部署 - nginx-crmeb.conf: 恢复与 feature/fsgx 一致的原始配置 - App.vue: PC端重定向路径改为动态推导，修复死循环加载问题 - static/html/pc.html: 动态推导 H5 根路径，适配本地/云端两种部署 H5登录： - pages/users/login/index.vue: H5端获取验证码跳过安全验证（条件编译） 分销等级展示修复： - AgentLevelServices: 新增 loadHjfUserListLevelMaps/pickHjfLevelRowForUserListDisplay 统一等级名称解析逻辑，优先返回 HJF 官方名称；新增 getUpgradeTasksForLevel 封装 - UserServices/MemberLevelServices: 改用统一解析方法，修复 protected $dao 访问错误 - api/hjf/MemberController: 直接取 eb_agent_level.name，新增 agent_level 原始值返回 - admin/v1/hjf/MemberController: team() 改用封装方法替代直接访问 protected dao 个人中心等级徽章： - pages/user/index.vue + member/index.vue: memberInfo 沿链路透传 - member/template1.vue: UID右侧显示HjfMemberBadge，直接读 userInfo.agent_level_name 无需等待异步 memberInfo，agentLevelGrade 计算属性从名称推导颜色等级 商品列表修复： - BaseController.php/Common.php: 恢复加密版，修复 CRMEB 授权检查失败导致的400错误 - StoreProduct model: 移除冲突的 model maker 回调 数据库： - hjf_migration.sql: 完善会员等级体系迁移脚本 - eb_agent_level.sql: 新增等级初始数据脚本 Made-with: Cursor
This commit is contained in:
apple
@@ -5,22 +5,19 @@ namespace app\services\hjf;
|
||||
|
||||
use app\dao\hjf\PointsReleaseLogDao;
|
||||
use app\dao\user\UserDao;
|
||||
use app\services\agent\AgentLevelServices;
|
||||
use app\services\BaseServices;
|
||||
use crmeb\services\SystemConfigService;
|
||||
use think\annotation\Inject;
|
||||
use think\facade\Db;
|
||||
use think\facade\Log;
|
||||
|
||||
/**
|
||||
* 积分奖励服务（级差计算）
|
||||
* 积分奖励服务（级差计算）—— 改造复用版
|
||||
*
|
||||
* 触发时机：报单商品订单支付回调成功后调用 reward($orderUid, $orderId)。
|
||||
*
|
||||
* 奖励规则（PRD 3.2）：
|
||||
* - 推荐人（直推上级）获得 直推奖励积分（按推荐人等级）
|
||||
* - 更上级获得 级差积分（上级积分 - 直接下级已获得的积分）
|
||||
* - 所有奖励积分写入 frozen_points（待释放状态）
|
||||
* - 同时写 points_release_log 记录明细
|
||||
* 改造要点（PRD 3.2.2）：
|
||||
* - 使用 eb_user.agent_level (FK → eb_agent_level.id) 获取会员等级
|
||||
* - 从 eb_agent_level 表的 direct_reward_points / umbrella_reward_points 字段读取奖励积分
|
||||
* - 不再使用独立的 member_level 字段和系统配置表中的 hjf_reward_* 键
|
||||
*
|
||||
* Class PointsRewardServices
|
||||
* @package app\services\hjf
|
||||
@@ -33,50 +30,19 @@ class PointsRewardServices extends BaseServices
|
||||
#[Inject]
|
||||
protected UserDao $userDao;
|
||||
|
||||
/**
|
||||
* 各等级直推奖励积分配置键
|
||||
*/
|
||||
const DIRECT_REWARD_KEYS = [
|
||||
0 => 0, // 普通会员：无直推奖励
|
||||
1 => 'hjf_reward_direct_1', // 创客
|
||||
2 => 'hjf_reward_direct_2', // 云店
|
||||
3 => 'hjf_reward_direct_3', // 服务商
|
||||
4 => 'hjf_reward_direct_4', // 分公司
|
||||
];
|
||||
|
||||
/**
|
||||
* 各等级伞下奖励积分配置键
|
||||
*/
|
||||
const UMBRELLA_REWARD_KEYS = [
|
||||
0 => 0,
|
||||
1 => 'hjf_reward_umbrella_1',
|
||||
2 => 'hjf_reward_umbrella_2',
|
||||
3 => 'hjf_reward_umbrella_3',
|
||||
4 => 'hjf_reward_umbrella_4',
|
||||
];
|
||||
|
||||
/**
|
||||
* 默认积分奖励（当系统配置未初始化时使用）
|
||||
*/
|
||||
const DEFAULT_DIRECT = [0 => 0, 1 => 500, 2 => 800, 3 => 1000, 4 => 1300];
|
||||
const DEFAULT_UMBRELLA = [0 => 0, 1 => 0, 2 => 300, 3 => 200, 4 => 300];
|
||||
#[Inject]
|
||||
protected AgentLevelServices $agentLevelServices;
|
||||
|
||||
/**
|
||||
* 对一笔报单订单发放积分奖励
|
||||
*
|
||||
* @param int $orderUid 下单用户 ID
|
||||
* @param string $orderId 订单号
|
||||
*/
|
||||
public function reward(int $orderUid, string $orderId): void
|
||||
{
|
||||
try {
|
||||
// 获取下单用户信息
|
||||
$buyer = $this->userDao->get($orderUid);
|
||||
if (!$buyer || !$buyer['spread_uid']) {
|
||||
return; // 无推荐人，不发奖励
|
||||
return;
|
||||
}
|
||||
|
||||
// 沿推荐链向上遍历，计算级差奖励
|
||||
$this->propagateReward($buyer['spread_uid'], $orderUid, $orderId, 0);
|
||||
} catch (\Throwable $e) {
|
||||
Log::error("[PointsReward] 积分奖励失败 orderUid={$orderUid} orderId={$orderId}: " . $e->getMessage());
|
||||
@@ -86,11 +52,11 @@ class PointsRewardServices extends BaseServices
|
||||
/**
|
||||
* 向上递归发放级差积分
|
||||
*
|
||||
* @param int $uid 当前被奖励用户
|
||||
* @param int $fromUid 触发方（下级）用户 ID
|
||||
* @param string $orderId 来源订单号
|
||||
* @param int $lowerReward 下级已获得的直推/伞下奖励积分（用于级差扣减）
|
||||
* @param int $depth 递归深度（最多遍历10层）
|
||||
* @param int $uid 当前被奖励用户
|
||||
* @param int $fromUid 触发方（下级）用户 ID
|
||||
* @param string $orderId 来源订单号
|
||||
* @param int $lowerReward 下级已获得的直推/伞下奖励积分（用于级差扣减）
|
||||
* @param int $depth 递归深度
|
||||
*/
|
||||
private function propagateReward(
|
||||
int $uid,
|
||||
@@ -108,22 +74,21 @@ class PointsRewardServices extends BaseServices
|
||||
return;
|
||||
}
|
||||
|
||||
$level = (int)($user['member_level'] ?? 0);
|
||||
if ($level === 0) {
|
||||
// 普通会员不获得奖励，但继续向上传递
|
||||
$agentLevelId = (int)($user['agent_level'] ?? 0);
|
||||
$grade = $this->agentLevelServices->getGradeByLevelId($agentLevelId);
|
||||
|
||||
if ($grade === 0) {
|
||||
if ($user['spread_uid']) {
|
||||
$this->propagateReward((int)$user['spread_uid'], $uid, $orderId, 0, $depth + 1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// 判断是直推还是伞下（depth=0 说明是第一个上级，即直推）
|
||||
$isDirect = ($depth === 0);
|
||||
$reward = $isDirect
|
||||
? $this->getDirectReward($level)
|
||||
: $this->getUmbrellaReward($level);
|
||||
$reward = $isDirect
|
||||
? $this->agentLevelServices->getDirectRewardPoints($agentLevelId)
|
||||
: $this->agentLevelServices->getUmbrellaRewardPoints($agentLevelId);
|
||||
|
||||
// 级差：本次实发 = 本等级应得 - 下级已获得
|
||||
$actual = max(0, $reward - $lowerReward);
|
||||
|
||||
if ($actual > 0) {
|
||||
@@ -136,13 +101,12 @@ class PointsRewardServices extends BaseServices
|
||||
);
|
||||
}
|
||||
|
||||
// 继续向上传递（使用本级应得的 reward 作为下一级的 lowerReward）
|
||||
if ($user['spread_uid']) {
|
||||
$this->propagateReward(
|
||||
(int)$user['spread_uid'],
|
||||
$uid,
|
||||
$orderId,
|
||||
$reward, // 传递本级"应得"（而非实发）给上级做级差
|
||||
$reward,
|
||||
$depth + 1
|
||||
);
|
||||
}
|
||||
@@ -154,10 +118,8 @@ class PointsRewardServices extends BaseServices
|
||||
private function grantFrozenPoints(int $uid, int $points, string $orderId, string $type, string $mark): void
|
||||
{
|
||||
Db::transaction(function () use ($uid, $points, $orderId, $type, $mark) {
|
||||
// 增加 frozen_points
|
||||
$this->userDao->bcInc($uid, 'frozen_points', $points, 'uid');
|
||||
|
||||
// 写明细日志
|
||||
$this->logDao->save([
|
||||
'uid' => $uid,
|
||||
'points' => $points,
|
||||
@@ -170,22 +132,4 @@ class PointsRewardServices extends BaseServices
|
||||
]);
|
||||
});
|
||||
}
|
||||
|
||||
private function getDirectReward(int $level): int
|
||||
{
|
||||
$key = self::DIRECT_REWARD_KEYS[$level] ?? 0;
|
||||
if (!$key) {
|
||||
return self::DEFAULT_DIRECT[$level] ?? 0;
|
||||
}
|
||||
return (int)SystemConfigService::get($key, self::DEFAULT_DIRECT[$level] ?? 0);
|
||||
}
|
||||
|
||||
private function getUmbrellaReward(int $level): int
|
||||
{
|
||||
$key = self::UMBRELLA_REWARD_KEYS[$level] ?? 0;
|
||||
if (!$key) {
|
||||
return self::DEFAULT_UMBRELLA[$level] ?? 0;
|
||||
}
|
||||
return (int)SystemConfigService::get($key, self::DEFAULT_UMBRELLA[$level] ?? 0);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user