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,133 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\services\product\specs;
use app\dao\product\specs\StoreProductSpecsDao;
use app\services\BaseServices;
use think\annotation\Inject;
use think\exception\ValidateException;
/**
* 商品参数
* Class StoreProductSpecsServices
* @package app\services\product\ensure
* @mixin StoreProductSpecsDao
*/
class StoreProductSpecsServices extends BaseServices
{
/**
* 商品参数字段
* @var array
*/
protected array $specs = [
'id' => 0,
'temp_id' => 0,
'name' => '',
'value' => '',
'sort' => 0
];
/**
* @var StoreProductSpecsDao
*/
#[Inject]
protected StoreProductSpecsDao $dao;
/**
* 获取参数模版列表(带参数)
* @param array $where
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getSpecsTemplateList(array $where)
{
[$page, $limit] = $this->getPageValue();
$list = $this->dao->getList($where, '*', $page, $limit);
$count = $this->dao->count($where);
return compact('list', 'count');
}
/**
* 检测
* @param array $data
* @return array
*/
public function checkSpecsData(array $data)
{
$data = array_merge($this->specs, array_intersect_key($data, $this->specs));
if (!isset($data['name']) || !$data['name']) {
throw new ValidateException('请填写参数名称');
}
return $data;
}
/**
* 修改参数模版(商品参数)
* @param int $id
* @param array $specsArr
* @return bool
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function updateData(int $id, array $specsArr)
{
$this->dao->delete(['temp_id' => $id]);
$insert = [];
$time = time();
foreach ($specsArr as $specs) {
$specs = $this->checkSpecsData($specs);
$specs['temp_id'] = $id;
if (isset($specs['id'])) {
unset($specs['id']);
}
$specs['add_time'] = $time;
$insert[] = $specs;
}
if ($insert) {
if (!$this->dao->saveAll($insert)) {
throw new ValidateException('新增商品参数失败');
}
}
return true;
}
/**
* 保存参数模版(商品参数)
* @param int $id
* @param array $specsArr
* @return bool
*/
public function saveData(int $id, array $specsArr)
{
if (!$specsArr) return true;
$dataAll = [];
$time = time();
foreach ($specsArr as $specs) {
$specs = $this->checkSpecsData($specs);
$specs['temp_id'] = $id;
$specs['add_time'] = $time;
$dataAll[] = $specs;
}
if ($dataAll) {
$this->dao->saveAll($dataAll);
}
return true;
}
}

View File

@@ -0,0 +1,85 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\services\product\specs;
use app\dao\other\CategoryDao;
use app\services\BaseServices;
use think\annotation\Inject;
use think\db\exception\DataNotFoundException;
use think\db\exception\DbException;
use think\db\exception\ModelNotFoundException;
/**
* 商品参数模版
* Class StoreProductSpecsTemplateServices
* @package app\services\product\specs
* @mixin CategoryDao
*/
class StoreProductSpecsTemplateServices extends BaseServices
{
/**
* 在分类库中3
*/
const GROUP = 3;
/**
* @var CategoryDao
*/
#[Inject]
protected CategoryDao $dao;
/**
* 获取所有参数模版
* @param array $where
* @param int $type
* @param int $relation_id
* @return array
* @throws DataNotFoundException
* @throws DbException
* @throws ModelNotFoundException
*/
public function getProductSpecsTemplateList(array $where, int $type = 0, int $relation_id = 0) : array
{
[$page, $limit] = $this->getPageValue();
$where = array_merge($where, ['type' => $type, 'relation_id' => $relation_id, 'group' => 3]);
$count = $this->dao->count($where);
$list = $this->dao->getCateList($where, $page, $limit, ['*']);
if ($list) {
foreach ($list as &$item) {
$item['add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '';
}
}
return compact('list', 'count');
}
/**
* 获取所有商品参数
* @param int $type
* @param int $relation_id
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getAllSpecs(int $type = 0, int $relation_id = 0)
{
$where = [];
// $where['relation_id'] = $relation_id;
// $where['type'] = $type;
$where['group'] = 3;
return $this->dao->getCateList($where, 0, 0, ['id', 'name'], ['specs' => function($query) {
$query->where('status', 1);
}]);
}
}