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:
37
pro_v3.5.1_副本/vendor/topthink/think-swoole/src/middleware/InteractsWithVarDumper.php
vendored
Executable file
37
pro_v3.5.1_副本/vendor/topthink/think-swoole/src/middleware/InteractsWithVarDumper.php
vendored
Executable file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace think\swoole\middleware;
|
||||
|
||||
use Closure;
|
||||
use Symfony\Component\VarDumper\Cloner\VarCloner;
|
||||
use Symfony\Component\VarDumper\Dumper\HtmlDumper;
|
||||
use Symfony\Component\VarDumper\VarDumper;
|
||||
use think\Request;
|
||||
use think\Response;
|
||||
|
||||
class InteractsWithVarDumper
|
||||
{
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return Response
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if (class_exists(VarDumper::class)) {
|
||||
$cloner = new VarCloner();
|
||||
$dumper = new HtmlDumper();
|
||||
|
||||
$prevHandler = VarDumper::setHandler(function ($var) use ($dumper, $cloner) {
|
||||
$dumper->dump($cloner->cloneVar($var));
|
||||
});
|
||||
|
||||
/** @var Response $response */
|
||||
$response = $next($request);
|
||||
|
||||
VarDumper::setHandler($prevHandler);
|
||||
return $response;
|
||||
}
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
49
pro_v3.5.1_副本/vendor/topthink/think-swoole/src/middleware/TraceRpcClient.php
vendored
Executable file
49
pro_v3.5.1_副本/vendor/topthink/think-swoole/src/middleware/TraceRpcClient.php
vendored
Executable file
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
namespace think\swoole\middleware;
|
||||
|
||||
use think\swoole\exception\RpcResponseException;
|
||||
use think\swoole\rpc\Protocol;
|
||||
use think\tracing\Tracer;
|
||||
use Throwable;
|
||||
use const OpenTracing\Formats\TEXT_MAP;
|
||||
use const OpenTracing\Tags\ERROR;
|
||||
use const OpenTracing\Tags\SPAN_KIND;
|
||||
use const OpenTracing\Tags\SPAN_KIND_RPC_CLIENT;
|
||||
|
||||
class TraceRpcClient
|
||||
{
|
||||
protected $tracer;
|
||||
|
||||
public function __construct(Tracer $tracer)
|
||||
{
|
||||
$this->tracer = $tracer;
|
||||
}
|
||||
|
||||
public function handle(Protocol $protocol, $next)
|
||||
{
|
||||
$scope = $this->tracer->startActiveSpan(
|
||||
'rpc.client:' . $protocol->getInterface() . '@' . $protocol->getMethod(),
|
||||
[
|
||||
'tags' => [
|
||||
SPAN_KIND => SPAN_KIND_RPC_CLIENT,
|
||||
],
|
||||
]
|
||||
);
|
||||
$span = $scope->getSpan();
|
||||
$context = $protocol->getContext();
|
||||
$this->tracer->inject($span->getContext(), TEXT_MAP, $context);
|
||||
$protocol->setContext($context);
|
||||
|
||||
try {
|
||||
return $next($protocol);
|
||||
} catch (Throwable $e) {
|
||||
if (!$e instanceof RpcResponseException) {
|
||||
$span->setTag(ERROR, $e);
|
||||
}
|
||||
throw $e;
|
||||
} finally {
|
||||
$scope->close();
|
||||
}
|
||||
}
|
||||
}
|
||||
46
pro_v3.5.1_副本/vendor/topthink/think-swoole/src/middleware/TraceRpcServer.php
vendored
Executable file
46
pro_v3.5.1_副本/vendor/topthink/think-swoole/src/middleware/TraceRpcServer.php
vendored
Executable file
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace think\swoole\middleware;
|
||||
|
||||
use think\swoole\rpc\Protocol;
|
||||
use think\tracing\Tracer;
|
||||
use Throwable;
|
||||
use const OpenTracing\Formats\TEXT_MAP;
|
||||
use const OpenTracing\Tags\ERROR;
|
||||
use const OpenTracing\Tags\SPAN_KIND;
|
||||
use const OpenTracing\Tags\SPAN_KIND_RPC_SERVER;
|
||||
|
||||
class TraceRpcServer
|
||||
{
|
||||
protected $tracer;
|
||||
|
||||
public function __construct(Tracer $tracer)
|
||||
{
|
||||
$this->tracer = $tracer;
|
||||
}
|
||||
|
||||
public function handle(Protocol $protocol, $next)
|
||||
{
|
||||
$context = $this->tracer->extract(TEXT_MAP, $protocol->getContext());
|
||||
$scope = $this->tracer->startActiveSpan(
|
||||
'rpc.server:' . $protocol->getInterface() . '@' . $protocol->getMethod(),
|
||||
[
|
||||
'child_of' => $context,
|
||||
'tags' => [
|
||||
SPAN_KIND => SPAN_KIND_RPC_SERVER,
|
||||
],
|
||||
]
|
||||
);
|
||||
$span = $scope->getSpan();
|
||||
|
||||
try {
|
||||
return $next($protocol);
|
||||
} catch (Throwable $e) {
|
||||
$span->setTag(ERROR, $e);
|
||||
throw $e;
|
||||
} finally {
|
||||
$scope->close();
|
||||
$this->tracer->flush();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user