Compare commits
2 Commits
cb1109f387
...
fb1b593b24
| Author | SHA1 | Date | |
|---|---|---|---|
| fb1b593b24 | |||
| dbdfe3dfca |
@@ -121,8 +121,8 @@ WSL 已验证:EMQX `5.8.9`、MQTTX CLI `1.13.0`、EMQX 服务 `active (running
|
|||||||
项目已开发部分模块。具体完成度不得从 README 猜测,必须以现有代码、测试、数据库迁移、Git 历史以及 `docs/current-baseline.md`、`docs/module-status.md`、`docs/feature-status.md` 为准。
|
项目已开发部分模块。具体完成度不得从 README 猜测,必须以现有代码、测试、数据库迁移、Git 历史以及 `docs/current-baseline.md`、`docs/module-status.md`、`docs/feature-status.md` 为准。
|
||||||
|
|
||||||
- 当前执行游标:`M08-A`(PARTIAL)
|
- 当前执行游标:`M08-A`(PARTIAL)
|
||||||
- 最近工程提交:`7446852`,完成顾客端个人中心余额、权益和最近账单汇总。
|
- 最近工程提交:`dbdfe3d`,完成顾客端充值计划查询和充值单创建入口。
|
||||||
- 下一工程目标:继续 M08-A,补顾客端优惠券/套餐明细、充值入口和生产支付调起。
|
- 下一工程目标:继续 M08-A,补顾客端优惠券/套餐明细和生产支付调起。
|
||||||
|
|
||||||
## 版本递进
|
## 版本递进
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
"db:migrate:verify": "npm run build && node dist/db/migrate-cli.js verify",
|
"db:migrate:verify": "npm run build && node dist/db/migrate-cli.js verify",
|
||||||
"db:migrate:down": "npm run build && node dist/db/migrate-cli.js down",
|
"db:migrate:down": "npm run build && node dist/db/migrate-cli.js down",
|
||||||
"test:mysql:migration": "npm run build && node tests/mysql-migration-roundtrip.test.mjs",
|
"test:mysql:migration": "npm run build && node tests/mysql-migration-roundtrip.test.mjs",
|
||||||
"test": "npm run build && node tests/backend-contract.test.mjs && node tests/mqtt-service.test.mjs && node tests/migration-contract.test.mjs && node tests/mysql-pool-contract.test.mjs && node tests/migration-runner.test.mjs && node tests/legacy-money.test.mjs && node tests/legacy-read-repository.test.mjs && node tests/task-repository.test.mjs && node tests/platform-config-repository.test.mjs && node tests/auth.test.mjs && node tests/rbac.test.mjs && node tests/user-management.test.mjs && node tests/store-room.test.mjs && node tests/content-management.test.mjs && node tests/store-discovery.test.mjs && node tests/store-access.test.mjs && node tests/pricing.test.mjs && node tests/order-state.test.mjs && node tests/order-query.test.mjs && node tests/order-management.test.mjs && node tests/order-share.test.mjs && node tests/payment.test.mjs && node tests/wechat-pay.test.mjs && node tests/third-party.test.mjs && node tests/profit-sharing.test.mjs && node tests/device.test.mjs && node tests/iot-protocol.test.mjs && node tests/device-control.test.mjs && node tests/order-device-automation.test.mjs && node tests/hardware-smoke-runner.test.mjs && node tests/wallet-ledger.test.mjs && node tests/recharge-service.test.mjs && node tests/marketing-benefit-service.test.mjs && node tests/member-profile-service.test.mjs && node tests/member-profile-route.test.mjs"
|
"test": "npm run build && node tests/backend-contract.test.mjs && node tests/mqtt-service.test.mjs && node tests/migration-contract.test.mjs && node tests/mysql-pool-contract.test.mjs && node tests/migration-runner.test.mjs && node tests/legacy-money.test.mjs && node tests/legacy-read-repository.test.mjs && node tests/task-repository.test.mjs && node tests/platform-config-repository.test.mjs && node tests/auth.test.mjs && node tests/rbac.test.mjs && node tests/user-management.test.mjs && node tests/store-room.test.mjs && node tests/content-management.test.mjs && node tests/store-discovery.test.mjs && node tests/store-access.test.mjs && node tests/pricing.test.mjs && node tests/order-state.test.mjs && node tests/order-query.test.mjs && node tests/order-management.test.mjs && node tests/order-share.test.mjs && node tests/payment.test.mjs && node tests/wechat-pay.test.mjs && node tests/third-party.test.mjs && node tests/profit-sharing.test.mjs && node tests/device.test.mjs && node tests/iot-protocol.test.mjs && node tests/device-control.test.mjs && node tests/order-device-automation.test.mjs && node tests/hardware-smoke-runner.test.mjs && node tests/wallet-ledger.test.mjs && node tests/recharge-service.test.mjs && node tests/recharge-route.test.mjs && node tests/marketing-benefit-service.test.mjs && node tests/member-profile-service.test.mjs && node tests/member-profile-route.test.mjs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fastify/cors": "^11.2.0",
|
"@fastify/cors": "^11.2.0",
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ import {
|
|||||||
registerDeviceControlRoutes, type DeviceControlRouteOptions
|
registerDeviceControlRoutes, type DeviceControlRouteOptions
|
||||||
} from './routes/device-control.js';
|
} from './routes/device-control.js';
|
||||||
import { registerMemberRoutes, type MemberRouteOptions } from './routes/members.js';
|
import { registerMemberRoutes, type MemberRouteOptions } from './routes/members.js';
|
||||||
|
import { registerRechargeRoutes, type RechargeRouteOptions } from './routes/recharge.js';
|
||||||
|
|
||||||
export interface BuildAppOptions {
|
export interface BuildAppOptions {
|
||||||
config?: AppConfig;
|
config?: AppConfig;
|
||||||
@@ -70,6 +71,7 @@ export interface BuildAppOptions {
|
|||||||
devices?: DeviceRouteOptions;
|
devices?: DeviceRouteOptions;
|
||||||
deviceControl?: DeviceControlRouteOptions;
|
deviceControl?: DeviceControlRouteOptions;
|
||||||
members?: MemberRouteOptions;
|
members?: MemberRouteOptions;
|
||||||
|
recharge?: RechargeRouteOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
declare module 'fastify' {
|
declare module 'fastify' {
|
||||||
@@ -165,6 +167,9 @@ export async function buildApp(options: BuildAppOptions = {}): Promise<FastifyIn
|
|||||||
if (options.members) {
|
if (options.members) {
|
||||||
await registerMemberRoutes(app, options.members);
|
await registerMemberRoutes(app, options.members);
|
||||||
}
|
}
|
||||||
|
if (options.recharge) {
|
||||||
|
await registerRechargeRoutes(app, options.recharge);
|
||||||
|
}
|
||||||
|
|
||||||
return app;
|
return app;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,115 @@
|
|||||||
|
import type { FastifyInstance, FastifyReply } from 'fastify';
|
||||||
|
import { z } from 'zod';
|
||||||
|
import type { AuthRepository } from '../auth/auth-repository.js';
|
||||||
|
import { authenticateAccessToken } from '../auth/authenticate.js';
|
||||||
|
import type { AccessProfile } from '../auth/rbac-repository.js';
|
||||||
|
import { RechargeError, type RechargeService } from '../wallets/recharge-service.js';
|
||||||
|
|
||||||
|
const listSchema = z.object({
|
||||||
|
storeId: z.string().regex(/^[1-9]\d{0,19}$/).optional()
|
||||||
|
});
|
||||||
|
const createSchema = z.object({
|
||||||
|
planId: z.string().regex(/^[1-9]\d{0,19}$/),
|
||||||
|
storeId: z.string().regex(/^[1-9]\d{0,19}$/).nullable().optional(),
|
||||||
|
clientRequestId: z.string().min(8).max(128)
|
||||||
|
}).strict();
|
||||||
|
|
||||||
|
export interface RechargeRouteOptions {
|
||||||
|
service: Pick<RechargeService, 'listAvailablePlans' | 'createRechargeOrder'>;
|
||||||
|
authRepository: Pick<AuthRepository, 'validateSession'>;
|
||||||
|
accessControl: { getAccessProfile(tenantId: string, userId: string): Promise<AccessProfile> };
|
||||||
|
jwtSecret: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function registerRechargeRoutes(
|
||||||
|
app: FastifyInstance,
|
||||||
|
options: RechargeRouteOptions
|
||||||
|
) {
|
||||||
|
app.get('/app-api/recharge/plans', async (request, reply) => {
|
||||||
|
const auth = await authenticate(request.headers.authorization, options);
|
||||||
|
const query = listSchema.safeParse(request.query);
|
||||||
|
if (!auth) return unauthorized(reply, request.traceId);
|
||||||
|
if (!query.success) return invalid(reply, request.traceId);
|
||||||
|
return handle(reply, request.traceId, async () => ({
|
||||||
|
code: 0,
|
||||||
|
data: await options.service.listAvailablePlans({
|
||||||
|
tenantId: auth.tenantId,
|
||||||
|
storeId: query.data.storeId ?? null
|
||||||
|
}),
|
||||||
|
traceId: request.traceId
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
|
app.post('/app-api/recharge/orders', async (request, reply) => {
|
||||||
|
const auth = await authenticate(request.headers.authorization, options);
|
||||||
|
const body = createSchema.safeParse(request.body);
|
||||||
|
if (!auth) return unauthorized(reply, request.traceId);
|
||||||
|
if (!body.success) return invalid(reply, request.traceId);
|
||||||
|
return handle(reply, request.traceId, async () => reply.status(201).send({
|
||||||
|
code: 0,
|
||||||
|
data: await options.service.createRechargeOrder({
|
||||||
|
tenantId: auth.tenantId,
|
||||||
|
userId: auth.userId,
|
||||||
|
planId: body.data.planId,
|
||||||
|
storeId: body.data.storeId ?? null,
|
||||||
|
clientRequestId: body.data.clientRequestId,
|
||||||
|
traceId: request.traceId
|
||||||
|
}),
|
||||||
|
traceId: request.traceId
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function authenticate(
|
||||||
|
authorization: string | undefined,
|
||||||
|
options: RechargeRouteOptions
|
||||||
|
) {
|
||||||
|
const result = await authenticateAccessToken(
|
||||||
|
authorization,
|
||||||
|
options.authRepository,
|
||||||
|
options.jwtSecret
|
||||||
|
);
|
||||||
|
if (!result) return null;
|
||||||
|
const access = await options.accessControl.getAccessProfile(
|
||||||
|
result.session.tenantId,
|
||||||
|
result.session.user.id
|
||||||
|
);
|
||||||
|
if (!access.capabilities.includes('profile.read')) return null;
|
||||||
|
return {
|
||||||
|
tenantId: result.session.tenantId,
|
||||||
|
userId: result.session.user.id
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handle(reply: FastifyReply, traceId: string, work: () => Promise<unknown>) {
|
||||||
|
try {
|
||||||
|
return await work();
|
||||||
|
} catch (error) {
|
||||||
|
if (!(error instanceof RechargeError)) throw error;
|
||||||
|
const status = error.code === 'RECHARGE_PLAN_NOT_FOUND'
|
||||||
|
|| error.code === 'RECHARGE_ORDER_NOT_FOUND'
|
||||||
|
? 404
|
||||||
|
: error.code === 'RECHARGE_LIMIT_REACHED' ? 409 : 400;
|
||||||
|
return reply.status(status).send({
|
||||||
|
code: error.code,
|
||||||
|
message: 'The recharge request is not available.',
|
||||||
|
traceId
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function unauthorized(reply: FastifyReply, traceId: string) {
|
||||||
|
return reply.status(401).send({
|
||||||
|
code: 'AUTH_SESSION_INVALID',
|
||||||
|
message: 'Authentication required.',
|
||||||
|
traceId
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function invalid(reply: FastifyReply, traceId: string) {
|
||||||
|
return reply.status(400).send({
|
||||||
|
code: 'INVALID_RECHARGE_REQUEST',
|
||||||
|
message: 'The recharge request is invalid.',
|
||||||
|
traceId
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -34,6 +34,8 @@ import { IotMessageService } from './devices/iot-message-service.js';
|
|||||||
import { DeviceCommandService } from './devices/device-command-service.js';
|
import { DeviceCommandService } from './devices/device-command-service.js';
|
||||||
import { DeviceControlService } from './devices/device-control-service.js';
|
import { DeviceControlService } from './devices/device-control-service.js';
|
||||||
import { MemberProfileService } from './wallets/member-profile-service.js';
|
import { MemberProfileService } from './wallets/member-profile-service.js';
|
||||||
|
import { RechargeService } from './wallets/recharge-service.js';
|
||||||
|
import { WalletLedgerService } from './wallets/wallet-ledger-service.js';
|
||||||
|
|
||||||
const config = loadConfig();
|
const config = loadConfig();
|
||||||
const pool = createMySqlPool(config);
|
const pool = createMySqlPool(config);
|
||||||
@@ -41,6 +43,7 @@ const authRepository = new AuthRepository(pool);
|
|||||||
const accessControl = new RbacRepository(pool);
|
const accessControl = new RbacRepository(pool);
|
||||||
const orderManagementRepository = new OrderManagementRepository(pool);
|
const orderManagementRepository = new OrderManagementRepository(pool);
|
||||||
const paymentRepository = new PaymentRepository(pool);
|
const paymentRepository = new PaymentRepository(pool);
|
||||||
|
const walletLedgerService = new WalletLedgerService(pool);
|
||||||
const wechatCredentials = parseWechatPayCredentials(config.payment.wechatCredentialsJson);
|
const wechatCredentials = parseWechatPayCredentials(config.payment.wechatCredentialsJson);
|
||||||
const wechatPayClient = new WechatPayClient(new FetchWechatPayTransport());
|
const wechatPayClient = new WechatPayClient(new FetchWechatPayTransport());
|
||||||
const thirdPartyCredentials = parseThirdPartyCredentials(config.thirdParty.credentialsJson);
|
const thirdPartyCredentials = parseThirdPartyCredentials(config.thirdParty.credentialsJson);
|
||||||
@@ -169,6 +172,12 @@ const app = await buildApp({
|
|||||||
authRepository,
|
authRepository,
|
||||||
accessControl,
|
accessControl,
|
||||||
jwtSecret: config.auth.jwtSecret
|
jwtSecret: config.auth.jwtSecret
|
||||||
|
},
|
||||||
|
recharge: {
|
||||||
|
service: new RechargeService(pool, walletLedgerService),
|
||||||
|
authRepository,
|
||||||
|
accessControl,
|
||||||
|
jwtSecret: config.auth.jwtSecret
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
app.addHook('onClose', async () => {
|
app.addHook('onClose', async () => {
|
||||||
|
|||||||
@@ -40,6 +40,43 @@ export class RechargeService {
|
|||||||
private readonly wallet: Pick<WalletLedgerService, 'credit'>
|
private readonly wallet: Pick<WalletLedgerService, 'credit'>
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
async listAvailablePlans(input: {
|
||||||
|
tenantId: string;
|
||||||
|
storeId?: string | null;
|
||||||
|
}) {
|
||||||
|
const params: Array<string | null> = [input.tenantId];
|
||||||
|
const storeFilter = input.storeId
|
||||||
|
? 'AND (store_id IS NULL OR store_id = ?)'
|
||||||
|
: '';
|
||||||
|
if (input.storeId) params.push(input.storeId);
|
||||||
|
const [rows] = await this.pool.execute<PlanRow[]>(
|
||||||
|
`SELECT id, tenant_id AS tenantId, store_id AS storeId, name,
|
||||||
|
pay_amount_cents AS payAmountCents,
|
||||||
|
gift_amount_cents AS giftAmountCents,
|
||||||
|
scope_type AS scopeType, starts_at AS startsAt, ends_at AS endsAt,
|
||||||
|
purchase_limit_per_user AS purchaseLimitPerUser, status
|
||||||
|
FROM qipai_recharge_plans
|
||||||
|
WHERE tenant_id = ? AND deleted_at IS NULL AND status = 'ACTIVE'
|
||||||
|
AND (starts_at IS NULL OR starts_at <= UTC_TIMESTAMP(3))
|
||||||
|
AND (ends_at IS NULL OR ends_at > UTC_TIMESTAMP(3))
|
||||||
|
${storeFilter}
|
||||||
|
ORDER BY pay_amount_cents ASC, id ASC`,
|
||||||
|
params
|
||||||
|
);
|
||||||
|
return rows.map((row) => ({
|
||||||
|
planId: String(row.id),
|
||||||
|
storeId: row.storeId === null ? null : String(row.storeId),
|
||||||
|
name: row.name,
|
||||||
|
payAmountCents: Number(row.payAmountCents),
|
||||||
|
giftAmountCents: Number(row.giftAmountCents),
|
||||||
|
scopeType: row.scopeType,
|
||||||
|
purchaseLimitPerUser: row.purchaseLimitPerUser === null
|
||||||
|
? null : Number(row.purchaseLimitPerUser),
|
||||||
|
startsAt: row.startsAt,
|
||||||
|
endsAt: row.endsAt
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
async createRechargeOrder(input: {
|
async createRechargeOrder(input: {
|
||||||
tenantId: string;
|
tenantId: string;
|
||||||
userId: string;
|
userId: string;
|
||||||
|
|||||||
@@ -0,0 +1,103 @@
|
|||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { buildApp } from '../dist/app.js';
|
||||||
|
import { signAccessToken } from '../dist/auth/jwt.js';
|
||||||
|
|
||||||
|
const secret = 'test-only-recharge-route-secret-32';
|
||||||
|
const token = signAccessToken({
|
||||||
|
sub: '21', sid: '5c4d3af8-c63c-4edb-bf95-b84127bb3f6e',
|
||||||
|
tid: '7', aid: '9', rv: 1
|
||||||
|
}, secret, 900);
|
||||||
|
|
||||||
|
let createdInput;
|
||||||
|
let listInput;
|
||||||
|
const app = await buildApp({
|
||||||
|
recharge: {
|
||||||
|
jwtSecret: secret,
|
||||||
|
authRepository: {
|
||||||
|
async validateSession() {
|
||||||
|
return {
|
||||||
|
id: '5c4d3af8-c63c-4edb-bf95-b84127bb3f6e',
|
||||||
|
tenantId: '7',
|
||||||
|
platformAppId: '9',
|
||||||
|
expiresAt: new Date(Date.now() + 60000),
|
||||||
|
user: {
|
||||||
|
id: '21',
|
||||||
|
tenantId: '7',
|
||||||
|
userType: 'CUSTOMER',
|
||||||
|
status: 'ACTIVE',
|
||||||
|
roleVersion: 1,
|
||||||
|
nickname: '',
|
||||||
|
avatarUrl: '',
|
||||||
|
phone: ''
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
accessControl: {
|
||||||
|
async getAccessProfile() {
|
||||||
|
return { roles: ['CUSTOMER'], capabilities: ['profile.read'], storeIds: [] };
|
||||||
|
}
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
async listAvailablePlans(input) {
|
||||||
|
listInput = input;
|
||||||
|
return [{
|
||||||
|
planId: '31',
|
||||||
|
storeId: '11',
|
||||||
|
name: 'charge 100 gift 20',
|
||||||
|
payAmountCents: 10000,
|
||||||
|
giftAmountCents: 2000,
|
||||||
|
scopeType: 'STORE'
|
||||||
|
}];
|
||||||
|
},
|
||||||
|
async createRechargeOrder(input) {
|
||||||
|
createdInput = input;
|
||||||
|
return {
|
||||||
|
rechargeOrderId: '901',
|
||||||
|
planId: input.planId,
|
||||||
|
rechargeNo: 'RCHTEST',
|
||||||
|
status: 'PENDING_PAYMENT',
|
||||||
|
payAmountCents: 10000,
|
||||||
|
giftAmountCents: 2000,
|
||||||
|
idempotent: false
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const plans = await app.inject({
|
||||||
|
method: 'GET',
|
||||||
|
url: '/app-api/recharge/plans?storeId=11',
|
||||||
|
headers: { authorization: `Bearer ${token}` }
|
||||||
|
});
|
||||||
|
assert.equal(plans.statusCode, 200);
|
||||||
|
assert.deepEqual(listInput, { tenantId: '7', storeId: '11' });
|
||||||
|
assert.equal(plans.json().data[0].payAmountCents, 10000);
|
||||||
|
|
||||||
|
const created = await app.inject({
|
||||||
|
method: 'POST',
|
||||||
|
url: '/app-api/recharge/orders',
|
||||||
|
headers: { authorization: `Bearer ${token}`, 'x-trace-id': 'm08a-recharge-order' },
|
||||||
|
payload: {
|
||||||
|
planId: '31',
|
||||||
|
storeId: '11',
|
||||||
|
clientRequestId: 'miniapp-recharge-001'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
assert.equal(created.statusCode, 201);
|
||||||
|
assert.equal(createdInput.tenantId, '7');
|
||||||
|
assert.equal(createdInput.userId, '21');
|
||||||
|
assert.equal(createdInput.planId, '31');
|
||||||
|
assert.equal(createdInput.traceId, 'm08a-recharge-order');
|
||||||
|
|
||||||
|
const invalid = await app.inject({
|
||||||
|
method: 'POST',
|
||||||
|
url: '/app-api/recharge/orders',
|
||||||
|
headers: { authorization: `Bearer ${token}` },
|
||||||
|
payload: { planId: 'bad' }
|
||||||
|
});
|
||||||
|
assert.equal(invalid.statusCode, 400);
|
||||||
|
|
||||||
|
await app.close();
|
||||||
|
console.log('PASS: M08-A recharge routes expose available plans and customer order creation.');
|
||||||
@@ -104,3 +104,28 @@ M08-A 仍为 `PARTIAL`。本次完成顾客端第一段工程闭环,但订单
|
|||||||
|
|
||||||
- 工程提交:`7446852`
|
- 工程提交:`7446852`
|
||||||
- 远端校验:待本轮 push 后执行 `HEAD == origin/main`。
|
- 远端校验:待本轮 push 后执行 `HEAD == origin/main`。
|
||||||
|
|
||||||
|
## 2026-06-25 续接:顾客端充值入口
|
||||||
|
|
||||||
|
- `RechargeService` 新增可用充值计划查询,按租户、有效期、启用状态和可选门店过滤。
|
||||||
|
- 后端新增 `GET /app-api/recharge/plans` 与 `POST /app-api/recharge/orders`,顾客登录后可查看充值计划并创建幂等充值单。
|
||||||
|
- 生产 `server.ts` 接入 `RechargeService` 与 `WalletLedgerService`,充值路由随真实后端启动注册。
|
||||||
|
- 新增 `backend/tests/recharge-route.test.mjs`,覆盖充值计划查询、顾客充值单创建和非法请求拒绝。
|
||||||
|
- 小程序新增 `pages/recharge/index`,个人中心新增充值入口,可展示实付/赠送/到账金额并创建待支付充值单。
|
||||||
|
- `scripts/check-miniapp-m08-a.mjs` 扩展检查充值页面注册、`/recharge/plans` 与 `/recharge/orders` 调用。
|
||||||
|
|
||||||
|
验收:
|
||||||
|
|
||||||
|
- `npm run build`(`backend/`):PASS。
|
||||||
|
- `node scripts/check-miniapp-m08-a.mjs`:PASS。
|
||||||
|
- `node tests/recharge-route.test.mjs`:PASS。
|
||||||
|
- `npm test`(`backend/`):PASS。
|
||||||
|
|
||||||
|
状态:
|
||||||
|
|
||||||
|
- M08-A 仍为 `PARTIAL`;优惠券/套餐明细页、充值微信支付调起、订单生产微信支付调起、真机合法域名和实物开门验证待继续。
|
||||||
|
|
||||||
|
提交:
|
||||||
|
|
||||||
|
- 工程提交:`dbdfe3d`
|
||||||
|
- 远端校验:待本轮 push 后执行 `HEAD == origin/main`。
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
| OPS-003 | 整仓发布清单 | M00-E/M10 | PARTIAL | `59d92c0` | `deploy-business.sh --dry-run` 可在 Windows/WSL 验证当前 HEAD 的 release manifest 结构;`check-release-manifest.ps1` 已接入 `test-all.ps1`;正式构建待项目生成。 | 后端/后台尚未生成,生产菜单未执行。 | M01/M09 后接入真实构建结果,并在生产菜单 2 生成真实 release manifest。 |
|
| OPS-003 | 整仓发布清单 | M00-E/M10 | PARTIAL | `59d92c0` | `deploy-business.sh --dry-run` 可在 Windows/WSL 验证当前 HEAD 的 release manifest 结构;`check-release-manifest.ps1` 已接入 `test-all.ps1`;正式构建待项目生成。 | 后端/后台尚未生成,生产菜单未执行。 | M01/M09 后接入真实构建结果,并在生产菜单 2 生成真实 release manifest。 |
|
||||||
| OPS-004 | 菜单式更新与环境监测 | M00-E/M10 | PARTIAL | `292ab7f` | `setup.sh` 已接入初始化、更新、MQTT、HTTPS、状态、备份、恢复、回滚和诊断菜单;`--backup-status` 已在 WSL 验证,可检查备份工具、目录和模板。 | 未在生产 Ubuntu 执行;真实备份配置未启用。 | 生产执行后补部署记录、真实备份和恢复演练记录。 |
|
| OPS-004 | 菜单式更新与环境监测 | M00-E/M10 | PARTIAL | `292ab7f` | `setup.sh` 已接入初始化、更新、MQTT、HTTPS、状态、备份、恢复、回滚和诊断菜单;`--backup-status` 已在 WSL 验证,可检查备份工具、目录和模板。 | 未在生产 Ubuntu 执行;真实备份配置未启用。 | 生产执行后补部署记录、真实备份和恢复演练记录。 |
|
||||||
| IOT-001 | MQTT Broker 生产部署 | M00/M06 | PARTIAL | `d01f771` | 菜单 3 已支持 Ubuntu 24.04 amd64 原生安装/更新与复检;正式 Topic ACL 已固定;后端实现 MQTT.js 3.1、QoS 1、持久会话、自动重连、订阅恢复、健康检查、消息上限和真实硬件烟测运行器;Windows 全量测试通过,WSL EMQX 5.8.9 服务级检查通过。 | 缺生产 EMQX 安装、正式账号、ACL/端口/备份验收;WSL 本地账号未配置,真实硬件烟测按预期 SKIP。 | 由管理员在生产菜单 3 执行并登记结果;提供生产账号、DeviceID 和实物后执行 `node dist/devices/hardware-smoke-runner.js`。 |
|
| IOT-001 | MQTT Broker 生产部署 | M00/M06 | PARTIAL | `d01f771` | 菜单 3 已支持 Ubuntu 24.04 amd64 原生安装/更新与复检;正式 Topic ACL 已固定;后端实现 MQTT.js 3.1、QoS 1、持久会话、自动重连、订阅恢复、健康检查、消息上限和真实硬件烟测运行器;Windows 全量测试通过,WSL EMQX 5.8.9 服务级检查通过。 | 缺生产 EMQX 安装、正式账号、ACL/端口/备份验收;WSL 本地账号未配置,真实硬件烟测按预期 SKIP。 | 由管理员在生产菜单 3 执行并登记结果;提供生产账号、DeviceID 和实物后执行 `node dist/devices/hardware-smoke-runner.js`。 |
|
||||||
| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `7446852` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、受控 Wi-Fi、订单列表、订单详情、状态历史、取消入口、订单权限开门入口、续费、同门店换房、分享口令生成和个人中心余额/权益/账单汇总;`scripts/check-miniapp-m08-a.mjs` 与后端全量测试通过。 | 优惠券/套餐明细、充值入口、多角色菜单和真机联调尚未完成。 | 继续 M08-A,补顾客端优惠券/套餐明细、充值入口和生产支付调起。 |
|
| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `dbdfe3d` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、受控 Wi-Fi、订单列表、订单详情、状态历史、取消入口、订单权限开门入口、续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总和充值计划/充值单入口;`scripts/check-miniapp-m08-a.mjs` 与后端全量测试通过。 | 优惠券/套餐明细、多角色菜单、生产支付调起和真机联调尚未完成。 | 继续 M08-A,补顾客端优惠券/套餐明细和生产支付调起。 |
|
||||||
| CFG-001 | 小程序品牌自定义 | M02-A/M03/M08 | PARTIAL | `8b8fb28` | 已建立 AppID/tenant 品牌配置表和 `/app-api/bootstrap`;同一 AppID 两租户隔离读取在 MySQL 8.4.9 实测通过。 | Logo/分享图片上传与小程序实际展示属于后续阶段。 | M03/M08 接入配置管理和小程序展示。 |
|
| CFG-001 | 小程序品牌自定义 | M02-A/M03/M08 | PARTIAL | `8b8fb28` | 已建立 AppID/tenant 品牌配置表和 `/app-api/bootstrap`;同一 AppID 两租户隔离读取在 MySQL 8.4.9 实测通过。 | Logo/分享图片上传与小程序实际展示属于后续阶段。 | M03/M08 接入配置管理和小程序展示。 |
|
||||||
| BKG-010 | 后台多小程序管理 | M02-A/M08/M10 | PARTIAL | `8b8fb28` | 已建立逻辑应用、租户绑定和租户配置模型;多租户 AppID 未指定租户会被拒绝。 | 尚无后台管理页面,多 AppID 真机配置未验证。 | M02-B/C 完成身份权限,M08 增加管理页面。 |
|
| BKG-010 | 后台多小程序管理 | M02-A/M08/M10 | PARTIAL | `8b8fb28` | 已建立逻辑应用、租户绑定和租户配置模型;多租户 AppID 未指定租户会被拒绝。 | 尚无后台管理页面,多 AppID 真机配置未验证。 | M02-B/C 完成身份权限,M08 增加管理页面。 |
|
||||||
| AUTH-001 | 多端统一小程序身份 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已实现微信 code 交换适配器、租户/AppID 隔离身份、JWT、服务端会话、当前用户和注销;禁用、角色/门店范围变化及管理员重置均使旧会话立即失效。 | 缺真实 AppSecret 真机联调和小程序动态角色界面。 | M08 完成小程序角色界面与真机登录。 |
|
| AUTH-001 | 多端统一小程序身份 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已实现微信 code 交换适配器、租户/AppID 隔离身份、JWT、服务端会话、当前用户和注销;禁用、角色/门店范围变化及管理员重置均使旧会话立即失效。 | 缺真实 AppSecret 真机联调和小程序动态角色界面。 | M08 完成小程序角色界面与真机登录。 |
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
| QR-001 | 门店/房间场景码与 NFC | M03-D/M08 | PARTIAL | `d563078` | 已实现场景码生成、重建失效、撤销、扫码统计和二维码/NFC 统一页面解析;返回权限固定为空,旧码失效已在 MySQL 8.4.9 实测。 | 真实微信小程序码图片生成依赖可用 AppSecret 与真机环境。 | M08 接入微信小程序码接口并完成真机扫描验收。 |
|
| QR-001 | 门店/房间场景码与 NFC | M03-D/M08 | PARTIAL | `d563078` | 已实现场景码生成、重建失效、撤销、扫码统计和二维码/NFC 统一页面解析;返回权限固定为空,旧码失效已在 MySQL 8.4.9 实测。 | 真实微信小程序码图片生成依赖可用 AppSecret 与真机环境。 | M08 接入微信小程序码接口并完成真机扫描验收。 |
|
||||||
| WIFI-001 | 受控 Wi-Fi 凭据 | M03-D/M04/M08 | PARTIAL | `4ac2c96` | 正式订单与分享令牌均执行最小权限;M08-A 门店详情新增登录后受控 Wi-Fi 请求入口,不在未鉴权页面暴露密码。 | 真实到店权限、真机 Wi-Fi 连接和设备权限仍需现场联调。 | M08-A 补有效订单下的 Wi-Fi 真机连接验证。 |
|
| WIFI-001 | 受控 Wi-Fi 凭据 | M03-D/M04/M08 | PARTIAL | `4ac2c96` | 正式订单与分享令牌均执行最小权限;M08-A 门店详情新增登录后受控 Wi-Fi 请求入口,不在未鉴权页面暴露密码。 | 真实到店权限、真机 Wi-Fi 连接和设备权限仍需现场联调。 | M08-A 补有效订单下的 Wi-Fi 真机连接验证。 |
|
||||||
| ORD-001 | 预约下单与多方式支付 | M04/M05/M08 | PARTIAL | `874b9b8` | 已完成订单全生命周期、微信支付 v3 工程闭环和团购支付;M08-A 小程序已接入报价、预占、测试支付、订单列表、订单详情、状态历史、取消测算、取消订单、续费和同门店换房入口,后端全量测试通过。 | 缺真实微信和团购平台授权联调;生产微信支付调起和余额/套餐支付入口待补。 | M08-A 继续补生产支付调起和权益支付。 |
|
| ORD-001 | 预约下单与多方式支付 | M04/M05/M08 | PARTIAL | `874b9b8` | 已完成订单全生命周期、微信支付 v3 工程闭环和团购支付;M08-A 小程序已接入报价、预占、测试支付、订单列表、订单详情、状态历史、取消测算、取消订单、续费和同门店换房入口,后端全量测试通过。 | 缺真实微信和团购平台授权联调;生产微信支付调起和余额/套餐支付入口待补。 | M08-A 继续补生产支付调起和权益支付。 |
|
||||||
| WAL-001 | 充值优惠 | M07-B | PARTIAL | `d9743d3` | 已建立充值规则和充值订单表,支持有效期、适用门店、限购、启停、clientRequestId 幂等;支付成功后调用钱包入账,重复支付回调不重复充值;Windows 全量后端回归通过。 | 真实微信充值支付回调仍需 M05 生产凭据和 M08 前端入口联调。 | M08 增加充值页面和账单查询。 |
|
| WAL-001 | 充值优惠 | M07-B/M08 | PARTIAL | `dbdfe3d` | 已建立充值规则和充值订单表,支持有效期、适用门店、限购、启停、clientRequestId 幂等;M08-A 新增顾客端充值计划查询、充值单创建 API 和小程序充值页;支付成功后调用钱包入账,重复支付回调不重复充值;Windows 全量后端回归通过。 | 真实微信充值支付调起和回调仍需 M05 生产凭据与后续联调。 | M08-A 继续接入充值微信支付调起。 |
|
||||||
| WAL-002 | 门店独立会员余额 | M07-A | DONE | `63711ad` | 已建立租户/门店余额范围策略、现金/赠送双余额账户和不可变流水;充值、赠送、消费、退款、人工调整均预留 entry type;消费按赠送后现金扣款,业务号幂等,余额不足拒绝;Windows 全量后端回归通过。 | - | M07-D 聚合会员余额和权益状态。 |
|
| WAL-002 | 门店独立会员余额 | M07-A | DONE | `63711ad` | 已建立租户/门店余额范围策略、现金/赠送双余额账户和不可变流水;充值、赠送、消费、退款、人工调整均预留 entry type;消费按赠送后现金扣款,业务号幂等,余额不足拒绝;Windows 全量后端回归通过。 | - | M07-D 聚合会员余额和权益状态。 |
|
||||||
| WAL-003 | 余额账单 | M07-A/M08 | PARTIAL | `7446852` | 账单底表已包含业务类型、业务号、现金/赠送变动、变动后余额、操作人、trace 和 metadata;M07-B 充值成功后写入真实充值流水;M08-A 个人中心已展示最近钱包账单。 | 完整分页账单页面待继续;优惠券/套餐不直接写钱包流水。 | M08-A 增加分页账单或权益明细入口。 |
|
| WAL-003 | 余额账单 | M07-A/M08 | PARTIAL | `7446852` | 账单底表已包含业务类型、业务号、现金/赠送变动、变动后余额、操作人、trace 和 metadata;M07-B 充值成功后写入真实充值流水;M08-A 个人中心已展示最近钱包账单。 | 完整分页账单页面待继续;优惠券/套餐不直接写钱包流水。 | M08-A 增加分页账单或权益明细入口。 |
|
||||||
| WAL-004 | 优惠券和套餐权益 | M07-C/M08 | PARTIAL | `7446852` | 已建立优惠券模板、持券、套餐计划、持有和权益核销流水;支持满减券、时长券、适用门店/房型/房间/星期/节假日、套餐剩余时长/金额,以及订单冻结、确认核销、退回和重复请求幂等;M08-A 个人中心已展示可用/冻结券和套餐汇总。 | 前端优惠券/套餐明细、发放/购买/核销入口和订单 API 深度集成待 M08/M04 后续接入。 | M08-A 继续接入权益明细与下单使用入口。 |
|
| WAL-004 | 优惠券和套餐权益 | M07-C/M08 | PARTIAL | `7446852` | 已建立优惠券模板、持券、套餐计划、持有和权益核销流水;支持满减券、时长券、适用门店/房型/房间/星期/节假日、套餐剩余时长/金额,以及订单冻结、确认核销、退回和重复请求幂等;M08-A 个人中心已展示可用/冻结券和套餐汇总。 | 前端优惠券/套餐明细、发放/购买/核销入口和订单 API 深度集成待 M08/M04 后续接入。 | M08-A 继续接入权益明细与下单使用入口。 |
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ execution_cursor:
|
|||||||
stage_status: PARTIAL
|
stage_status: PARTIAL
|
||||||
last_completed_stage: M07-D
|
last_completed_stage: M07-D
|
||||||
next_stage: M08-A
|
next_stage: M08-A
|
||||||
last_engineering_commit: `7446852`
|
last_engineering_commit: `dbdfe3d`
|
||||||
last_push_verified: true
|
last_push_verified: true
|
||||||
base_branch: main
|
base_branch: main
|
||||||
blocked_reason: "M06-G 真实硬件联调缺生产 MQTT 账号/ACL、DeviceID、控制箱、门锁、插座和现场配线;已完成烟测运行器并按 BLOCKED_EXTERNAL 旁路。"
|
blocked_reason: "M06-G 真实硬件联调缺生产 MQTT 账号/ACL、DeviceID、控制箱、门锁、插座和现场配线;已完成烟测运行器并按 BLOCKED_EXTERNAL 旁路。"
|
||||||
@@ -24,7 +24,7 @@ execution_cursor:
|
|||||||
| M05 会员、余额、套餐、优惠券 | PARTIAL | `1680d73` | docs/devlogs/2026-06-22-M05-D-分账与收款配置.md | M05-A/B/C/D 工程闭环已完成:统一支付、微信支付退款、团购直订、门店收款账户、分账接收方、比例策略、授权门禁、幂等分账和对账查询均通过 Windows 与 WSL MySQL 回归;真实微信/团购/分账权限未提供,模块保持 PARTIAL/BLOCKED_EXTERNAL。 |
|
| M05 会员、余额、套餐、优惠券 | PARTIAL | `1680d73` | docs/devlogs/2026-06-22-M05-D-分账与收款配置.md | M05-A/B/C/D 工程闭环已完成:统一支付、微信支付退款、团购直订、门店收款账户、分账接收方、比例策略、授权门禁、幂等分账和对账查询均通过 Windows 与 WSL MySQL 回归;真实微信/团购/分账权限未提供,模块保持 PARTIAL/BLOCKED_EXTERNAL。 |
|
||||||
| M06 设备、MQTT 与真实硬件联动 | PARTIAL | `d01f771` | docs/devlogs/2026-06-24-M06-G-真实硬件联调.md | M06-A 至 F 已完成 MQTT、拓扑、协议幂等、控制箱、Sub-1G 门锁、智慧插座和订单自动联动任务;M06-G 已补真实硬件烟测运行器,缺生产 MQTT 账号/ACL、DeviceID 和实物配线,保持 BLOCKED_EXTERNAL。 |
|
| M06 设备、MQTT 与真实硬件联动 | PARTIAL | `d01f771` | docs/devlogs/2026-06-24-M06-G-真实硬件联调.md | M06-A 至 F 已完成 MQTT、拓扑、协议幂等、控制箱、Sub-1G 门锁、智慧插座和订单自动联动任务;M06-G 已补真实硬件烟测运行器,缺生产 MQTT 账号/ACL、DeviceID 和实物配线,保持 BLOCKED_EXTERNAL。 |
|
||||||
| M07 会员、余额、充值、优惠券和套餐营销 | DONE | `ed0d455` | docs/devlogs/2026-06-24-M07-D-会员管理.md | M07-A 已完成现金/赠送双余额账本;M07-B 已完成充值优惠;M07-C 已完成优惠券/套餐权益底表和冻结、确认、退回的可靠补偿核销服务;M07-D 已完成会员画像、订单、消费、余额、充值、优惠券和套餐聚合查询。 |
|
| M07 会员、余额、充值、优惠券和套餐营销 | DONE | `ed0d455` | docs/devlogs/2026-06-24-M07-D-会员管理.md | M07-A 已完成现金/赠送双余额账本;M07-B 已完成充值优惠;M07-C 已完成优惠券/套餐权益底表和冻结、确认、退回的可靠补偿核销服务;M07-D 已完成会员画像、订单、消费、余额、充值、优惠券和套餐聚合查询。 |
|
||||||
| M08 微信原生小程序完整业务 | PARTIAL | `7446852` | docs/devlogs/2026-06-24-M08-A-顾客端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算、取消订单、订单权限开门、顾客续费、同门店换房、分享口令生成和个人中心余额/权益/账单汇总;优惠券/套餐明细、充值入口和生产支付继续留在 M08-A。 |
|
| M08 微信原生小程序完整业务 | PARTIAL | `dbdfe3d` | docs/devlogs/2026-06-24-M08-A-顾客端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算、取消订单、订单权限开门、顾客续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总和充值计划/充值单入口;优惠券/套餐明细和生产支付继续留在 M08-A。 |
|
||||||
| M09 后台管理端完整业务 | TODO | - | - | - |
|
| M09 后台管理端完整业务 | TODO | - | - | - |
|
||||||
| M10 部署、域名、验收和运维闭环 | TODO | - | - | - |
|
| M10 部署、域名、验收和运维闭环 | TODO | - | - | - |
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
"pages/orders/list",
|
"pages/orders/list",
|
||||||
"pages/orders/detail",
|
"pages/orders/detail",
|
||||||
"pages/profile/index",
|
"pages/profile/index",
|
||||||
|
"pages/recharge/index",
|
||||||
"pages/logs/logs"
|
"pages/logs/logs"
|
||||||
],
|
],
|
||||||
"window": {
|
"window": {
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ Page({
|
|||||||
openOrders() {
|
openOrders() {
|
||||||
wx.navigateTo({ url: '/pages/orders/list' })
|
wx.navigateTo({ url: '/pages/orders/list' })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
openRecharge() {
|
||||||
|
wx.navigateTo({ url: '/pages/recharge/index' })
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
function formatProfile(profile) {
|
function formatProfile(profile) {
|
||||||
|
|||||||
@@ -70,6 +70,7 @@
|
|||||||
<text>已消费</text>
|
<text>已消费</text>
|
||||||
<text>{{profile.orders.paidAmountText}}</text>
|
<text>{{profile.orders.paidAmountText}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
<button bindtap="openRecharge">充值</button>
|
||||||
<button bindtap="openOrders">查看订单</button>
|
<button bindtap="openOrders">查看订单</button>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
const {
|
||||||
|
request,
|
||||||
|
ensureLogin,
|
||||||
|
cents,
|
||||||
|
clientRequestId,
|
||||||
|
} = require('../../utils/api.js')
|
||||||
|
|
||||||
|
Page({
|
||||||
|
data: {
|
||||||
|
loading: false,
|
||||||
|
errorMessage: '',
|
||||||
|
successMessage: '',
|
||||||
|
plans: [],
|
||||||
|
selectedPlanId: '',
|
||||||
|
rechargeOrder: null,
|
||||||
|
},
|
||||||
|
|
||||||
|
onLoad() {
|
||||||
|
this.loadPlans()
|
||||||
|
},
|
||||||
|
|
||||||
|
async loadPlans() {
|
||||||
|
this.setData({ loading: true, errorMessage: '', successMessage: '' })
|
||||||
|
try {
|
||||||
|
await ensureLogin()
|
||||||
|
const response = await request('/recharge/plans')
|
||||||
|
const plans = (response.data || []).map((item) => ({
|
||||||
|
...item,
|
||||||
|
payText: cents(item.payAmountCents),
|
||||||
|
giftText: cents(item.giftAmountCents),
|
||||||
|
totalText: cents(Number(item.payAmountCents || 0) + Number(item.giftAmountCents || 0)),
|
||||||
|
}))
|
||||||
|
this.setData({
|
||||||
|
plans,
|
||||||
|
selectedPlanId: plans[0]?.planId || '',
|
||||||
|
})
|
||||||
|
} catch (error) {
|
||||||
|
this.setData({ errorMessage: error.message || '充值计划加载失败' })
|
||||||
|
} finally {
|
||||||
|
this.setData({ loading: false })
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
selectPlan(event) {
|
||||||
|
this.setData({
|
||||||
|
selectedPlanId: event.currentTarget.dataset.planId || '',
|
||||||
|
rechargeOrder: null,
|
||||||
|
errorMessage: '',
|
||||||
|
successMessage: '',
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
async createRechargeOrder() {
|
||||||
|
if (!this.data.selectedPlanId) {
|
||||||
|
this.setData({ errorMessage: '请选择充值计划' })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const plan = this.data.plans.find((item) => item.planId === this.data.selectedPlanId)
|
||||||
|
await this.withRequest(async () => {
|
||||||
|
const response = await request('/recharge/orders', {
|
||||||
|
method: 'POST',
|
||||||
|
data: {
|
||||||
|
planId: this.data.selectedPlanId,
|
||||||
|
storeId: plan?.storeId || null,
|
||||||
|
clientRequestId: clientRequestId('miniapp-recharge'),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
this.setData({
|
||||||
|
rechargeOrder: {
|
||||||
|
...response.data,
|
||||||
|
payText: cents(response.data.payAmountCents),
|
||||||
|
giftText: cents(response.data.giftAmountCents),
|
||||||
|
},
|
||||||
|
successMessage: '充值单已创建',
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
async withRequest(work) {
|
||||||
|
this.setData({ loading: true, errorMessage: '', successMessage: '' })
|
||||||
|
try {
|
||||||
|
await ensureLogin()
|
||||||
|
await work()
|
||||||
|
} catch (error) {
|
||||||
|
this.setData({ errorMessage: error.message || '充值操作失败' })
|
||||||
|
} finally {
|
||||||
|
this.setData({ loading: false })
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"navigationBarTitleText": "余额充值"
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<scroll-view class="scrollarea" scroll-y type="list">
|
||||||
|
<view class="page">
|
||||||
|
<view class="title">余额充值</view>
|
||||||
|
<view wx:if="{{errorMessage}}" class="error">{{errorMessage}}</view>
|
||||||
|
<view wx:if="{{successMessage}}" class="success">{{successMessage}}</view>
|
||||||
|
|
||||||
|
<view wx:if="{{!loading && plans.length === 0}}" class="empty">暂无可用充值计划</view>
|
||||||
|
|
||||||
|
<view wx:for="{{plans}}" wx:key="planId" class="plan {{selectedPlanId === item.planId ? 'selected' : ''}}" bindtap="selectPlan" data-plan-id="{{item.planId}}">
|
||||||
|
<view class="plan-title">{{item.name}}</view>
|
||||||
|
<view class="row">
|
||||||
|
<text>实付</text>
|
||||||
|
<text>{{item.payText}}</text>
|
||||||
|
</view>
|
||||||
|
<view class="row">
|
||||||
|
<text>赠送</text>
|
||||||
|
<text>{{item.giftText}}</text>
|
||||||
|
</view>
|
||||||
|
<view class="row total">
|
||||||
|
<text>到账</text>
|
||||||
|
<text>{{item.totalText}}</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<button loading="{{loading}}" bindtap="createRechargeOrder">创建充值单</button>
|
||||||
|
|
||||||
|
<view wx:if="{{rechargeOrder}}" class="card">
|
||||||
|
<view class="section-title">充值单</view>
|
||||||
|
<view class="muted">单号:{{rechargeOrder.rechargeNo}}</view>
|
||||||
|
<view class="muted">状态:{{rechargeOrder.status}}</view>
|
||||||
|
<view class="muted">实付:{{rechargeOrder.payText}}</view>
|
||||||
|
<view class="muted">赠送:{{rechargeOrder.giftText}}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</scroll-view>
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
.scrollarea {
|
||||||
|
height: 100vh;
|
||||||
|
background: #f5f6f8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page {
|
||||||
|
padding: 32rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
margin-bottom: 24rpx;
|
||||||
|
font-size: 40rpx;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.plan,
|
||||||
|
.card {
|
||||||
|
margin-top: 20rpx;
|
||||||
|
padding: 28rpx;
|
||||||
|
border: 2rpx solid transparent;
|
||||||
|
border-radius: 16rpx;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selected {
|
||||||
|
border-color: #1f6feb;
|
||||||
|
background: #f0f6ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.plan-title,
|
||||||
|
.section-title {
|
||||||
|
font-size: 32rpx;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-top: 16rpx;
|
||||||
|
color: #475467;
|
||||||
|
}
|
||||||
|
|
||||||
|
.total {
|
||||||
|
color: #b42318;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
margin-top: 24rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.muted {
|
||||||
|
margin-top: 8rpx;
|
||||||
|
color: #667085;
|
||||||
|
}
|
||||||
|
|
||||||
|
.success {
|
||||||
|
margin: 16rpx 0;
|
||||||
|
color: #17823b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
margin: 16rpx 0;
|
||||||
|
color: #c73535;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty {
|
||||||
|
padding: 80rpx 0;
|
||||||
|
color: #888888;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -12,7 +12,8 @@ for (const page of [
|
|||||||
'pages/room/detail',
|
'pages/room/detail',
|
||||||
'pages/orders/list',
|
'pages/orders/list',
|
||||||
'pages/orders/detail',
|
'pages/orders/detail',
|
||||||
'pages/profile/index'
|
'pages/profile/index',
|
||||||
|
'pages/recharge/index'
|
||||||
]) {
|
]) {
|
||||||
assert.ok(appJson.pages.includes(page), `${page} must be registered`);
|
assert.ok(appJson.pages.includes(page), `${page} must be registered`);
|
||||||
}
|
}
|
||||||
@@ -72,4 +73,16 @@ for (const pattern of [
|
|||||||
assert.match(profile, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
assert.match(profile, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const recharge = read('miniapp/pages/recharge/index.js')
|
||||||
|
+ read('miniapp/pages/recharge/index.wxml');
|
||||||
|
for (const pattern of [
|
||||||
|
'/recharge/plans',
|
||||||
|
'/recharge/orders',
|
||||||
|
'clientRequestId',
|
||||||
|
'selectedPlanId',
|
||||||
|
'rechargeOrder'
|
||||||
|
]) {
|
||||||
|
assert.match(recharge, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
|
}
|
||||||
|
|
||||||
console.log('PASS: M08-A miniapp customer pages use fixed domain and real app-api calls.');
|
console.log('PASS: M08-A miniapp customer pages use fixed domain and real app-api calls.');
|
||||||
|
|||||||
Reference in New Issue
Block a user