8592243d36
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
100 lines
3.1 KiB
PHP
100 lines
3.1 KiB
PHP
<?php
|
||
// +----------------------------------------------------------------------
|
||
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
|
||
// +----------------------------------------------------------------------
|
||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||
// +----------------------------------------------------------------------
|
||
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
|
||
// +----------------------------------------------------------------------
|
||
// | Author: CRMEB Team <admin@crmeb.com>
|
||
// +----------------------------------------------------------------------
|
||
declare (strict_types=1);
|
||
|
||
namespace app\services\user;
|
||
|
||
use app\services\agent\AgentLevelServices;
|
||
use app\services\BaseServices;
|
||
use app\dao\user\UserWechatUserDao;
|
||
use think\annotation\Inject;
|
||
|
||
/**
|
||
* Class UserWechatuserServices
|
||
* @package app\services\user
|
||
* @mixin UserWechatUserDao
|
||
*/
|
||
class UserWechatuserServices extends BaseServices
|
||
{
|
||
|
||
/**
|
||
* @var UserWechatUserDao
|
||
*/
|
||
#[Inject]
|
||
protected UserWechatUserDao $dao;
|
||
|
||
/**
|
||
* 自定义简单查询总数
|
||
* @param array $where
|
||
* @return int
|
||
*/
|
||
public function getCount(array $where): int
|
||
{
|
||
return $this->dao->getCount($where);
|
||
}
|
||
|
||
/**
|
||
* 复杂条件搜索列表
|
||
* @param array $where
|
||
* @param string $field
|
||
* @return array
|
||
*/
|
||
public function getWhereUserList(array $where, string $field): array
|
||
{
|
||
$where = $this->normalizeHjfMemberLevelWhere($where);
|
||
[$page, $limit] = $this->getPageValue();
|
||
$order_string = '';
|
||
$order_arr = ['asc', 'desc'];
|
||
if (isset($where['now_money']) && in_array($where['now_money'], $order_arr)) {
|
||
$order_string = 'now_money ' . $where['now_money'];
|
||
}
|
||
$list = $this->dao->getListByModel($where, $field, $order_string, $page, $limit);
|
||
$count = $this->dao->getCountByWhere($where);
|
||
return [$list, $count];
|
||
}
|
||
|
||
/**
|
||
* 将会员列表筛选「HJF 等级（grade）」转为 eb_user.agent_level 条件，供 UserWechatUserDao 使用。
|
||
*/
|
||
protected function normalizeHjfMemberLevelWhere(array $where): array
|
||
{
|
||
if (!array_key_exists('hjf_member_level', $where)) {
|
||
return $where;
|
||
}
|
||
$raw = $where['hjf_member_level'];
|
||
if ($raw === null) {
|
||
unset($where['hjf_member_level']);
|
||
|
||
return $where;
|
||
}
|
||
if (is_string($raw)) {
|
||
$raw = trim($raw);
|
||
}
|
||
// 空串/仅空白：不按分销等级筛选（避免 (int)' '=>0 误加 agent_level=0）
|
||
if ($raw === '') {
|
||
unset($where['hjf_member_level']);
|
||
|
||
return $where;
|
||
}
|
||
$grade = (int)$raw;
|
||
/** @var AgentLevelServices $agentLevel */
|
||
$agentLevel = app()->make(AgentLevelServices::class);
|
||
if ($grade === 0) {
|
||
$where['hjf_agent_level_id'] = 0;
|
||
} else {
|
||
$where['hjf_agent_level_id'] = $agentLevel->getLevelIdByGrade($grade) ?: -1;
|
||
}
|
||
unset($where['hjf_member_level']);
|
||
|
||
return $where;
|
||
}
|
||
}
|