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,62 @@
<?php
namespace app\controller\admin\v1\finance;
use app\controller\admin\AuthController;
use app\services\system\CapitalFlowServices;
use think\annotation\Inject;
class CapitalFlow extends AuthController
{
/**
* @var CapitalFlowServices
*/
#[Inject]
protected CapitalFlowServices $services;
/**
* 资金流水
* @return mixed
*/
public function getFlowList()
{
$where = $this->request->getMore([
['time', ''],
['trading_type', 0],
['keywords', ''],
['ids', ''],
['export', 0]
]);
$date = $this->services->getFlowList($where);
return app('json')->success($date);
}
/**
* 资金流水备注
* @param $id
* @return mixed
*/
public function setMark($id)
{
$data = $this->request->postMore([
['mark', '']
]);
$this->services->setMark($id, $data);
return app('json')->success('备注成功!');
}
/**
* 账单记录
* @return mixed
*/
public function getFlowRecord()
{
$where = $this->request->getMore([
['type', 'day'],
['time', '']
]);
$data = $this->services->getFlowRecord($where);
return app('json')->success($data);
}
}

View File

@@ -0,0 +1,102 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\controller\admin\v1\finance;
use app\services\user\UserBillServices;
use app\services\user\UserBrokerageServices;
use app\services\user\UserMoneyServices;
use think\annotation\Inject;
use app\controller\admin\AuthController;
/**
* Class Finance
* @package app\controller\admin\v1\finance
*/
class Finance extends AuthController
{
/**
* @var UserBillServices
*/
#[Inject]
protected UserBillServices $services;
/**
* 筛选类型
*/
public function bill_type(UserMoneyServices $services)
{
return $this->success($services->bill_type());
}
/**
* 资金记录
*/
public function list(UserMoneyServices $services)
{
$where = $this->request->getMore([
['start_time', ''],
['end_time', ''],
['nickname', ''],
['limit', 20],
['page', 1],
['type', ''],
]);
return $this->success($services->getMoneyList($where));
}
/**
* 用户佣金记录(用户列表)
* @return mixed
*/
public function get_commission_list(UserBrokerageServices $services)
{
$where = $this->request->getMore([
['nickname', ''],
['price_max', ''],
['price_min', ''],
['sum_number', 'normal'],
['brokerage_price', 'normal'],
['date', '', '', 'time']
]);
return $this->success($services->getCommissionList($where));
}
/**
* 佣金详情用户信息
* @param $id
* @return mixed
*/
public function user_info(UserBrokerageServices $services, $id)
{
return $this->success($services->user_info((int)$id));
}
/**
* 获取用户佣金列表
* @param UserBrokerageServices $services
* @param string $id
* @return mixed
*/
public function getUserBrokeragelist(UserBrokerageServices $services, $id = '')
{
if ($id == '') return $this->fail('缺少参数');
$where = $this->request->getMore([
['start_time', ''],
['end_time', ''],
['nickname', '']
]);
$where['uid'] = (int)$id;
return $this->success($services->getBrokerageList($where));
}
}

View File

@@ -0,0 +1,166 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\controller\admin\v1\finance;
use app\controller\admin\AuthController;
use app\services\user\UserExtractServices;
use think\annotation\Inject;
use think\Request;
/**
* Class UserExtract
* @package app\controller\admin\v1\finance
*/
class UserExtract extends AuthController
{
/**
* @var UserExtractServices
*/
#[Inject]
protected UserExtractServices $services;
/**
* 显示资源列表
*
* @return \think\Response
*/
public function index()
{
$where = $this->request->getMore([
['status', ''],
['extract_type', ''],
['nireid', '', '', 'like'],
['data', '', '', 'time'],
]);
if (isset($where['extract_type']) && $where['extract_type'] == 'wx') {
$where['extract_type'] = 'weixin';
}
return $this->success($this->services->index($where));
}
/**
* 显示编辑资源表单页.
*
* @param int $id
* @return \think\Response
*/
public function edit($id)
{
if (!$id) return $this->fail('数据不存在');
return $this->success($this->services->edit((int)$id));
}
/**
* 保存更新的资源
*
* @param \think\Request $request
* @param int $id
* @return \think\Response
*/
public function update(Request $request, $id)
{
if (!$id) return $this->fail('缺少参数!');
$id = (int)$id;
$UserExtract = $this->services->getExtract($id);
if (!$UserExtract) $this->fail('数据不存在');
if ($UserExtract['extract_type'] == 'alipay') {
$data = $this->request->postMore([
'real_name',
'mark',
'extract_price',
'alipay_code',
]);
if (!$data['real_name']) return $this->fail('请输入姓名');
if ($data['extract_price'] <= -1) return $this->fail('请输入提现金额');
if (!$data['alipay_code']) return $this->fail('请输入支付宝账号');
} else if ($UserExtract['extract_type'] == 'weixin') {
$data = $this->request->postMore([
'real_name',
'mark',
'extract_price',
'wechat',
]);
if ($data['extract_price'] <= -1) return $this->fail('请输入提现金额');
if (!$data['wechat']) return $this->fail('请输入微信账号');
} else {
$data = $this->request->postMore([
'real_name',
'extract_price',
'mark',
'bank_code',
'bank_address',
]);
if (!$data['real_name']) return $this->fail('请输入姓名');
if ($data['extract_price'] <= -1) return $this->fail('请输入提现金额');
if (!$data['bank_code']) return $this->fail('请输入银行卡号');
if (!$data['bank_address']) return $this->fail('请输入开户行');
}
return $this->success($this->services->update($id, $data) ? '修改成功' : '修改失败');
}
/**
* 拒绝
* @param $id
* @return mixed
*/
public function refuse($id)
{
if (!$id) $this->fail('缺少参数');
$data = $this->request->postMore([
['message', '']
]);
return $this->success($this->services->refuse((int)$id, $data['message']) ? '操作成功' : '操作失败');
}
/**
* 通过
* @param $id
* @return mixed
*/
public function adopt($id)
{
if (!$id) $this->fail('缺少参数');
return $this->success($this->services->adopt((int)$id) ? '操作成功' : '操作失败');
}
/**
* 备注表单
* @param $id
* @return \think\Response
* User: liusl
* DateTime: 2024/9/12 10:47
*/
public function remarkForm($id)
{
if (!$id) return $this->fail('数据不存在');
return $this->success($this->services->remarkForm((int)$id));
}
/**
* 备注
* @param $id
* @return \think\Response
* User: liusl
* DateTime: 2024/9/12 10:47
*/
public function remarkUpdate($id)
{
if (!$id) $this->fail('缺少参数');
[$make] = $this->request->postMore([
['mark', '']
], true);
if (!$make) return $this->fail('请输入备注');
$res = $this->services->update($id, ['mark' => $make]);
return $this->success($res ? '操作成功' : '操作失败');
}
}

View File

@@ -0,0 +1,34 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\controller\admin\v1\finance;
use app\common\controller\Recharge;
use app\controller\admin\AuthController;
use app\services\user\UserRechargeServices;
use think\annotation\Inject;
/**
* Class UserRecharge
* @package app\controller\admin\v1\finance
*/
class UserRecharge extends AuthController
{
use Recharge;
/**
* @var UserRechargeServices
*/
#[Inject]
protected UserRechargeServices $services;
}