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
190 lines
7.4 KiB
JavaScript
190 lines
7.4 KiB
JavaScript
"use strict";
|
|
var __create = Object.create;
|
|
var __defProp = Object.defineProperty;
|
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
var __getProtoOf = Object.getPrototypeOf;
|
|
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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
// If the importer is in node compatibility mode or this is not an ESM
|
|
// file that has been converted to a CommonJS file using a Babel-
|
|
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
mod
|
|
));
|
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
var rebase_exports = {};
|
|
__export(rebase_exports, {
|
|
addSuggestedRebaseline: () => addSuggestedRebaseline,
|
|
applySuggestedRebaselines: () => applySuggestedRebaselines,
|
|
clearSuggestedRebaselines: () => clearSuggestedRebaselines
|
|
});
|
|
module.exports = __toCommonJS(rebase_exports);
|
|
var import_fs = __toESM(require("fs"));
|
|
var import_path = __toESM(require("path"));
|
|
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_projectUtils = require("./projectUtils");
|
|
var import_babelBundle = require("../transform/babelBundle");
|
|
const t = import_babelBundle.types;
|
|
const suggestedRebaselines = new import_utils.MultiMap();
|
|
function addSuggestedRebaseline(location, suggestedRebaseline) {
|
|
suggestedRebaselines.set(location.file, { location, code: suggestedRebaseline });
|
|
}
|
|
function clearSuggestedRebaselines() {
|
|
suggestedRebaselines.clear();
|
|
}
|
|
async function applySuggestedRebaselines(config, reporter) {
|
|
if (config.config.updateSnapshots === "none")
|
|
return;
|
|
if (!suggestedRebaselines.size)
|
|
return;
|
|
const [project] = (0, import_projectUtils.filterProjects)(config.projects, config.cliProjectFilter);
|
|
if (!project)
|
|
return;
|
|
const patches = [];
|
|
const files = [];
|
|
const gitCache = /* @__PURE__ */ new Map();
|
|
const patchFile = import_path.default.join(project.project.outputDir, "rebaselines.patch");
|
|
for (const fileName of [...suggestedRebaselines.keys()].sort()) {
|
|
const source = await import_fs.default.promises.readFile(fileName, "utf8");
|
|
const lines = source.split("\n");
|
|
const replacements = suggestedRebaselines.get(fileName);
|
|
const fileNode = (0, import_babelBundle.babelParse)(source, fileName, true);
|
|
const ranges = [];
|
|
(0, import_babelBundle.traverse)(fileNode, {
|
|
CallExpression: (path2) => {
|
|
const node = path2.node;
|
|
if (node.arguments.length < 1)
|
|
return;
|
|
if (!t.isMemberExpression(node.callee))
|
|
return;
|
|
const argument = node.arguments[0];
|
|
if (!t.isStringLiteral(argument) && !t.isTemplateLiteral(argument))
|
|
return;
|
|
const prop = node.callee.property;
|
|
if (!prop.loc || !argument.start || !argument.end)
|
|
return;
|
|
for (const replacement of replacements) {
|
|
if (prop.loc.start.line !== replacement.location.line)
|
|
continue;
|
|
if (prop.loc.start.column + 1 !== replacement.location.column)
|
|
continue;
|
|
const indent = lines[prop.loc.start.line - 1].match(/^\s*/)[0];
|
|
const newText = replacement.code.replace(/\{indent\}/g, indent);
|
|
ranges.push({ start: argument.start, end: argument.end, oldText: source.substring(argument.start, argument.end), newText });
|
|
break;
|
|
}
|
|
}
|
|
});
|
|
ranges.sort((a, b) => b.start - a.start);
|
|
let result = source;
|
|
for (const range of ranges)
|
|
result = result.substring(0, range.start) + range.newText + result.substring(range.end);
|
|
const relativeName = import_path.default.relative(process.cwd(), fileName);
|
|
files.push(relativeName);
|
|
if (config.config.updateSourceMethod === "overwrite") {
|
|
await import_fs.default.promises.writeFile(fileName, result);
|
|
} else if (config.config.updateSourceMethod === "3way") {
|
|
await import_fs.default.promises.writeFile(fileName, applyPatchWithConflictMarkers(source, result));
|
|
} else {
|
|
const gitFolder = findGitRoot(import_path.default.dirname(fileName), gitCache);
|
|
const relativeToGit = import_path.default.relative(gitFolder || process.cwd(), fileName);
|
|
patches.push(createPatch(relativeToGit, source, result));
|
|
}
|
|
}
|
|
const fileList = files.map((file) => " " + import_utils2.colors.dim(file)).join("\n");
|
|
reporter.onStdErr(`
|
|
New baselines created for:
|
|
|
|
${fileList}
|
|
`);
|
|
if (config.config.updateSourceMethod === "patch") {
|
|
await import_fs.default.promises.mkdir(import_path.default.dirname(patchFile), { recursive: true });
|
|
await import_fs.default.promises.writeFile(patchFile, patches.join("\n"));
|
|
reporter.onStdErr(`
|
|
` + import_utils2.colors.cyan("git apply " + import_path.default.relative(process.cwd(), patchFile)) + "\n");
|
|
}
|
|
}
|
|
function createPatch(fileName, before, after) {
|
|
const file = fileName.replace(/\\/g, "/");
|
|
const text = import_utilsBundle.diff.createPatch(file, before, after, void 0, void 0, { context: 3 });
|
|
return [
|
|
"diff --git a/" + file + " b/" + file,
|
|
"--- a/" + file,
|
|
"+++ b/" + file,
|
|
...text.split("\n").slice(4)
|
|
].join("\n");
|
|
}
|
|
function findGitRoot(dir, cache) {
|
|
const result = cache.get(dir);
|
|
if (result !== void 0)
|
|
return result;
|
|
const gitPath = import_path.default.join(dir, ".git");
|
|
if (import_fs.default.existsSync(gitPath) && import_fs.default.lstatSync(gitPath).isDirectory()) {
|
|
cache.set(dir, dir);
|
|
return dir;
|
|
}
|
|
const parentDir = import_path.default.dirname(dir);
|
|
if (dir === parentDir) {
|
|
cache.set(dir, null);
|
|
return null;
|
|
}
|
|
const parentResult = findGitRoot(parentDir, cache);
|
|
cache.set(dir, parentResult);
|
|
return parentResult;
|
|
}
|
|
function applyPatchWithConflictMarkers(oldText, newText) {
|
|
const diffResult = import_utilsBundle.diff.diffLines(oldText, newText);
|
|
let result = "";
|
|
let conflict = false;
|
|
diffResult.forEach((part) => {
|
|
if (part.added) {
|
|
if (conflict) {
|
|
result += part.value;
|
|
result += ">>>>>>> SNAPSHOT\n";
|
|
conflict = false;
|
|
} else {
|
|
result += "<<<<<<< HEAD\n";
|
|
result += part.value;
|
|
result += "=======\n";
|
|
conflict = true;
|
|
}
|
|
} else if (part.removed) {
|
|
result += "<<<<<<< HEAD\n";
|
|
result += part.value;
|
|
result += "=======\n";
|
|
conflict = true;
|
|
} else {
|
|
if (conflict) {
|
|
result += ">>>>>>> SNAPSHOT\n";
|
|
conflict = false;
|
|
}
|
|
result += part.value;
|
|
}
|
|
});
|
|
if (conflict)
|
|
result += ">>>>>>> SNAPSHOT\n";
|
|
return result;
|
|
}
|
|
// Annotate the CommonJS export names for ESM import in node:
|
|
0 && (module.exports = {
|
|
addSuggestedRebaseline,
|
|
applySuggestedRebaselines,
|
|
clearSuggestedRebaselines
|
|
});
|