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
128 lines
4.6 KiB
JavaScript
128 lines
4.6 KiB
JavaScript
"use strict";
|
|
var __defProp = Object.defineProperty;
|
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
var __export = (target, all) => {
|
|
for (var name in all)
|
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
};
|
|
var __copyProps = (to, from, except, desc) => {
|
|
if (from && typeof from === "object" || typeof from === "function") {
|
|
for (let key of __getOwnPropNames(from))
|
|
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
}
|
|
return to;
|
|
};
|
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
var taskRunner_exports = {};
|
|
__export(taskRunner_exports, {
|
|
TaskRunner: () => TaskRunner
|
|
});
|
|
module.exports = __toCommonJS(taskRunner_exports);
|
|
var import_utils = require("playwright-core/lib/utils");
|
|
var import_utils2 = require("playwright-core/lib/utils");
|
|
var import_utilsBundle = require("playwright-core/lib/utilsBundle");
|
|
var import_sigIntWatcher = require("./sigIntWatcher");
|
|
var import_util = require("../util");
|
|
class TaskRunner {
|
|
constructor(reporter, globalTimeoutForError) {
|
|
this._tasks = [];
|
|
this._hasErrors = false;
|
|
this._interrupted = false;
|
|
this._isTearDown = false;
|
|
this._reporter = reporter;
|
|
this._globalTimeoutForError = globalTimeoutForError;
|
|
}
|
|
addTask(task) {
|
|
this._tasks.push(task);
|
|
}
|
|
async run(context, deadline, cancelPromise) {
|
|
const { status, cleanup } = await this.runDeferCleanup(context, deadline, cancelPromise);
|
|
const teardownStatus = await cleanup();
|
|
return status === "passed" ? teardownStatus : status;
|
|
}
|
|
async runDeferCleanup(context, deadline, cancelPromise = new import_utils.ManualPromise()) {
|
|
const sigintWatcher = new import_sigIntWatcher.SigIntWatcher();
|
|
const timeoutWatcher = new TimeoutWatcher(deadline);
|
|
const teardownRunner = new TaskRunner(this._reporter, this._globalTimeoutForError);
|
|
teardownRunner._isTearDown = true;
|
|
let currentTaskName;
|
|
const taskLoop = async () => {
|
|
for (const task of this._tasks) {
|
|
currentTaskName = task.title;
|
|
if (this._interrupted)
|
|
break;
|
|
(0, import_utilsBundle.debug)("pw:test:task")(`"${task.title}" started`);
|
|
const errors = [];
|
|
const softErrors = [];
|
|
try {
|
|
teardownRunner._tasks.unshift({ title: `teardown for ${task.title}`, setup: task.teardown });
|
|
await task.setup?.(context, errors, softErrors);
|
|
} catch (e) {
|
|
(0, import_utilsBundle.debug)("pw:test:task")(`error in "${task.title}": `, e);
|
|
errors.push((0, import_util.serializeError)(e));
|
|
} finally {
|
|
for (const error of [...softErrors, ...errors])
|
|
this._reporter.onError?.(error);
|
|
if (errors.length) {
|
|
if (!this._isTearDown)
|
|
this._interrupted = true;
|
|
this._hasErrors = true;
|
|
}
|
|
}
|
|
(0, import_utilsBundle.debug)("pw:test:task")(`"${task.title}" finished`);
|
|
}
|
|
};
|
|
await Promise.race([
|
|
taskLoop(),
|
|
cancelPromise,
|
|
sigintWatcher.promise(),
|
|
timeoutWatcher.promise
|
|
]);
|
|
sigintWatcher.disarm();
|
|
timeoutWatcher.disarm();
|
|
this._interrupted = true;
|
|
let status = "passed";
|
|
if (sigintWatcher.hadSignal() || cancelPromise?.isDone()) {
|
|
status = "interrupted";
|
|
} else if (timeoutWatcher.timedOut()) {
|
|
this._reporter.onError?.({ message: import_utils2.colors.red(`Timed out waiting ${this._globalTimeoutForError / 1e3}s for the ${currentTaskName} to run`) });
|
|
status = "timedout";
|
|
} else if (this._hasErrors) {
|
|
status = "failed";
|
|
}
|
|
cancelPromise?.resolve();
|
|
const cleanup = () => teardownRunner.runDeferCleanup(context, deadline).then((r) => r.status);
|
|
return { status, cleanup };
|
|
}
|
|
}
|
|
class TimeoutWatcher {
|
|
constructor(deadline) {
|
|
this._timedOut = false;
|
|
this.promise = new import_utils.ManualPromise();
|
|
if (!deadline)
|
|
return;
|
|
if (deadline - (0, import_utils.monotonicTime)() <= 0) {
|
|
this._timedOut = true;
|
|
this.promise.resolve();
|
|
return;
|
|
}
|
|
this._timer = setTimeout(() => {
|
|
this._timedOut = true;
|
|
this.promise.resolve();
|
|
}, deadline - (0, import_utils.monotonicTime)());
|
|
}
|
|
timedOut() {
|
|
return this._timedOut;
|
|
}
|
|
disarm() {
|
|
clearTimeout(this._timer);
|
|
}
|
|
}
|
|
// Annotate the CommonJS export names for ESM import in node:
|
|
0 && (module.exports = {
|
|
TaskRunner
|
|
});
|