2026-03-07 22:29:07 +08:00
|
|
|
|
<?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;
|
|
|
|
|
|
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
use app\services\agent\AgentLevelServices;
|
2026-03-07 22:29:07 +08:00
|
|
|
|
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
|
|
|
|
|
|
{
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
$where = $this->normalizeHjfMemberLevelWhere($where);
|
2026-03-07 22:29:07 +08:00
|
|
|
|
[$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];
|
|
|
|
|
|
}
|
feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command
- Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods
- Queue-only cycle commission and position index fix in StoreOrderCreateServices
- UserBill income types: frozen_points_brokerage, frozen_points_release
- Timer: fsgx_release_frozen_points -> PointsReleaseServices
- Agent tasks: no_assess filtering for direct/umbrella counts
- Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates
- Admin/uniapp: crontab preset, membership level, user list, finance routes, docs
Made-with: Cursor
2026-03-24 11:59:09 +08:00
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
* 将会员列表筛选「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;
|
|
|
|
|
|
}
|
2026-03-07 22:29:07 +08:00
|
|
|
|
}
|