feat(billing): add dual formulas, disable 10yuan gift, retry auto-renew
Memind CI / Test, build, and release guards (push) Successful in 3m43s
Memind CI / Test, build, and release guards (push) Successful in 3m43s
Turn off the low-balance 10 CNY signup bonus while keeping the 5 CNY registration credit, split metering into independent formula A/B scopes, and retry expired auto-renew subscriptions after recharge or hourly worker. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -7,13 +7,21 @@ import {
|
||||
toCostEstimateConfig,
|
||||
} from './billing-admin-config.mjs';
|
||||
|
||||
function createMemoryPool(initialRows = []) {
|
||||
function createMemoryPool(initialRows = [], userFormulas = new Map()) {
|
||||
const rows = new Map(
|
||||
initialRows.map((row) => [row.config_scope, { ...row }]),
|
||||
);
|
||||
return {
|
||||
async query(sql, params = []) {
|
||||
if (/CREATE TABLE/i.test(sql)) return [{}, undefined];
|
||||
if (/SELECT billing_formula FROM h5_users/i.test(sql)) {
|
||||
const userId = params[0];
|
||||
return [[{ billing_formula: userFormulas.get(userId) ?? 'A' }], undefined];
|
||||
}
|
||||
if (/SELECT/i.test(sql) && /config_scope IN/i.test(sql)) {
|
||||
const scopes = params.slice(0, 3);
|
||||
return [scopes.map((scope) => rows.get(scope)).filter(Boolean), undefined];
|
||||
}
|
||||
if (/SELECT/i.test(sql)) {
|
||||
const scope = params[0];
|
||||
const row = rows.get(scope);
|
||||
@@ -29,9 +37,15 @@ function createMemoryPool(initialRows = []) {
|
||||
});
|
||||
return [{ affectedRows: 1 }, undefined];
|
||||
}
|
||||
if (/UPDATE h5_users SET billing_formula/i.test(sql)) {
|
||||
const [formula, , ...ids] = params;
|
||||
ids.forEach((id) => userFormulas.set(id, formula));
|
||||
return [{ affectedRows: ids.length }, undefined];
|
||||
}
|
||||
return [{}, undefined];
|
||||
},
|
||||
_rows: rows,
|
||||
_userFormulas: userFormulas,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -89,14 +103,38 @@ test('admin-db config wins over env for effective billing', async () => {
|
||||
const service = createBillingAdminConfigService(pool, { env, cacheTtlMs: 0 });
|
||||
await service.updateAdminConfig(
|
||||
{ marginMultiplier: 2, usdCnyRate: 7.5, useBackendCost: true },
|
||||
{ updatedBy: 'admin-1' },
|
||||
{ updatedBy: 'admin-1', formula: 'A' },
|
||||
);
|
||||
const effective = await service.getEffectiveBillingConfig();
|
||||
const effective = await service.getEffectiveBillingConfig({ userId: 'user-a' });
|
||||
assert.equal(effective.marginMultiplier, 2);
|
||||
assert.equal(effective.usdCnyRate, 7.5);
|
||||
const admin = await service.getAdminConfig();
|
||||
assert.equal(admin.source, 'admin-db');
|
||||
assert.equal(admin.updatedBy, 'admin-1');
|
||||
assert.equal(admin.formulas?.A.marginMultiplier, 2);
|
||||
});
|
||||
|
||||
test('formula A and B can diverge', async () => {
|
||||
const pool = createMemoryPool([], new Map([['user-b', 'B']]));
|
||||
const service = createBillingAdminConfigService(pool, { env: {}, cacheTtlMs: 0 });
|
||||
await service.updateAdminConfig({ marginMultiplier: 1.1 }, { formula: 'A' });
|
||||
await service.updateAdminConfig({ marginMultiplier: 2.2 }, { formula: 'B' });
|
||||
const admin = await service.getAdminConfig();
|
||||
assert.equal(admin.formulas.A.marginMultiplier, 1.1);
|
||||
assert.equal(admin.formulas.B.marginMultiplier, 2.2);
|
||||
const userA = await service.getEffectiveBillingConfig({ userId: 'user-a' });
|
||||
const userB = await service.getEffectiveBillingConfig({ userId: 'user-b' });
|
||||
assert.equal(userA.marginMultiplier, 1.1);
|
||||
assert.equal(userB.marginMultiplier, 2.2);
|
||||
});
|
||||
|
||||
test('assignBillingFormula updates users', async () => {
|
||||
const pool = createMemoryPool();
|
||||
const service = createBillingAdminConfigService(pool, { env: {}, cacheTtlMs: 0 });
|
||||
const result = await service.assignBillingFormula(['u1', 'u2'], 'B');
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.updated, 2);
|
||||
assert.equal(pool._userFormulas.get('u1'), 'B');
|
||||
});
|
||||
|
||||
test('H5_BILLING_CONFIG_SOURCE=env locks admin writes', async () => {
|
||||
@@ -125,7 +163,8 @@ test('env fallback used when no admin row', async () => {
|
||||
cacheTtlMs: 0,
|
||||
});
|
||||
const admin = await service.getAdminConfig();
|
||||
assert.equal(admin.source, 'env');
|
||||
assert.equal(admin.config.marginMultiplier, 1.2);
|
||||
assert.equal(admin.config.useBackendCost, true);
|
||||
assert.equal(admin.formulas.A.marginMultiplier, 1.2);
|
||||
assert.equal(admin.formulas.B.marginMultiplier, 1.2);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user