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
2026-03-22 01:43:36 +08:00
parent 590eca8c22
commit 8592243d36
34 changed files with 1467 additions and 745 deletions

View File

@@ -3,9 +3,10 @@ declare(strict_types=1);
namespace app\jobs\hjf;
use app\services\hjf\MemberLevelServices;
use app\services\agent\AgentLevelServices;
use app\services\hjf\PointsRewardServices;
use app\services\hjf\QueuePoolServices;
use app\services\user\UserServices;
use crmeb\basic\BaseJobs;
use crmeb\traits\QueueTrait;
use think\exception\ValidateException;
@@ -16,11 +17,11 @@ use think\facade\Log;
*
* 触发时机Pay 监听器检测到 is_queue_goods=1 时派发。
*
* 执行流程:
* 执行流程(改造复用版)
* 1. 调用 QueuePoolServices::enqueue() 将订单写入公排池
* (内部含 Redis 分布式锁 + 退款触发检测)
* 2. 调用 PointsRewardServices::reward() 沿推荐链发放级差积分
* 3. 调用 MemberLevelServices::checkUpgrade() 检查下单用户上级链是否触发等级升级
* 3. 调用 AgentLevelServices::checkUserLevelFinish() 检查升级
* (复用 CRMEB 分销等级升级流程,已支持 HJF 任务类型 6/7/8
*
* Class HjfOrderPayJob
* @package app\jobs\hjf
@@ -29,22 +30,14 @@ class HjfOrderPayJob extends BaseJobs
{
use QueueTrait;
/**
* @param int $uid 下单用户 ID
* @param string $orderId 订单号eb_store_order.order_id
* @param float $amount 报单金额(默认 3600.00
* @return bool
*/
public function doJob(int $uid, string $orderId, float $amount = 3600.00): bool
{
try {
// 1. 公排入队
/** @var QueuePoolServices $queueServices */
$queueServices = app()->make(QueuePoolServices::class);
$queueServices->enqueue($uid, $orderId, $amount);
Log::info("[HjfOrderPay] 公排入队成功 uid={$uid} orderId={$orderId}");
} catch (ValidateException $e) {
// 锁竞争导致入队失败重新投递到队列延迟5秒
Log::warning("[HjfOrderPay] 入队被锁,延迟重试 uid={$uid} orderId={$orderId}: " . $e->getMessage());
static::dispatchSece(5, [$uid, $orderId, $amount]);
return true;
@@ -54,29 +47,29 @@ class HjfOrderPayJob extends BaseJobs
}
try {
// 2. 积分奖励(级差发放)
/** @var PointsRewardServices $pointsServices */
$pointsServices = app()->make(PointsRewardServices::class);
$pointsServices->reward($uid, $orderId);
Log::info("[HjfOrderPay] 积分奖励发放完成 uid={$uid} orderId={$orderId}");
} catch (\Throwable $e) {
// 积分发放失败不阻塞主流程,记录错误即可
Log::error("[HjfOrderPay] 积分奖励失败 uid={$uid} orderId={$orderId}: " . $e->getMessage());
}
try {
// 3. 触发推荐链等级升级检查(对买家本人及其直推上级)
/** @var MemberLevelServices $levelServices */
$levelServices = app()->make(MemberLevelServices::class);
$levelServices->checkUpgrade($uid);
// 同时检查直推上级(支付行为可能满足上级的伞下业绩门槛)
$spreadUid = (int)\think\facade\Db::name('user')
->where('uid', $uid)
->value('spread_uid');
if ($spreadUid > 0) {
$levelServices->checkUpgrade($spreadUid);
/** @var UserServices $userServices */
$userServices = app()->make(UserServices::class);
$userInfo = $userServices->getUserCacheInfo($uid);
$spreadUid = $userInfo ? (int)($userInfo['spread_uid'] ?? 0) : 0;
$twoSpreadUid = 0;
if ($spreadUid > 0 && $oneUserInfo = $userServices->getUserCacheInfo($spreadUid)) {
$twoSpreadUid = $userServices->getSpreadUid($spreadUid, $oneUserInfo, false);
}
$uids = array_unique([$uid, $spreadUid, $twoSpreadUid]);
/** @var AgentLevelServices $agentLevelServices */
$agentLevelServices = app()->make(AgentLevelServices::class);
$agentLevelServices->checkUserLevelFinish($uid, $uids);
Log::info("[HjfOrderPay] 等级升级检查完成 uid={$uid}");
} catch (\Throwable $e) {
Log::error("[HjfOrderPay] 等级升级检查失败 uid={$uid}: " . $e->getMessage());