wikiboss/Henglianshutong
1
0
派生 0
代码 工单 合并请求 Actions 软件包 项目 版本发布 百科 动态

feat(user): 重构后台会员列表与详情为全屏选项卡并补齐二开权益资产中心

浏览代码
这个提交包含在：
chen
2026-09-17 16:55:19 +08:00
父节点 c3f5b3d4b5
当前提交 289adf5c36
共有 7 个文件被更改，包括 1453 次插入 和 330 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

189
application/admin/controller/shopro/user/User.php
查看文件

@@ -12,7 +12,7 @@ class User extends Common
{
protected $model = null;
protected $noNeedRight = ['select'];
protected $noNeedRight = ['select', 'rewards', 'voucherPlans', 'team'];
public function _initialize()
{
@@ -29,7 +29,60 @@ class User extends Common
return $this->view->fetch();
}
$data = $this->model->sheepFilter()->paginate($this->request->param('list_rows', 10));
$paginator = $this->model->sheepFilter()
->with(['parent_user', 'agent.level_info'])
->paginate($this->request->param('list_rows', 10));
$rate = (new \addons\shopro\service\partner\RateService())->currentRate();
$days = \addons\shopro\service\partner\PartnerConfig::activeDays();
$now = time();
$list = $paginator->items();
foreach ($list as &$user) {
$agent = $user->agent;
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent, $rate);
foreach ($partner as $k => $v) {
$user->$k = $v;
}
$user->has_agent = (bool) $agent;
$user->madow_value = $partner['madow_value'] ?? '0.00';
if ($agent) {
$user->is_venue = intval($agent->is_venue ?? 0);
$user->is_county = intval($agent->is_county ?? 0);
$user->is_partner = intval($agent->is_partner ?? 0);
$user->direct_order_seq = intval($agent->direct_order_seq ?? 0);
$user->voucher_total = \addons\shopro\service\partner\IdentityService::formatMoney($agent->voucher_total ?? 0);
$user->voucher_released = \addons\shopro\service\partner\IdentityService::formatMoney($agent->voucher_released ?? 0);
$user->voucher_used = \addons\shopro\service\partner\IdentityService::formatMoney($agent->voucher_used ?? 0);
$user->voucher_available = \addons\shopro\service\partner\IdentityService::formatMoney(max(0, ($agent->voucher_released ?? 0) - ($agent->voucher_used ?? 0)));
$user->last_self_order_time = intval($agent->last_self_order_time ?? 0);
$user->last_self_order_text = $user->last_self_order_time ? date('Y-m-d H:i:s', $user->last_self_order_time) : '从未下单';
} else {
$user->is_venue = 0;
$user->is_county = 0;
$user->is_partner = 0;
$user->direct_order_seq = 0;
$user->voucher_total = '0.00';
$user->voucher_released = '0.00';
$user->voucher_used = '0.00';
$user->voucher_available = '0.00';
$user->last_self_order_time = 0;
$user->last_self_order_text = '从未下单';
}
}
$stats = [
'total_users' => UserModel::count(),
'maker_count' => Db::name('shopro_commission_agent')->where('level', '>=', 2)->count(),
'venue_count' => Db::name('shopro_commission_agent')->where('is_venue', 1)->count(),
'county_count' => Db::name('shopro_commission_agent')->where('is_county', 1)->count(),
'partner_count' => Db::name('shopro_commission_agent')->where('is_partner', 1)->count(),
'active_count' => Db::name('shopro_commission_agent')->where('last_self_order_time', '>=', $now - $days * 86400)->count(),
];
$data = $paginator->toArray();
$data['stats'] = $stats;
$this->success('获取成功', null, $data);
}
@@ -54,9 +107,141 @@ class User extends Common
$data = array_merge($user->toArray(), $partner);
$data['has_agent'] = (bool) $agent;
// 推三返一循环信息
$push3Amounts = \addons\shopro\service\partner\PartnerConfig::push3Amounts();
$seq = intval($agent->direct_order_seq ?? 0);
$cycleCount = count($push3Amounts) > 0 ? count($push3Amounts) : 3;
$nextAmount = $push3Amounts[$seq % $cycleCount] ?? 398;
$data['direct_order_seq'] = $seq;
$data['push3_cycle_index'] = ($seq % $cycleCount) + 1;
$data['next_push3_amount'] = number_format((float) $nextAmount, 2, '.', '');
$data['next_push3_text'] = '第 ' . ($seq + 1) . ' 单将返 ¥' . $data['next_push3_amount'];
// 30天自购活跃状态与倒计时
$lastOrder = intval($agent->last_self_order_time ?? 0);
$activeDays = \addons\shopro\service\partner\PartnerConfig::activeDays();
$ago = $lastOrder ? intval(floor((time() - $lastOrder) / 86400)) : null;
$isAdvanced = !empty($data['is_advanced']);
$data['last_self_order_time'] = $lastOrder;
$data['last_self_order_text'] = $lastOrder ? date('Y-m-d H:i:s', $lastOrder) : '从未下单';
$data['active_days_ago'] = $ago;
$data['active_days_limit'] = $activeDays;
if (!$isAdvanced) {
$data['active_status_text'] = '免自购考核 (基础会员/品酒师)';
} else {
$data['active_status_text'] = !empty($data['active_30d'])
? '正常领取（近30天有自购）'
: ('已暂停领取' . ($ago !== null ? '（距今 ' . $ago . ' 天）' : '（从未下单）'));
}
// 累计现金收益统计
$totalCash = \app\admin\model\shopro\partner\Reward::where('user_id', $id)
->where('status', 1)
->where('amount', '>', 0)
->sum('amount');
$push3Cash = \app\admin\model\shopro\partner\Reward::where('user_id', $id)
->where('status', 1)
->where('amount', '>', 0)
->where('reward_type', 'push3')
->sum('amount');
$partnerExclusiveCash = \app\admin\model\shopro\partner\Reward::where('user_id', $id)
->where('status', 1)
->where('amount', '>', 0)
->where('reward_type', '<>', 'push3')
->sum('amount');
$data['income_total_cash'] = number_format((float) $totalCash, 2, '.', '');
$data['push3_cash_income'] = number_format((float) $push3Cash, 2, '.', '');
$data['partner_exclusive_cash'] = number_format((float) $partnerExclusiveCash, 2, '.', '');
// 兑换券计划资产统计
$voucherTotal = floatval($agent->voucher_total ?? 0);
$voucherReleased = floatval($agent->voucher_released ?? 0);
$voucherUsed = floatval($agent->voucher_used ?? 0);
$data['voucher_total'] = number_format($voucherTotal, 2, '.', '');
$data['voucher_released'] = number_format($voucherReleased, 2, '.', '');
$data['voucher_used'] = number_format($voucherUsed, 2, '.', '');
$data['voucher_available'] = number_format(max(0, $voucherReleased - $voucherUsed), 2, '.', '');
$data['voucher_plans_count'] = \app\admin\model\shopro\partner\VoucherPlan::where('user_id', $id)->count();
// 团队统计
$data['direct_users_count'] = UserModel::where('parent_user_id', $id)->count();
if ($agent) {
$data['agent_level'] = $agent->level;
$data['agent_level_info'] = $agent->level_info;
$data['is_venue'] = intval($agent->is_venue ?? 0);
$data['is_county'] = intval($agent->is_county ?? 0);
$data['is_partner'] = intval($agent->is_partner ?? 0);
$data['county_code'] = (string) ($agent->county_code ?? '');
$data['upgrade_lock'] = intval($agent->upgrade_lock ?? 0);
}
$this->success('获取成功', null, $data);
}
/**
* 详情动态：收益中心流水
*/
public function rewards($id)
{
$showSkip = $this->request->param('show_skip', 0);
$query = \app\admin\model\shopro\partner\Reward::sheepFilter()
->with(['buyer', 'order'])
->where('user_id', $id);
if (!$showSkip) {
$query->where(function ($q) {
$q->where('amount', '>', 0)->whereOr('madow', '>', 0);
});
}
$list = $query->order('id', 'desc')->paginate($this->request->param('list_rows', 10));
$this->success('获取成功', null, $list);
}
/**
* 详情动态：兑换券释放计划
*/
public function voucherPlans($id)
{
$list = \app\admin\model\shopro\partner\VoucherPlan::sheepFilter()
->with(['order'])
->where('user_id', $id)
->order('id', 'desc')
->paginate($this->request->param('list_rows', 10));
$agent = \app\admin\model\shopro\commission\Agent::where('user_id', $id)->field('voucher_used,voucher_released')->find();
$used = (float) ($agent['voucher_used'] ?? 0);
$released = (float) ($agent['voucher_released'] ?? 0);
$available = number_format(max(0, $released - $used), 2, '.', '');
foreach ($list as $row) {
$row->voucher_used = number_format($used, 2, '.', '');
$row->voucher_available = $available;
}
$this->success('获取成功', null, $list);
}
/**
* 详情动态：团队成员列表
*/
public function team($id)
{
$list = UserModel::with(['agent.level_info'])
->where('parent_user_id', $id)
->order('id', 'desc')
->paginate($this->request->param('list_rows', 10));
$rate = (new \addons\shopro\service\partner\RateService())->currentRate();
foreach ($list as $sub) {
$agent = $sub->agent;
$partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent, $rate);
foreach ($partner as $k => $v) {
$sub->$k = $v;
}
$sub->has_agent = (bool) $agent;
}
$this->success('获取成功', null, $list);
}
/**
* 更新用户
*