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,107 @@
<?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\model\system\config;
use app\model\store\StoreConfig;
use crmeb\basic\BaseModel;
use crmeb\traits\ModelTrait;
use think\Model;
/**
* 系统配置模型
* Class SystemConfig
* @package app\model\system\config
*/
class SystemConfig extends BaseModel
{
use ModelTrait;
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'system_config';
/**
* 一对一关联门店配置表
* @return \think\model\relation\HasOne
*/
public function storeConfig()
{
return $this->hasOne(StoreConfig::class, 'key_name', 'menu_name')->field(['key_name', 'type', 'relation_id', 'value'])->bind([
'store_value' => 'value',
]);
}
/**
* 菜单名搜索器
* @param Model $query
* @param $value
*/
public function searchMenuNameAttr($query, $value)
{
if (is_array($value)) {
$query->whereIn('menu_name', $value);
} else {
$query->where('menu_name', $value);
}
}
/**
* tab id 搜索
* @param Model $query
* @param $value
*/
public function searchTabIdAttr($query, $value)
{
$query->where('config_tab_id', $value);
}
/**
* 状态搜索器
* @param Model $query
* @param $value
*/
public function searchStatusAttr($query, $value)
{
$query->where('status', $value ?: 1);
}
/**
* value搜索器
* @param Model $query
* @param $value
*/
public function searchValueAttr($query, $value)
{
$query->where('value', $value);
}
/**
* is_store 搜索
* @param $query
* @param $value
*/
public function searchIsStoreAttr($query, $value)
{
if ($value) {
$query->where('is_store', $value);
}
}
}

View File

@@ -0,0 +1,99 @@
<?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\model\system\config;
use crmeb\basic\BaseModel;
use crmeb\traits\ModelTrait;
use think\Model;
/**
* 配置分类模型
* Class SystemConfigTab
* @package app\model\system\config
*/
class SystemConfigTab extends BaseModel
{
use ModelTrait;
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'system_config_tab';
/**
* 状态搜索器
* @param Model $query
* @param $value
*/
public function searchStatusAttr($query, $value)
{
if ($value != '') {
$query->where('status', $value);
}
}
/**
* pid搜索器
* @param Model $query
* @param $value
*/
public function searchPidAttr($query, $value)
{
if (is_array($value)) {
$query->whereIn('pid', $value);
} else {
$value && $query->where('pid', $value);
}
}
/**
* 类型搜索器
* @param Model $query
* @param $value
*/
public function searchTypeAttr($query, $value)
{
$query->where('status', 1);
if ($value > -1) {
$query->where(['type' => $value, 'pid' => 0]);
}
}
/**
* 分类名称搜索器
* @param Model $query
* @param $value
*/
public function searchTitleAttr($query, $value)
{
$query->whereLike('title', '%' . $value . '%');
}
/**
* @param $query
* @param $value
*/
public function searchIsStoreAttr($query, $value)
{
if ($value !== '') {
$query->where('is_store', $value);
}
}
}

View File

@@ -0,0 +1,69 @@
<?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\model\system\config;
use crmeb\basic\BaseModel;
use crmeb\traits\ModelTrait;
use think\Model;
/**
* 组合数据配置模型
* Class SystemGroup
* @package app\model\system\config
*/
class SystemGroup extends BaseModel
{
use ModelTrait;
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'system_group';
/**
* 配置名搜索器
* @param Model $query
* @param $value
*/
public function searchConfigNameAttr($query, $value)
{
$query->where('config_name', $value);
}
/**
* @param Model $query
* @param $value
*/
public function searchTitleAttr($query, $value)
{
if ($value != '') {
$query->whereLIke('id|name|info|config_name', "%$value%");
}
}
/**
* 查询分类
* @param Model $query
* @param $value
*/
public function searchCateIdAttr($query, $value)
{
$query->where('cate_id', $value);
}
}

View File

@@ -0,0 +1,64 @@
<?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\model\system\config;
use crmeb\basic\BaseModel;
use crmeb\traits\ModelTrait;
use think\Model;
/**
* 组合数据数据列表模型
* Class SystemGroupData
* @package app\model\system\config
*/
class SystemGroupData extends BaseModel
{
use ModelTrait;
/**
* 数据表主键
* @var string
*/
protected $pk = 'id';
/**
* 模型名称
* @var string
*/
protected $name = 'system_group_data';
/**
* 状态搜索器
* @param $query
* @param $value
*/
public function searchStatusAttr($query, $value)
{
if ($value != '') {
$query->where('status', $value);
}
}
/**
* Gid搜索器
* @param Model $query
* @param $value
*/
public function searchGidAttr($query, $value)
{
if (is_array($value)) {
$query->whereIn('gid', $value);
} else {
$query->where('gid', $value);
}
}
}

View File

@@ -0,0 +1,59 @@
<?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\model\system\config;
use crmeb\basic\BaseModel;
/**
* 云存储
* Class SystemStorage
* @package app\model\system\config
*/
class SystemStorage extends BaseModel
{
/**
* @var string
*/
protected $name = 'system_storage';
/**
* @var string
*/
protected $pk = 'id';
/**
* @var bool
*/
protected $autoWriteTimestamp = false;
/**
* @param $query
* @param $value
*/
public function searchNameAttr($query, $value)
{
$query->where('name', $value);
}
/**
* @param $query
* @param $value
*/
public function searchTypeAttr($query, $value)
{
if ($value !== '') {
$query->where('type', $value);
}
}
}