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:
86
pro_v3.5.1_副本/crmeb/topthink/HasManyThrough.php
Normal file
86
pro_v3.5.1_副本/crmeb/topthink/HasManyThrough.php
Normal file
@@ -0,0 +1,86 @@
|
||||
<?php
|
||||
/**
|
||||
* +----------------------------------------------------------------------
|
||||
* | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
* +----------------------------------------------------------------------
|
||||
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
|
||||
* +----------------------------------------------------------------------
|
||||
* | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
* +----------------------------------------------------------------------
|
||||
* | Author: CRMEB Team <admin@crmeb.com>
|
||||
* +----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
namespace crmeb\topthink;
|
||||
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* 远程一对多关联
|
||||
* Class HasManyThrough
|
||||
* @author 等风来
|
||||
* @email 136327134@qq.com
|
||||
* @date 2023/10/11
|
||||
* @package crmeb\topthink
|
||||
*/
|
||||
class HasManyThrough extends \think\model\relation\HasManyThrough
|
||||
{
|
||||
|
||||
/**
|
||||
* @param array $where
|
||||
* @param string $key
|
||||
* @param array $subRelation
|
||||
* @param Closure|null $closure
|
||||
* @param array $cache
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author 等风来
|
||||
* @email 136327134@qq.com
|
||||
* @date 2023/10/11
|
||||
*/
|
||||
protected function eagerlyWhere(array $where, string $key, array $subRelation = [], Closure $closure = null, array $cache = []): array
|
||||
{
|
||||
// 预载入关联查询 支持嵌套预载入
|
||||
$throughList = $this->through->where($where)->select();
|
||||
$keys = $throughList->column($this->throughPk, $this->throughPk);
|
||||
|
||||
if ($closure) {
|
||||
$this->baseQuery = true;
|
||||
$closure($this->query);
|
||||
}
|
||||
|
||||
$throughKey = $this->throughKey;
|
||||
|
||||
if ($this->baseQuery) {
|
||||
$throughKey = $this->query->getTable() . '.' . $this->throughKey;
|
||||
}
|
||||
|
||||
$withLimit = $this->query->getOptions('limit');
|
||||
if ($withLimit) {
|
||||
$this->query->removeOption('limit');
|
||||
}
|
||||
|
||||
$list = $this->query
|
||||
->where($throughKey, 'in', $keys)
|
||||
->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
|
||||
->select();
|
||||
|
||||
// 组装模型数据
|
||||
$data = [];
|
||||
$keys = $throughList->column($this->foreignKey, $this->throughPk);
|
||||
|
||||
foreach ($list as $set) {
|
||||
$key = $keys[$set->{$this->throughKey}];
|
||||
|
||||
if ($withLimit && isset($data[$key]) && count($data[$key]) >= $withLimit) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$data[$key][] = $set;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
32
pro_v3.5.1_副本/crmeb/topthink/Route.php
Normal file
32
pro_v3.5.1_副本/crmeb/topthink/Route.php
Normal file
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace crmeb\topthink;
|
||||
|
||||
|
||||
use think\route\Url as UrlBuild;
|
||||
|
||||
class Route extends \think\Route
|
||||
{
|
||||
/**
|
||||
* URL生成 支持路由反射
|
||||
* @access public
|
||||
* @param string $url 路由地址
|
||||
* @param array $vars 参数 ['a'=>'val1', 'b'=>'val2']
|
||||
* @return UrlBuild
|
||||
*/
|
||||
public function buildUrl(string $url = '', array $vars = []): UrlBuild
|
||||
{
|
||||
$str = substr($url, 0, 1);
|
||||
if ($str != '/') $url = '/' . $url;
|
||||
return parent::buildUrl($url, $vars);
|
||||
}
|
||||
}
|
||||
54
pro_v3.5.1_副本/crmeb/topthink/TraceDebug.php
Normal file
54
pro_v3.5.1_副本/crmeb/topthink/TraceDebug.php
Normal file
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
/**
|
||||
* +----------------------------------------------------------------------
|
||||
* | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
* +----------------------------------------------------------------------
|
||||
* | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
|
||||
* +----------------------------------------------------------------------
|
||||
* | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
* +----------------------------------------------------------------------
|
||||
* | Author: CRMEB Team <admin@crmeb.com>
|
||||
* +----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
namespace crmeb\topthink;
|
||||
|
||||
|
||||
use think\event\LogWrite;
|
||||
|
||||
class TraceDebug extends \think\trace\TraceDebug
|
||||
{
|
||||
/**
|
||||
* @param \think\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed|void
|
||||
* @author 等风来
|
||||
* @email 136327134@qq.com
|
||||
* @date 2023/10/9
|
||||
*/
|
||||
public function handle($request, \Closure $next)
|
||||
{
|
||||
$debug = $this->app->config->get('trace.enable');
|
||||
|
||||
// 注册日志监听
|
||||
if ($debug) {
|
||||
$this->log = [];
|
||||
$this->app->event->listen(LogWrite::class, function ($event) {
|
||||
if (empty($this->config['channel']) || $this->config['channel'] == $event->channel) {
|
||||
$this->log = array_merge_recursive($this->log, $event->log);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$response = $next($request);
|
||||
|
||||
// Trace调试注入
|
||||
if ($debug) {
|
||||
$data = $response->getContent();
|
||||
$this->traceDebug($response, $data);
|
||||
$response->content($data);
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user