434aa8c69d
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
66 lines
2.2 KiB
PHP
66 lines
2.2 KiB
PHP
<?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
|
||
* 积分释放日志（来自 UserBill，type = integral，mark 包含"积分"）
|
||
*/
|
||
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]);
|
||
}
|
||
}
|