feat(fsgx): 完成全部24项开发任务 Phase1-7

Phase1 后端核心:
- 新增 fsgx_v1.sql 迁移脚本(is_queue_goods/frozen_points/available_points/no_assess)
- SystemConfigServices 返佣设置扩展(周期人数/分档比例/范围/时机)
- StoreOrderCreateServices 周期循环佣金计算
- StoreOrderTakeServices 佣金发放后同步冻结积分
- StoreProductServices/StoreProduct 保存 is_queue_goods

Phase2 后端接口:
- GET /api/hjf/brokerage/progress 佣金周期进度
- GET /api/hjf/assets/overview 资产总览
- HjfPointsServices 每日 frozen_points 0.4‰ 释放定时任务
- PUT /adminapi/hjf/member/{uid}/no_assess 不考核接口
- GET /adminapi/hjf/points/release_log 积分日志接口

Phase3 前端清理:
- hjfCustom.js 路由精简(仅保留 points/log)
- hjfQueue.js/hjfMember.js API 清理/重定向至 CRMEB 原生接口
- pages.json 公排→推荐佣金/佣金记录/佣金规则

Phase4-5 前端改造:
- queue/status.vue 推荐佣金进度页整体重写
- 商品详情/订单确认/支付结果页文案与逻辑改造
- 个人中心/资产页/引导页/规则页文案改造
- HjfQueueProgress/HjfRefundNotice/HjfAssetCard 组件改造
- 推广中心嵌入佣金进度摘要
- hjfMockData.js 全量更新(公排字段→佣金字段)

Phase6 Admin 增强:
- 用户列表新增 frozen_points/available_points 列及不考核操作按钮
- hjfPoints.js USE_MOCK=false 对接真实积分日志接口

Phase7 配置文档:
- docs/fsgx-phase7-config-checklist.md 后台配置与全链路验收清单

Made-with: Cursor
This commit is contained in:
apple
2026-03-23 22:32:19 +08:00
parent 788ee0c0c0
commit 434aa8c69d
13098 changed files with 2008990 additions and 961 deletions

View File

@@ -0,0 +1,32 @@
<?php
// +----------------------------------------------------------------------
// | 范氏国香 fsgx — Admin 会员管理接口
// +----------------------------------------------------------------------
namespace app\controller\admin\v1\hjf;
use app\controller\admin\AuthController;
use app\Request;
use app\services\user\UserServices;
class HjfMember extends AuthController
{
/**
* PUT /adminapi/hjf/member/{uid}/no_assess
* 设置/取消用户不考核状态
*/
public function setNoAssess(Request $request, int $uid)
{
if ($uid <= 0) return $this->fail('参数错误');
/** @var UserServices $userServices */
$userServices = app()->make(UserServices::class);
$user = $userServices->get($uid, ['uid', 'no_assess']);
if (!$user) return $this->fail('用户不存在');
$noAssess = (int)$request->post('no_assess', 1);
$userServices->update($uid, ['no_assess' => $noAssess ? 1 : 0], 'uid');
return $this->success($noAssess ? '已设置不考核' : '已取消不考核');
}
}

View File

@@ -0,0 +1,65 @@
<?php
// +----------------------------------------------------------------------
// | 范氏国香 fsgx — Admin 积分日志接口
// +----------------------------------------------------------------------
namespace app\controller\admin\v1\hjf;
use app\controller\admin\AuthController;
use app\Request;
use think\facade\Db;
class HjfPoints extends AuthController
{
/**
* GET /adminapi/hjf/points/release_log
* 积分释放日志(来自 UserBilltype = integralmark 包含"积分"
*/
public function releaseLog(Request $request)
{
$page = (int)$request->get('page', 1);
$limit = (int)$request->get('limit', 20);
$keyword = trim((string)$request->get('keyword', ''));
$type = trim((string)$request->get('type', ''));
$query = Db::table('eb_user_bill')
->alias('b')
->leftJoin('eb_user u', 'u.uid = b.uid')
->where('b.category', 'integral')
->field('b.id, b.uid, b.title, b.mark, b.number, b.balance, b.pm, b.add_time, u.nickname, u.avatar');
if ($keyword !== '') {
$query->where(function ($q) use ($keyword) {
$q->whereLike('u.nickname', "%{$keyword}%")
->whereOr('b.uid', $keyword);
});
}
if ($type !== '') {
$typeMap = [
'release' => 'frozen_points_release',
'brokerage'=> 'frozen_points_brokerage',
'consume' => '',
];
if ($type === 'consume') {
$query->where('b.pm', 0);
} elseif (isset($typeMap[$type]) && $typeMap[$type] !== '') {
$query->where('b.link_type', $typeMap[$type]);
}
}
$count = $query->count();
$list = $query->order('b.id', 'desc')
->page($page, $limit)
->select()
->toArray();
foreach ($list as &$item) {
$item['add_time_str'] = date('Y-m-d H:i:s', (int)$item['add_time']);
$item['pm_label'] = $item['pm'] ? '收入' : '支出';
}
unset($item);
return $this->success(['list' => $list, 'count' => $count]);
}
}

View File

@@ -642,7 +642,8 @@ class StoreProduct extends AuthController
['presale_status', 0],//预售结束后状态
['is_send_gift', 0],//商品是否支持送礼
['send_gift_price', 0],//商品送礼附加费用
['level_type', 1]
['level_type', 1],
['is_queue_goods', 0],//报单商品标记
]);
if ($this->supplierId != 0) {
$data['supplier_id'] = $this->supplierId;

View File

@@ -0,0 +1,53 @@
<?php
// +----------------------------------------------------------------------
// | 范氏国香 fsgx — 资产总览 API
// +----------------------------------------------------------------------
namespace app\controller\api\v1\hjf;
use app\Request;
use app\services\user\UserServices;
use app\services\agent\AgentLevelServices;
use app\controller\api\AuthController;
class HjfAssets extends AuthController
{
/**
* GET /api/hjf/assets/overview
* 资产总览聚合接口
* 返回:佣金余额、待释放积分、已释放积分、今日释放、分销等级名称
*/
public function overview(Request $request)
{
$uid = (int)$request->uid();
/** @var UserServices $userServices */
$userServices = app()->make(UserServices::class);
$user = $userServices->get($uid, ['uid', 'brokerage_price', 'frozen_points', 'available_points', 'agent_level', 'now_money']);
if (!$user) {
return $this->fail('用户不存在');
}
$agentLevelName = '';
if (!empty($user['agent_level'])) {
/** @var AgentLevelServices $agentLevelServices */
$agentLevelServices = app()->make(AgentLevelServices::class);
$levelInfo = $agentLevelServices->get((int)$user['agent_level'], ['id', 'name']);
$agentLevelName = $levelInfo ? $levelInfo['name'] : '';
}
// 今日释放积分frozen_points * 0.4‰(与定时任务逻辑一致)
$frozenPoints = (int)($user['frozen_points'] ?? 0);
$todayRelease = (int)floor($frozenPoints * 0.0004);
return $this->success([
'brokerage_price' => (string)($user['brokerage_price'] ?? '0.00'),
'now_money' => (string)($user['now_money'] ?? '0.00'),
'frozen_points' => $frozenPoints,
'available_points' => (int)($user['available_points'] ?? 0),
'today_release' => $todayRelease,
'agent_level' => (int)($user['agent_level'] ?? 0),
'agent_level_name' => $agentLevelName,
]);
}
}

View File

@@ -0,0 +1,56 @@
<?php
// +----------------------------------------------------------------------
// | 范氏国香 fsgx — 推荐佣金周期进度 API
// +----------------------------------------------------------------------
namespace app\controller\api\v1\hjf;
use app\Request;
use app\services\order\StoreOrderServices;
use app\services\user\UserBrokerageServices;
use app\services\user\UserServices;
use app\controller\api\AuthController;
class HjfBrokerage extends AuthController
{
/**
* GET /api/hjf/brokerage/progress
* 推荐佣金周期进度聚合接口
*/
public function progress(Request $request)
{
$uid = (int)$request->uid();
/** @var UserServices $userServices */
$userServices = app()->make(UserServices::class);
$userInfo = $userServices->get($uid, ['uid', 'brokerage_price', 'spread_uid', 'agent_level']);
// 周期配置
$cycleCount = (int)sys_config('brokerage_cycle_count', 3);
$cycleRatesRaw = sys_config('brokerage_cycle_rates', '[20,30,50]');
$cycleRates = json_decode($cycleRatesRaw, true) ?: [20, 30, 50];
// 统计当前用户作为 spread_uid 的下级已完成报单商品有效订单数
/** @var \app\dao\order\StoreOrderDao $orderDao */
$orderDao = app()->make(\app\dao\order\StoreOrderDao::class);
$totalCompleted = $orderDao->count([
'spread_uid' => $uid,
'is_queue_goods' => 1,
'paid' => 1,
'is_del' => 0,
]);
// 当前周期内完成人数
$cycleCurrent = $totalCompleted % $cycleCount;
// 累计佣金
$totalBrokerage = $userInfo ? (string)($userInfo['brokerage_price'] ?? '0.00') : '0.00';
return $this->success([
'cycle_total' => $cycleCount,
'cycle_current' => $cycleCurrent,
'cycle_rates' => $cycleRates,
'total_brokerage' => $totalBrokerage,
'total_completed' => $totalCompleted,
]);
}
}