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,35 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\dao\activity\card;
use app\dao\BaseDao;
use app\model\activity\card\CardBatch;
/**
* 卡次表
* Class CardBatchDao
* @package app\dao\activity\card
*/
class CardBatchDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return CardBatch::class;
}
}

View File

@@ -0,0 +1,67 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\dao\activity\card;
use app\dao\BaseDao;
use app\model\activity\card\CardCode;
use app\services\user\UserServices;
/**
* 卡密
* Class CardCodeDao
* @package app\dao\activity\card
*/
class CardCodeDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return CardCode::class;
}
/**
* 获取卡密列表
* @param array $where 查询条件
* @param int $page 页码
* @param int $limit 每页数量
* @param string $order 排序
* @return array
*/
public function getList($where = [], $page = 0, $limit = 0, $order = 'id desc')
{
return $this->search($where)
->when(isset($where['field_key']) && $where['field_key'] && isset($where['keyword']) && $where['keyword'], function ($query) use ($where) {
switch ($where['field_key']) {
case 'card_number':
$query->whereLike('card_number', "%{$where['keyword']}%");
break;
case 'nickname':
$query->whereIn('uid', 'in', function ($q) use ($where) {
$q->name('user')->whereLike('nickname', '%' . $where['keyword'] . '%')->field(['uid'])->select();
});
case 'uid':
$query->where('uid', $where['keyword']);
break;
}
})
->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})
->order($order)->select()->toArray();
}
}

View File

@@ -0,0 +1,36 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\dao\activity\card;
use app\dao\BaseDao;
use app\model\activity\card\CardGift;
use app\model\activity\card\CardGiftAuxiliary;
/**
* 礼品卡
* Class CardGiftAuxiliaryDao
* @package app\dao\activity\card
*/
class CardGiftAuxiliaryDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return CardGiftAuxiliary::class;
}
}

View File

@@ -0,0 +1,58 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\dao\activity\card;
use app\dao\BaseDao;
use app\model\activity\card\CardGift;
/**
* 礼品卡
* Class CardGiftDao
* @package app\dao\activity\card
*/
class CardGiftDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return CardGift::class;
}
/**
* 获取礼品卡列表
* @param array $where 查询条件
* @param string $field 查询字段
* @param int $page 页码
* @param int $limit 每页数量
* @param string $order 排序
* @return array
*/
public function getList(array $where, string $field = '*', int $page = 0, int $limit = 0, string $order = '')
{
return $this->search($where)
->field($field)
->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})
->when($order, function ($query) use ($order) {
$query->order($order);
})
->select()
->toArray();
}
}

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>
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\dao\activity\card;
use app\dao\BaseDao;
use app\model\activity\card\CardGift;
use app\model\activity\card\CardGiftRecord;
/**
* 礼品卡
* Class CardGiftDao
* @package app\dao\activity\card
*/
class CardGiftRecordDao extends BaseDao
{
/**
* 设置模型
* @return string
*/
protected function setModel(): string
{
return CardGiftRecord::class;
}
/**
* 获取礼品卡记录列表
* @param array $where 查询条件
* @param string $field 查询字段
* @param int $page 页码
* @param int $limit 每页数量
* @param string $order 排序
* @return array
*/
public function getList(array $where, string $field = '*', int $page = 0, int $limit = 0, string $order = '')
{
return $this->search($where)
->field($field)
->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})
->when($order, function ($query) use ($order) {
$query->order($order);
})
->select()
->toArray();
}
}