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
@@ -3,24 +3,23 @@ declare(strict_types=1);
|
||||
|
||||
namespace app\services\hjf;
|
||||
|
||||
use app\dao\user\UserDao;
|
||||
use app\services\agent\AgentLevelServices;
|
||||
use app\services\agent\AgentLevelTaskServices;
|
||||
use app\services\BaseServices;
|
||||
use crmeb\services\SystemConfigService;
|
||||
use app\services\user\UserServices;
|
||||
use think\annotation\Inject;
|
||||
use think\facade\Db;
|
||||
use think\facade\Log;
|
||||
|
||||
/**
|
||||
* 会员等级升级服务
|
||||
* 会员等级升级服务（改造复用版）
|
||||
*
|
||||
* 升级条件（PRD 3.2.1）：
|
||||
* - 普通会员 → 创客：直推3单（hjf_level_direct_require_1，默认3）
|
||||
* - 创客 → 云店：伞下业绩30单 + 至少3个直推（hjf_level_umbrella_require_2，默认30）
|
||||
* - 云店 → 服务商：伞下业绩100单 + 至少3个直推（hjf_level_umbrella_require_3，默认100）
|
||||
* - 服务商 → 分公司：伞下业绩1000单 + 至少3个直推（hjf_level_umbrella_require_4，默认1000）
|
||||
* 基于 CRMEB Pro 的团队分销等级功能进行改造：
|
||||
* - 使用 eb_user.agent_level (FK → eb_agent_level.id) 代替独立的 member_level
|
||||
* - 升级条件通过 eb_agent_level_task 的 type 6/7/8 定义
|
||||
* - 升级逻辑委托给 AgentLevelServices::checkUserLevelFinish()
|
||||
*
|
||||
* 伞下业绩分离：当某直推下级已升级到云店（level≥2）后，
|
||||
* 该下级及其整个团队的业绩不再计入本级的伞下业绩。
|
||||
* 本服务保留为薄封装层，提供 HJF 特有的查询方法供控制器调用。
|
||||
*
|
||||
* Class MemberLevelServices
|
||||
* @package app\services\hjf
|
||||
@@ -28,111 +27,70 @@ use think\facade\Log;
|
||||
class MemberLevelServices extends BaseServices
|
||||
{
|
||||
#[Inject]
|
||||
protected UserDao $userDao;
|
||||
protected AgentLevelServices $agentLevelServices;
|
||||
|
||||
/**
|
||||
* 各等级升级所需直推单数（0→1升级条件）
|
||||
*/
|
||||
const DIRECT_REQUIRE_KEYS = [
|
||||
1 => 'hjf_level_direct_require_1', // 普通→创客：直推N单
|
||||
];
|
||||
|
||||
/**
|
||||
* 各等级升级所需伞下单数（n-1→n升级条件，n≥2）
|
||||
*/
|
||||
const UMBRELLA_REQUIRE_KEYS = [
|
||||
2 => 'hjf_level_umbrella_require_2', // 创客→云店
|
||||
3 => 'hjf_level_umbrella_require_3', // 云店→服务商
|
||||
4 => 'hjf_level_umbrella_require_4', // 服务商→分公司
|
||||
];
|
||||
|
||||
/**
|
||||
* 默认升级门槛
|
||||
*/
|
||||
const DEFAULT_DIRECT_REQUIRE = [1 => 3];
|
||||
const DEFAULT_UMBRELLA_REQUIRE = [2 => 30, 3 => 100, 4 => 1000];
|
||||
|
||||
/**
|
||||
* 最低直推人数要求（云店及以上需要至少3个直推）
|
||||
*/
|
||||
const MIN_DIRECT_SPREAD_COUNT = 3;
|
||||
#[Inject]
|
||||
protected AgentLevelTaskServices $agentLevelTaskServices;
|
||||
|
||||
/**
|
||||
* 检查并执行升级（异步触发入口）
|
||||
*
|
||||
* @param int $uid 被检查的用户 ID
|
||||
* 委托给 CRMEB 的 AgentLevelServices 复用原有升级检测流程，
|
||||
* 该流程已支持 type 6/7/8 的 HJF 任务类型。
|
||||
*/
|
||||
public function checkUpgrade(int $uid): void
|
||||
{
|
||||
try {
|
||||
$user = $this->userDao->get($uid);
|
||||
if (!$user) {
|
||||
/** @var UserServices $userServices */
|
||||
$userServices = app()->make(UserServices::class);
|
||||
$userInfo = $userServices->getUserCacheInfo($uid);
|
||||
if (!$userInfo) {
|
||||
return;
|
||||
}
|
||||
|
||||
$currentLevel = (int)($user['member_level'] ?? 0);
|
||||
$nextLevel = $currentLevel + 1;
|
||||
|
||||
if ($nextLevel > 4) {
|
||||
return; // 已是最高等级
|
||||
$spreadUid = $userServices->getSpreadUid($uid, $userInfo);
|
||||
$twoSpreadUid = 0;
|
||||
if ($spreadUid > 0 && $oneUserInfo = $userServices->getUserCacheInfo($spreadUid)) {
|
||||
$twoSpreadUid = $userServices->getSpreadUid($spreadUid, $oneUserInfo, false);
|
||||
}
|
||||
$uids = array_unique([$uid, $spreadUid, $twoSpreadUid]);
|
||||
|
||||
$qualified = $this->checkLevelCondition($uid, $currentLevel, $nextLevel);
|
||||
if ($qualified) {
|
||||
$this->upgrade($uid, $nextLevel);
|
||||
|
||||
// 升级后继续检查是否可连续升级
|
||||
$this->checkUpgrade($uid);
|
||||
}
|
||||
$this->agentLevelServices->checkUserLevelFinish($uid, $uids);
|
||||
} catch (\Throwable $e) {
|
||||
Log::error("[MemberLevel] checkUpgrade uid={$uid}: " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查用户是否满足从 currentLevel 升到 nextLevel 的条件
|
||||
* 获取用户当前会员等级 grade（0=普通, 1=创客, 2=云店, 3=服务商, 4=分公司）
|
||||
*/
|
||||
private function checkLevelCondition(int $uid, int $currentLevel, int $nextLevel): bool
|
||||
public function getUserGrade(int $uid): int
|
||||
{
|
||||
if ($nextLevel === 1) {
|
||||
// 普通→创客：统计直推报单数
|
||||
$require = $this->getDirectRequire(1);
|
||||
$count = $this->getDirectQueueOrderCount($uid);
|
||||
return $count >= $require;
|
||||
}
|
||||
|
||||
// 创客/云店/服务商→更高等级：伞下业绩 + 至少3个直推
|
||||
$umbrellaRequire = $this->getUmbrellaRequire($nextLevel);
|
||||
$umbrellaCount = $this->getUmbrellaQueueOrderCount($uid);
|
||||
|
||||
if ($umbrellaCount < $umbrellaRequire) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 需要至少3个直推（对 level≥2 的升级）
|
||||
$directCount = $this->getDirectSpreadCount($uid);
|
||||
return $directCount >= self::MIN_DIRECT_SPREAD_COUNT;
|
||||
$agentLevel = (int)Db::name('user')->where('uid', $uid)->value('agent_level');
|
||||
return $this->agentLevelServices->getGradeByLevelId($agentLevel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取直推用户的报单订单数（直推层级 = 1 层）
|
||||
*
|
||||
* 报单商品标记：`is_queue_goods = 1`（eb_store_order 中的字段）
|
||||
* 获取用户当前等级名称
|
||||
*/
|
||||
public function getUserLevelName(int $uid): string
|
||||
{
|
||||
$agentLevel = (int)Db::name('user')->where('uid', $uid)->value('agent_level');
|
||||
if ($agentLevel <= 0) {
|
||||
return '普通会员';
|
||||
}
|
||||
$maps = $this->agentLevelServices->loadHjfUserListLevelMaps();
|
||||
$info = $this->agentLevelServices->pickHjfLevelRowForUserListDisplay($agentLevel, $maps);
|
||||
|
||||
return $info['name'] ?? '普通会员';
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取直推用户的报单订单数
|
||||
*/
|
||||
public function getDirectQueueOrderCount(int $uid): int
|
||||
{
|
||||
// 查询直推用户 uid 列表
|
||||
$directUids = $this->userDao->getColumn(['spread_uid' => $uid], 'uid');
|
||||
if (empty($directUids)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return (int)Db::name('store_order')
|
||||
->whereIn('uid', $directUids)
|
||||
->where('is_queue_goods', 1)
|
||||
->where('paid', 1)
|
||||
->where('is_del', 0)
|
||||
->count();
|
||||
return $this->agentLevelTaskServices->getDirectQueueOrderCount($uid);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -140,107 +98,39 @@ class MemberLevelServices extends BaseServices
|
||||
*/
|
||||
public function getDirectSpreadCount(int $uid): int
|
||||
{
|
||||
return (int)$this->userDao->count(['spread_uid' => $uid]);
|
||||
/** @var UserServices $userServices */
|
||||
$userServices = app()->make(UserServices::class);
|
||||
return (int)$userServices->count(['spread_uid' => $uid]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取伞下总报单订单数（含业绩分离逻辑）
|
||||
*
|
||||
* 业绩分离：若某直推下级已升级为云店（level≥2），
|
||||
* 则该下级及其团队的订单不计入本用户的伞下业绩。
|
||||
*
|
||||
* @param int $uid 统计对象用户 ID
|
||||
* @param int $maxDepth 递归最大深度，防止死循环
|
||||
*/
|
||||
public function getUmbrellaQueueOrderCount(int $uid, int $maxDepth = 8): int
|
||||
public function getUmbrellaQueueOrderCount(int $uid): int
|
||||
{
|
||||
return $this->recursiveUmbrellaCount($uid, $maxDepth);
|
||||
return $this->agentLevelTaskServices->getUmbrellaQueueOrderCount($uid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归统计伞下业绩（DFS）
|
||||
*/
|
||||
private function recursiveUmbrellaCount(int $uid, int $remainDepth): int
|
||||
{
|
||||
if ($remainDepth <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
$directChildren = $this->userDao->selectList(
|
||||
['spread_uid' => $uid],
|
||||
'uid,member_level',
|
||||
0, 0, 'uid', 'asc'
|
||||
);
|
||||
|
||||
if (empty($directChildren)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
$total = 0;
|
||||
foreach ($directChildren as $child) {
|
||||
$childLevel = (int)($child['member_level'] ?? 0);
|
||||
|
||||
// 业绩分离：直推下级已是云店或以上（level≥2），其团队业绩不计入本级
|
||||
if ($childLevel >= 2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 统计该下级自身的报单订单数
|
||||
$total += (int)Db::name('store_order')
|
||||
->where('uid', $child['uid'])
|
||||
->where('is_queue_goods', 1)
|
||||
->where('paid', 1)
|
||||
->where('is_del', 0)
|
||||
->count();
|
||||
|
||||
// 递归统计该下级的伞下
|
||||
$total += $this->recursiveUmbrellaCount((int)$child['uid'], $remainDepth - 1);
|
||||
}
|
||||
|
||||
return $total;
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行升级
|
||||
* 手动设置会员等级（管理后台使用）
|
||||
*
|
||||
* @param int $uid 用户 ID
|
||||
* @param int $newLevel 新等级
|
||||
* @param int $uid 用户 ID
|
||||
* @param int $grade 目标等级 grade (0-4)
|
||||
*/
|
||||
public function upgrade(int $uid, int $newLevel): void
|
||||
public function setUserLevel(int $uid, int $grade): void
|
||||
{
|
||||
Db::transaction(function () use ($uid, $newLevel) {
|
||||
$this->userDao->update($uid, ['member_level' => $newLevel], 'uid');
|
||||
|
||||
Log::info("[MemberLevel] uid={$uid} 升级到 level={$newLevel}");
|
||||
});
|
||||
|
||||
// 升级后通知推荐链上级重新检查
|
||||
$user = $this->userDao->get($uid);
|
||||
if ($user && $user['spread_uid']) {
|
||||
// 异步检查上级升级（防止递归过深直接调用）
|
||||
try {
|
||||
app(\app\jobs\hjf\MemberLevelCheckJob::class)::dispatch($user['spread_uid']);
|
||||
} catch (\Throwable $e) {
|
||||
Log::warning("[MemberLevel] 无法派发上级检查 Job: " . $e->getMessage());
|
||||
$agentLevelId = 0;
|
||||
if ($grade > 0) {
|
||||
$agentLevelId = $this->agentLevelServices->getLevelIdByGrade($grade);
|
||||
if ($agentLevelId <= 0) {
|
||||
throw new \think\exception\ValidateException("等级 grade={$grade} 在 eb_agent_level 中不存在");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function getDirectRequire(int $level): int
|
||||
{
|
||||
$key = self::DIRECT_REQUIRE_KEYS[$level] ?? '';
|
||||
if (!$key) {
|
||||
return self::DEFAULT_DIRECT_REQUIRE[$level] ?? 3;
|
||||
}
|
||||
return (int)SystemConfigService::get($key, self::DEFAULT_DIRECT_REQUIRE[$level] ?? 3);
|
||||
}
|
||||
/** @var UserServices $userServices */
|
||||
$userServices = app()->make(UserServices::class);
|
||||
$userServices->update($uid, ['agent_level' => $agentLevelId]);
|
||||
|
||||
private function getUmbrellaRequire(int $level): int
|
||||
{
|
||||
$key = self::UMBRELLA_REQUIRE_KEYS[$level] ?? '';
|
||||
if (!$key) {
|
||||
return self::DEFAULT_UMBRELLA_REQUIRE[$level] ?? 9999;
|
||||
}
|
||||
return (int)SystemConfigService::get($key, self::DEFAULT_UMBRELLA_REQUIRE[$level] ?? 9999);
|
||||
Log::info("[MemberLevel] 手动设置 uid={$uid} agent_level={$agentLevelId} (grade={$grade})");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user