Compare commits
2 Commits
47ec7fc30e
...
d2c73a2c28
| Author | SHA1 | Date | |
|---|---|---|---|
| d2c73a2c28 | |||
| eea8eea12d |
@@ -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` 为准。
|
||||
|
||||
- 当前执行游标:`M08-A`(PARTIAL)
|
||||
- 最近工程提交:`4ac2c96`,完成顾客端第一段:公开门店详情/房间列表 API、小程序登录态、选店到房间浏览、报价、预占、测试支付和受控 Wi-Fi 入口。
|
||||
- 下一工程目标:继续 M08-A,补顾客端订单列表、开门、续费、取消、换房、分享、余额、优惠券、套餐和个人中心。
|
||||
- 最近工程提交:`eea8eea`,完成顾客端订单列表/详情 API 与小程序页面,支持状态历史、取消测算和取消订单入口。
|
||||
- 下一工程目标:继续 M08-A,补顾客端开门、续费、换房、分享、余额、优惠券、套餐和个人中心。
|
||||
|
||||
## 版本递进
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
"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",
|
||||
"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-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"
|
||||
"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"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastify/cors": "^11.2.0",
|
||||
|
||||
@@ -33,6 +33,9 @@ import { registerPricingRoutes, type PricingRouteOptions } from './routes/pricin
|
||||
import {
|
||||
registerOrderStateRoutes, type OrderStateRouteOptions
|
||||
} from './routes/order-state.js';
|
||||
import {
|
||||
registerOrderQueryRoutes, type OrderQueryRouteOptions
|
||||
} from './routes/order-query.js';
|
||||
import {
|
||||
registerOrderManagementRoutes, type OrderManagementRouteOptions
|
||||
} from './routes/order-management.js';
|
||||
@@ -58,6 +61,7 @@ export interface BuildAppOptions {
|
||||
storeAccess?: StoreAccessRouteOptions;
|
||||
pricing?: PricingRouteOptions;
|
||||
orderState?: OrderStateRouteOptions;
|
||||
orderQuery?: OrderQueryRouteOptions;
|
||||
orderManagement?: OrderManagementRouteOptions;
|
||||
orderShare?: OrderShareRouteOptions;
|
||||
payment?: PaymentRouteOptions;
|
||||
@@ -137,6 +141,9 @@ export async function buildApp(options: BuildAppOptions = {}): Promise<FastifyIn
|
||||
if (options.orderState) {
|
||||
await registerOrderStateRoutes(app, options.orderState);
|
||||
}
|
||||
if (options.orderQuery) {
|
||||
await registerOrderQueryRoutes(app, options.orderQuery);
|
||||
}
|
||||
if (options.orderManagement) {
|
||||
await registerOrderManagementRoutes(app, options.orderManagement);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
import type { RowDataPacket } from 'mysql2/promise';
|
||||
import type { AccessProfile } from '../auth/rbac-repository.js';
|
||||
import type { MySqlPool } from '../db/mysql.js';
|
||||
import type { OrderStatus } from './order-state-repository.js';
|
||||
|
||||
export class OrderQueryError extends Error {
|
||||
constructor(public readonly code: string) { super(code); }
|
||||
}
|
||||
|
||||
export interface OrderQueryAccess {
|
||||
tenantId: string;
|
||||
userId: string;
|
||||
access: AccessProfile;
|
||||
}
|
||||
|
||||
interface OrderListRow extends RowDataPacket {
|
||||
id: string;
|
||||
orderNo: string;
|
||||
storeId: string;
|
||||
storeName: string;
|
||||
roomId: string;
|
||||
roomName: string;
|
||||
roomNo: string;
|
||||
status: OrderStatus;
|
||||
startAt: Date;
|
||||
endAt: Date;
|
||||
totalAmountCents: number;
|
||||
paidAmountCents: number;
|
||||
latestPaymentId: string | null;
|
||||
latestPaymentProvider: string | null;
|
||||
latestPaymentStatus: string | null;
|
||||
createdAt: Date;
|
||||
}
|
||||
|
||||
interface CountRow extends RowDataPacket { total: number }
|
||||
|
||||
export class OrderQueryRepository {
|
||||
constructor(private readonly pool: MySqlPool) {}
|
||||
|
||||
async listMine(input: OrderQueryAccess & {
|
||||
page: number;
|
||||
pageSize: number;
|
||||
status?: OrderStatus;
|
||||
}) {
|
||||
const where = [
|
||||
'o.tenant_id = ?',
|
||||
'o.deleted_at IS NULL',
|
||||
'(a.user_id = ? OR ' + managerScopeSql(input.access, 'o.store_id') + ')'
|
||||
];
|
||||
const params: Array<string | number> = [input.tenantId, input.userId];
|
||||
if (input.status) {
|
||||
where.push('o.status = ?');
|
||||
params.push(input.status);
|
||||
}
|
||||
const whereSql = where.join(' AND ');
|
||||
const offset = (input.page - 1) * input.pageSize;
|
||||
const [counts] = await this.pool.execute<CountRow[]>(
|
||||
`SELECT COUNT(DISTINCT o.id) AS total
|
||||
FROM qipai_orders o
|
||||
LEFT JOIN qipai_order_user_access a
|
||||
ON a.tenant_id = o.tenant_id AND a.order_id = o.id AND a.revoked_at IS NULL
|
||||
WHERE ${whereSql}`,
|
||||
params
|
||||
);
|
||||
const [rows] = await this.pool.execute<OrderListRow[]>(
|
||||
`SELECT DISTINCT o.id, o.order_no AS orderNo, o.store_id AS storeId, s.name AS storeName,
|
||||
o.room_id AS roomId, r.name AS roomName, r.room_no AS roomNo,
|
||||
o.status, o.start_at AS startAt, o.end_at AS endAt,
|
||||
o.total_amount_cents AS totalAmountCents,
|
||||
o.paid_amount_cents AS paidAmountCents, p.id AS latestPaymentId,
|
||||
p.provider AS latestPaymentProvider, p.status AS latestPaymentStatus,
|
||||
o.created_at AS createdAt
|
||||
FROM qipai_orders o
|
||||
INNER JOIN qipai_stores s ON s.tenant_id = o.tenant_id AND s.id = o.store_id
|
||||
INNER JOIN qipai_rooms r ON r.tenant_id = o.tenant_id AND r.id = o.room_id
|
||||
LEFT JOIN qipai_order_user_access a
|
||||
ON a.tenant_id = o.tenant_id AND a.order_id = o.id AND a.revoked_at IS NULL
|
||||
LEFT JOIN qipai_payments p
|
||||
ON p.tenant_id = o.tenant_id AND p.order_id = o.id
|
||||
AND p.id = (
|
||||
SELECT MAX(p2.id) FROM qipai_payments p2
|
||||
WHERE p2.tenant_id = o.tenant_id AND p2.order_id = o.id
|
||||
AND p2.deleted_at IS NULL
|
||||
)
|
||||
WHERE ${whereSql}
|
||||
ORDER BY o.created_at DESC, o.id DESC
|
||||
LIMIT ? OFFSET ?`,
|
||||
[...params, input.pageSize, offset]
|
||||
);
|
||||
return {
|
||||
items: rows.map(publicOrder),
|
||||
total: Number(counts[0]?.total ?? 0),
|
||||
page: input.page,
|
||||
pageSize: input.pageSize
|
||||
};
|
||||
}
|
||||
|
||||
async getMine(input: OrderQueryAccess & { orderId: string }) {
|
||||
const result = await this.listMine({ ...input, page: 1, pageSize: 1 });
|
||||
const order = result.items.find((item) => item.id === input.orderId);
|
||||
if (order) return order;
|
||||
const [rows] = await this.pool.execute<OrderListRow[]>(
|
||||
`SELECT o.id, o.order_no AS orderNo, o.store_id AS storeId, s.name AS storeName,
|
||||
o.room_id AS roomId, r.name AS roomName, r.room_no AS roomNo,
|
||||
o.status, o.start_at AS startAt, o.end_at AS endAt,
|
||||
o.total_amount_cents AS totalAmountCents,
|
||||
o.paid_amount_cents AS paidAmountCents, p.id AS latestPaymentId,
|
||||
p.provider AS latestPaymentProvider, p.status AS latestPaymentStatus,
|
||||
o.created_at AS createdAt
|
||||
FROM qipai_orders o
|
||||
INNER JOIN qipai_stores s ON s.tenant_id = o.tenant_id AND s.id = o.store_id
|
||||
INNER JOIN qipai_rooms r ON r.tenant_id = o.tenant_id AND r.id = o.room_id
|
||||
LEFT JOIN qipai_order_user_access a
|
||||
ON a.tenant_id = o.tenant_id AND a.order_id = o.id AND a.revoked_at IS NULL
|
||||
LEFT JOIN qipai_payments p
|
||||
ON p.tenant_id = o.tenant_id AND p.order_id = o.id
|
||||
AND p.id = (
|
||||
SELECT MAX(p2.id) FROM qipai_payments p2
|
||||
WHERE p2.tenant_id = o.tenant_id AND p2.order_id = o.id
|
||||
AND p2.deleted_at IS NULL
|
||||
)
|
||||
WHERE o.tenant_id = ? AND o.id = ? AND o.deleted_at IS NULL
|
||||
AND (a.user_id = ? OR ${managerScopeSql(input.access, 'o.store_id')})
|
||||
LIMIT 1`,
|
||||
[input.tenantId, input.orderId, input.userId]
|
||||
);
|
||||
if (!rows[0]) throw new OrderQueryError('ORDER_NOT_FOUND');
|
||||
return publicOrder(rows[0]);
|
||||
}
|
||||
}
|
||||
|
||||
function publicOrder(row: OrderListRow) {
|
||||
return {
|
||||
id: String(row.id),
|
||||
orderNo: row.orderNo,
|
||||
storeId: String(row.storeId),
|
||||
storeName: row.storeName,
|
||||
roomId: String(row.roomId),
|
||||
roomName: row.roomName,
|
||||
roomNo: row.roomNo,
|
||||
status: row.status,
|
||||
startAt: row.startAt,
|
||||
endAt: row.endAt,
|
||||
totalAmountCents: row.totalAmountCents,
|
||||
paidAmountCents: row.paidAmountCents,
|
||||
latestPayment: row.latestPaymentId === null ? null : {
|
||||
id: String(row.latestPaymentId),
|
||||
provider: row.latestPaymentProvider,
|
||||
status: row.latestPaymentStatus
|
||||
},
|
||||
createdAt: row.createdAt
|
||||
};
|
||||
}
|
||||
|
||||
function managerScopeSql(access: AccessProfile, storeExpression: string) {
|
||||
if (access.capabilities.includes('tenant.manage') || access.roles.includes('PLATFORM_ADMIN')) {
|
||||
return '1 = 1';
|
||||
}
|
||||
if (!access.capabilities.includes('store.operation.read') || access.storeIds.length === 0) {
|
||||
return '1 = 0';
|
||||
}
|
||||
return `${storeExpression} IN (${access.storeIds.map((id) => Number(id)).join(',')})`;
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
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 {
|
||||
OrderQueryError,
|
||||
type OrderQueryRepository
|
||||
} from '../orders/order-query-repository.js';
|
||||
import { type OrderStatus } from '../orders/order-state-repository.js';
|
||||
|
||||
const orderStatuses = [
|
||||
'DRAFT', 'PENDING_PAYMENT', 'PAID', 'RESERVED', 'IN_PROGRESS',
|
||||
'FINISHED', 'CANCELLED', 'REFUNDING', 'REFUNDED', 'CLOSED'
|
||||
] as const satisfies readonly OrderStatus[];
|
||||
const listSchema = z.object({
|
||||
page: z.coerce.number().int().min(1).default(1),
|
||||
pageSize: z.coerce.number().int().min(1).max(50).default(20),
|
||||
status: z.enum(orderStatuses).optional()
|
||||
});
|
||||
const paramsSchema = z.object({ orderId: z.string().regex(/^[1-9]\d{0,19}$/) });
|
||||
|
||||
export interface OrderQueryRouteOptions {
|
||||
repository: Pick<OrderQueryRepository, 'listMine' | 'getMine'>;
|
||||
authRepository: Pick<AuthRepository, 'validateSession'>;
|
||||
accessControl: { getAccessProfile(tenantId: string, userId: string): Promise<AccessProfile> };
|
||||
jwtSecret: string;
|
||||
}
|
||||
|
||||
export async function registerOrderQueryRoutes(
|
||||
app: FastifyInstance,
|
||||
options: OrderQueryRouteOptions
|
||||
) {
|
||||
app.get('/app-api/orders', 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 {
|
||||
code: 0,
|
||||
data: await options.repository.listMine({ ...auth, ...query.data }),
|
||||
traceId: request.traceId
|
||||
};
|
||||
});
|
||||
|
||||
app.get('/app-api/orders/:orderId', async (request, reply) => {
|
||||
const auth = await authenticate(request.headers.authorization, options);
|
||||
const params = paramsSchema.safeParse(request.params);
|
||||
if (!auth) return unauthorized(reply, request.traceId);
|
||||
if (!params.success) return invalid(reply, request.traceId);
|
||||
return handle(reply, request.traceId, async () => ({
|
||||
code: 0,
|
||||
data: await options.repository.getMine({ ...auth, orderId: params.data.orderId }),
|
||||
traceId: request.traceId
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
async function authenticate(
|
||||
authorization: string | undefined,
|
||||
options: OrderQueryRouteOptions
|
||||
) {
|
||||
const result = await authenticateAccessToken(
|
||||
authorization, options.authRepository, options.jwtSecret
|
||||
);
|
||||
if (!result) return null;
|
||||
const tenantId = result.session.tenantId;
|
||||
const userId = result.session.user.id;
|
||||
return {
|
||||
tenantId,
|
||||
userId,
|
||||
access: await options.accessControl.getAccessProfile(tenantId, userId)
|
||||
};
|
||||
}
|
||||
|
||||
async function handle(reply: FastifyReply, traceId: string, work: () => Promise<unknown>) {
|
||||
try {
|
||||
return await work();
|
||||
} catch (error) {
|
||||
if (!(error instanceof OrderQueryError)) throw error;
|
||||
return reply.status(404).send({
|
||||
code: error.code,
|
||||
message: 'The requested order 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_ORDER_QUERY',
|
||||
message: 'The order query is invalid.',
|
||||
traceId
|
||||
});
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import { PricingRepository } from './orders/pricing-repository.js';
|
||||
import { OrderStateRepository } from './orders/order-state-repository.js';
|
||||
import { OrderManagementRepository } from './orders/order-management-repository.js';
|
||||
import { OrderShareRepository } from './orders/order-share-repository.js';
|
||||
import { OrderQueryRepository } from './orders/order-query-repository.js';
|
||||
import { PaymentRepository } from './payments/payment-repository.js';
|
||||
import {
|
||||
FetchWechatPayTransport, parseWechatPayCredentials, WechatPayClient
|
||||
@@ -100,6 +101,12 @@ const app = await buildApp({
|
||||
jwtSecret: config.auth.jwtSecret,
|
||||
cancellationPolicy: orderManagementRepository
|
||||
},
|
||||
orderQuery: {
|
||||
repository: new OrderQueryRepository(pool),
|
||||
authRepository,
|
||||
accessControl,
|
||||
jwtSecret: config.auth.jwtSecret
|
||||
},
|
||||
orderManagement: {
|
||||
repository: orderManagementRepository,
|
||||
authRepository,
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { buildApp } from '../dist/app.js';
|
||||
import { signAccessToken } from '../dist/auth/jwt.js';
|
||||
|
||||
const secret = 'test-only-order-query-jwt-secret-32';
|
||||
const token = signAccessToken({
|
||||
sub: '21',
|
||||
sid: '5c4d3af8-c63c-4edb-bf95-b84127bb3f6e',
|
||||
tid: '7',
|
||||
aid: '9',
|
||||
rv: 1
|
||||
}, secret, 900);
|
||||
const 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: ''
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
let listInput;
|
||||
let detailInput;
|
||||
const app = await buildApp({
|
||||
orderQuery: {
|
||||
jwtSecret: secret,
|
||||
authRepository,
|
||||
accessControl: {
|
||||
async getAccessProfile() {
|
||||
return { roles: ['CUSTOMER'], capabilities: [], storeIds: [] };
|
||||
}
|
||||
},
|
||||
repository: {
|
||||
async listMine(input) {
|
||||
listInput = input;
|
||||
return {
|
||||
items: [{
|
||||
id: '31',
|
||||
orderNo: 'QP202606240001',
|
||||
storeName: '近店',
|
||||
roomName: '青竹房',
|
||||
status: 'PENDING_PAYMENT',
|
||||
totalAmountCents: 3600,
|
||||
latestPayment: null
|
||||
}],
|
||||
total: 1,
|
||||
page: input.page,
|
||||
pageSize: input.pageSize
|
||||
};
|
||||
},
|
||||
async getMine(input) {
|
||||
detailInput = input;
|
||||
return {
|
||||
id: input.orderId,
|
||||
orderNo: 'QP202606240001',
|
||||
storeName: '近店',
|
||||
roomName: '青竹房',
|
||||
status: 'PENDING_PAYMENT',
|
||||
totalAmountCents: 3600,
|
||||
latestPayment: null
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const listed = await app.inject({
|
||||
method: 'GET',
|
||||
url: '/app-api/orders?page=2&pageSize=5&status=PENDING_PAYMENT',
|
||||
headers: { authorization: `Bearer ${token}` }
|
||||
});
|
||||
assert.equal(listed.statusCode, 200);
|
||||
assert.equal(listed.json().data.items[0].id, '31');
|
||||
assert.equal(listInput.tenantId, '7');
|
||||
assert.equal(listInput.userId, '21');
|
||||
assert.equal(listInput.page, 2);
|
||||
assert.equal(listInput.pageSize, 5);
|
||||
assert.equal(listInput.status, 'PENDING_PAYMENT');
|
||||
|
||||
const detail = await app.inject({
|
||||
method: 'GET',
|
||||
url: '/app-api/orders/31',
|
||||
headers: { authorization: `Bearer ${token}` }
|
||||
});
|
||||
assert.equal(detail.statusCode, 200);
|
||||
assert.equal(detailInput.orderId, '31');
|
||||
|
||||
const unauthenticated = await app.inject({
|
||||
method: 'GET',
|
||||
url: '/app-api/orders'
|
||||
});
|
||||
assert.equal(unauthenticated.statusCode, 401);
|
||||
|
||||
const invalid = await app.inject({
|
||||
method: 'GET',
|
||||
url: '/app-api/orders?pageSize=999',
|
||||
headers: { authorization: `Bearer ${token}` }
|
||||
});
|
||||
assert.equal(invalid.statusCode, 400);
|
||||
|
||||
await app.close();
|
||||
console.log('PASS: M08-A customer order query routes expose scoped list and detail.');
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
> V5.0 首次核验日期:2026-06-16
|
||||
> audited_commit: `4ae9296`
|
||||
> next_engineering_target: 继续 M08-A 顾客端订单与会员权益页面
|
||||
> next_engineering_target: 继续 M08-A 顾客端开门、续费、换房与会员权益页面
|
||||
> 事实源:当前工作区、Git 历史、状态文档、Windows/WSL 检查脚本。
|
||||
|
||||
## 总体结论
|
||||
@@ -13,7 +13,7 @@
|
||||
| Git 远端 | `origin=ssh://git@git.txyundm.cn:2222/panda/qipai.git`,分支 `main` | `git rev-list main...origin/main` 为 `0 0` | 本地与远端同步 |
|
||||
| 正式后端 | 已完成 Fastify、迁移兼容、outbox/worker、多应用租户、微信身份/会话,以及六角色 RBAC 和门店范围 | `backend/src/auth/**`、`database/migrations/2026061805_m02c_rbac.*.sql`、`backend/tests/**` | M01、M02-A/B/C DONE;MySQL 已验证 capability 和跨租户门店授权拒绝;下一阶段 M02-D |
|
||||
| 后台管理端 | 仅有 `admin/.gitkeep` | 当前文件扫描 | M09 未开始,不能标记 DONE |
|
||||
| 微信小程序 | 已纳管微信原生模板,并完成顾客端第一段工程闭环 | `miniapp/pages/index`、`miniapp/pages/store/detail`、`miniapp/pages/room/detail`、`miniapp/utils/api.js`、`scripts/check-miniapp-m08-a.mjs` | M08-A PARTIAL;已支持选店、门店/房间浏览、报价、预占、测试支付和受控 Wi-Fi 入口,仍不能标记 DONE |
|
||||
| 微信小程序 | 已纳管微信原生模板,并完成顾客端订单前半链路 | `miniapp/pages/index`、`miniapp/pages/store/detail`、`miniapp/pages/room/detail`、`miniapp/pages/orders/*`、`miniapp/utils/api.js`、`scripts/check-miniapp-m08-a.mjs` | M08-A PARTIAL;已支持选店、门店/房间浏览、报价、预占、测试支付、受控 Wi-Fi、订单列表/详情、状态历史和取消入口,仍不能标记 DONE |
|
||||
| 数据库迁移 | 已新增 M01-B 核心 schema up/down/verify SQL、最小脱敏 seed、旧库结构 fixture、迁移计划/执行 CLI、验证结果数量门禁和 MySQL 8 集成测试 | `database/migrations/2026061601_m01b_core_schema.*.sql`、`database/seeds/2026061601_m01b_minimal_seed.sql`、`database/fixtures/2026061801_m01b_legacy_schema.sql`、`backend/src/db/migration-runner.ts`、`backend/tests/mysql-migration-roundtrip.test.mjs` | M01-B DONE;WSL MySQL 8.4.9 已验证 8 条旧库 fixture、11 条 up、3 条 verify、10 条 down,并验证租户隔离和旧金额整数分转换;不导入真实旧数据 |
|
||||
| M00 部署脚本 | 已有菜单、状态、HTTPS、Certbot、EMQX、备份检查模板 | `setup.sh`、`scripts/setup/`、`deploy/` | PARTIAL,生产未执行 |
|
||||
| 发布清单 dry-run | 可基于当前 HEAD 输出 `deployed=false` 的 release manifest,记录后端/后台/迁移尚未生成而跳过 | `scripts/setup/deploy-business.sh --dry-run .`、`scripts/dev/windows/check-release-manifest.ps1` | 可在 M00 验证结构;真实构建与生产发布待 M01/M09 后接入 |
|
||||
@@ -35,6 +35,6 @@
|
||||
|
||||
## 下一步
|
||||
|
||||
1. 继续 M08-A:在已完成选店、门店/房间浏览、报价、预占、测试支付和受控 Wi-Fi 入口基础上,补订单列表、开门、续费、取消、换房、分享、余额、优惠券、套餐和个人中心。
|
||||
1. 继续 M08-A:在已完成选店、门店/房间浏览、报价、预占、测试支付、受控 Wi-Fi、订单列表/详情和取消入口基础上,补开门、续费、换房、分享、余额、优惠券、套餐和个人中心。
|
||||
2. 继续复用 M03 门店发现、M04 订单、M05 支付、M06 设备联动和 M07 会员营销后端能力,不重复初始化小程序。
|
||||
3. M06-G 真实硬件联调仍等待生产 MQTT 账号/ACL、DeviceID 和现场实物配线。
|
||||
|
||||
@@ -25,3 +25,18 @@ M08-A 仍为 `PARTIAL`。本次完成顾客端第一段工程闭环,但订单
|
||||
|
||||
- 工程提交:`4ac2c96`
|
||||
- 远端校验:push 后执行 `HEAD == origin/main`。
|
||||
|
||||
## 2026-06-24 续接:订单列表与详情
|
||||
|
||||
- 后端新增顾客端订单查询服务和路由:`GET /app-api/orders`、`GET /app-api/orders/:orderId`,按本人 `qipai_order_user_access` 与门店管理范围裁剪数据。
|
||||
- 小程序新增 `pages/orders/list` 与 `pages/orders/detail`,可查看我的订单、订单详情、状态历史、取消测算和取消订单入口;房间预占成功后可直接进入订单详情。
|
||||
- `scripts/check-miniapp-m08-a.mjs` 扩展检查订单页注册和订单相关真实 API 调用。
|
||||
|
||||
验收:
|
||||
|
||||
- `node scripts/check-miniapp-m08-a.mjs`:PASS。
|
||||
- `npm test`(`backend/`):PASS。
|
||||
|
||||
状态:
|
||||
|
||||
- M08-A 仍为 `PARTIAL`;开门、续费、换房、分享、余额、优惠券、套餐、个人中心、真实微信支付调起和真机合法域名验证待继续。
|
||||
|
||||
@@ -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-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`。 |
|
||||
| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `4ac2c96` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付和受控 Wi-Fi 入口;`scripts/check-miniapp-m08-a.mjs` 与后端全量测试通过。 | 订单列表、开门、续费、取消、换房、分享、余额、优惠券、套餐、个人中心、多角色菜单和真机联调尚未完成。 | 继续 M08-A,补顾客端订单和会员权益页面,再进入 M08-B。 |
|
||||
| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `eea8eea` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、受控 Wi-Fi、订单列表、订单详情、状态历史和取消入口;`scripts/check-miniapp-m08-a.mjs` 与后端全量测试通过。 | 开门、续费、换房、分享、余额、优惠券、套餐、个人中心、多角色菜单和真机联调尚未完成。 | 继续 M08-A,补顾客端设备动作和会员权益页面,再进入 M08-B。 |
|
||||
| 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 增加管理页面。 |
|
||||
| AUTH-001 | 多端统一小程序身份 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已实现微信 code 交换适配器、租户/AppID 隔离身份、JWT、服务端会话、当前用户和注销;禁用、角色/门店范围变化及管理员重置均使旧会话立即失效。 | 缺真实 AppSecret 真机联调和小程序动态角色界面。 | M08 完成小程序角色界面与真机登录。 |
|
||||
@@ -32,7 +32,7 @@
|
||||
| MAP-001 | 地图选店和最近门店 | M03-C/M08 | PARTIAL | `4ac2c96` | 已实现 AppID/tenant 隔离门店发现、城市/营业筛选、按门店时区判断营业中、后端 Haversine 距离排序;小程序支持定位和手工城市降级,并可从门店卡片进入公开门店详情与房间列表。 | 地图 SDK 可视化和真机定位授权尚未验收。 | M08-A 继续补真机定位、地图展示和门店装修渲染。 |
|
||||
| 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 真机连接验证。 |
|
||||
| ORD-001 | 预约下单与多方式支付 | M04/M05/M08 | PARTIAL | `4ac2c96` | 已完成订单全生命周期、微信支付 v3 工程闭环和团购支付;M08-A 小程序房间页已接入报价、预占、测试支付创建与测试回调完成入口,后端全量测试通过。 | 缺真实微信和团购平台授权联调;小程序订单列表、生产微信支付调起和余额/套餐支付入口待补。 | M08-A 继续补顾客端订单、取消/续费/换房和生产支付调起。 |
|
||||
| ORD-001 | 预约下单与多方式支付 | M04/M05/M08 | PARTIAL | `eea8eea` | 已完成订单全生命周期、微信支付 v3 工程闭环和团购支付;M08-A 小程序已接入报价、预占、测试支付、订单列表、订单详情、状态历史、取消测算和取消订单入口,后端全量测试通过。 | 缺真实微信和团购平台授权联调;小程序续费、换房、生产微信支付调起和余额/套餐支付入口待补。 | M08-A 继续补顾客端续费/换房、生产支付调起和权益支付。 |
|
||||
| WAL-001 | 充值优惠 | M07-B | PARTIAL | `d9743d3` | 已建立充值规则和充值订单表,支持有效期、适用门店、限购、启停、clientRequestId 幂等;支付成功后调用钱包入账,重复支付回调不重复充值;Windows 全量后端回归通过。 | 真实微信充值支付回调仍需 M05 生产凭据和 M08 前端入口联调。 | M08 增加充值页面和账单查询。 |
|
||||
| WAL-002 | 门店独立会员余额 | M07-A | DONE | `63711ad` | 已建立租户/门店余额范围策略、现金/赠送双余额账户和不可变流水;充值、赠送、消费、退款、人工调整均预留 entry type;消费按赠送后现金扣款,业务号幂等,余额不足拒绝;Windows 全量后端回归通过。 | - | M07-D 聚合会员余额和权益状态。 |
|
||||
| WAL-003 | 余额账单 | M07-A/M08 | PARTIAL | `d9743d3` | 账单底表已包含业务类型、业务号、现金/赠送变动、变动后余额、操作人、trace 和 metadata;M07-B 充值成功后写入真实充值流水。 | 查询 API 和前端账单页面待 M08;优惠券/套餐不直接写钱包流水。 | M08 增加分页查询。 |
|
||||
|
||||
@@ -7,7 +7,7 @@ execution_cursor:
|
||||
stage_status: PARTIAL
|
||||
last_completed_stage: M07-D
|
||||
next_stage: M08-A
|
||||
last_engineering_commit: `4ac2c96`
|
||||
last_engineering_commit: `eea8eea`
|
||||
last_push_verified: true
|
||||
base_branch: main
|
||||
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。 |
|
||||
| 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 已完成会员画像、订单、消费、余额、充值、优惠券和套餐聚合查询。 |
|
||||
| M08 微信原生小程序完整业务 | PARTIAL | `4ac2c96` | docs/devlogs/2026-06-24-M08-A-顾客端.md | M08-A 已完成顾客端第一段工程闭环:公开门店详情/房间列表 API、小程序登录态、选店到房间浏览、报价、预占、测试支付和受控 Wi-Fi 入口;订单列表、开门、续费、取消、换房、分享、余额、优惠券、套餐和个人中心继续留在 M08-A。 |
|
||||
| M08 微信原生小程序完整业务 | PARTIAL | `eea8eea` | docs/devlogs/2026-06-24-M08-A-顾客端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算和取消订单入口;开门、续费、换房、分享、余额、优惠券、套餐和个人中心继续留在 M08-A。 |
|
||||
| M09 后台管理端完整业务 | TODO | - | - | - |
|
||||
| M10 部署、域名、验收和运维闭环 | TODO | - | - | - |
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
"pages/index/index",
|
||||
"pages/store/detail",
|
||||
"pages/room/detail",
|
||||
"pages/orders/list",
|
||||
"pages/orders/detail",
|
||||
"pages/logs/logs"
|
||||
],
|
||||
"window": {
|
||||
|
||||
@@ -65,6 +65,10 @@ Page({
|
||||
wx.navigateTo({ url: `/pages/store/detail?storeId=${encodeURIComponent(storeId)}` })
|
||||
},
|
||||
|
||||
openOrders() {
|
||||
wx.navigateTo({ url: '/pages/orders/list' })
|
||||
},
|
||||
|
||||
async resolveScene(code, sourceType) {
|
||||
this.setData({ loading: true, errorMessage: '' })
|
||||
try {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<scroll-view class="scrollarea" scroll-y type="list">
|
||||
<view class="container">
|
||||
<view class="title">选择门店</view>
|
||||
<button bindtap="openOrders">我的订单</button>
|
||||
<button loading="{{locating}}" bindtap="locateNearby">定位附近门店</button>
|
||||
<view class="city-search">
|
||||
<input value="{{city}}" placeholder="拒绝定位时输入城市" bindinput="onCityInput" />
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
const { request, ensureLogin, cents } = require('../../utils/api.js')
|
||||
|
||||
Page({
|
||||
data: {
|
||||
orderId: '',
|
||||
loading: false,
|
||||
errorMessage: '',
|
||||
successMessage: '',
|
||||
order: null,
|
||||
history: [],
|
||||
cancellation: null,
|
||||
},
|
||||
|
||||
onLoad(options) {
|
||||
this.setData({ orderId: options.orderId || '' })
|
||||
if (options.orderId) this.loadOrder(options.orderId)
|
||||
},
|
||||
|
||||
async loadOrder(orderId = this.data.orderId) {
|
||||
const targetOrderId = typeof orderId === 'string' ? orderId : this.data.orderId
|
||||
this.setData({ loading: true, errorMessage: '', successMessage: '' })
|
||||
try {
|
||||
await ensureLogin()
|
||||
const [orderResponse, historyResponse] = await Promise.all([
|
||||
request(`/orders/${encodeURIComponent(targetOrderId)}`),
|
||||
request(`/orders/${encodeURIComponent(targetOrderId)}/history`),
|
||||
])
|
||||
this.setData({
|
||||
order: formatOrder(orderResponse.data),
|
||||
history: (historyResponse.data || []).map((item) => ({
|
||||
...item,
|
||||
createdText: formatTime(item.createdAt),
|
||||
})),
|
||||
})
|
||||
} catch (error) {
|
||||
this.setData({ errorMessage: error.message || '订单加载失败' })
|
||||
} finally {
|
||||
this.setData({ loading: false })
|
||||
}
|
||||
},
|
||||
|
||||
async loadCancellationQuote() {
|
||||
if (!this.data.orderId) return
|
||||
await this.withOrderRequest(async () => {
|
||||
const response = await request(`/orders/${encodeURIComponent(this.data.orderId)}/cancellation-quote`)
|
||||
this.setData({
|
||||
cancellation: {
|
||||
...response.data,
|
||||
feeText: cents(response.data.feeCents),
|
||||
refundableText: cents(response.data.refundableCents),
|
||||
},
|
||||
successMessage: '取消测算已更新',
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
async cancelOrder() {
|
||||
if (!this.data.orderId) return
|
||||
await this.withOrderRequest(async () => {
|
||||
await request(`/orders/${encodeURIComponent(this.data.orderId)}/cancel`, {
|
||||
method: 'POST',
|
||||
data: { reason: '用户小程序取消' },
|
||||
})
|
||||
this.setData({ successMessage: '订单已提交取消' })
|
||||
await this.loadOrder(this.data.orderId)
|
||||
})
|
||||
},
|
||||
|
||||
async withOrderRequest(work) {
|
||||
this.setData({ loading: true, errorMessage: '', successMessage: '' })
|
||||
try {
|
||||
await ensureLogin()
|
||||
await work()
|
||||
} catch (error) {
|
||||
this.setData({ errorMessage: error.message || '订单操作失败' })
|
||||
} finally {
|
||||
this.setData({ loading: false })
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
function formatOrder(order) {
|
||||
return {
|
||||
...order,
|
||||
totalText: cents(order.totalAmountCents),
|
||||
paidText: cents(order.paidAmountCents),
|
||||
startText: formatTime(order.startAt),
|
||||
endText: formatTime(order.endAt),
|
||||
}
|
||||
}
|
||||
|
||||
function formatTime(value) {
|
||||
const date = new Date(value)
|
||||
const pad = (input) => String(input).padStart(2, '0')
|
||||
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"navigationBarTitleText": "订单详情"
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
<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="{{order}}" class="card">
|
||||
<view class="order-title">{{order.storeName}} · {{order.roomName}}</view>
|
||||
<view class="muted">订单号:{{order.orderNo}}</view>
|
||||
<view class="muted">房间:{{order.roomNo}}</view>
|
||||
<view class="muted">开始:{{order.startText}}</view>
|
||||
<view class="muted">结束:{{order.endText}}</view>
|
||||
<view class="row">
|
||||
<text class="status">{{order.status}}</text>
|
||||
<text class="amount">{{order.totalText}}</text>
|
||||
</view>
|
||||
<view wx:if="{{order.latestPayment}}" class="muted">
|
||||
最近支付:{{order.latestPayment.provider}} / {{order.latestPayment.status}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="action-grid">
|
||||
<button loading="{{loading}}" bindtap="loadOrder">刷新</button>
|
||||
<button loading="{{loading}}" bindtap="loadCancellationQuote">取消测算</button>
|
||||
<button loading="{{loading}}" bindtap="cancelOrder">取消订单</button>
|
||||
</view>
|
||||
|
||||
<view wx:if="{{cancellation}}" class="card">
|
||||
<view class="section-title">取消测算</view>
|
||||
<view class="muted">是否允许:{{cancellation.allowed ? '允许' : '不允许'}}</view>
|
||||
<view class="muted">取消费用:{{cancellation.feeText}}</view>
|
||||
<view class="muted">预计退回:{{cancellation.refundableText}}</view>
|
||||
<view class="muted">免费取消分钟线:{{cancellation.cutoffMinutes}}</view>
|
||||
</view>
|
||||
|
||||
<view class="section-title">状态历史</view>
|
||||
<view wx:for="{{history}}" wx:key="id" class="history-item">
|
||||
<view>{{item.action}}:{{item.fromStatus || '-'}} → {{item.toStatus}}</view>
|
||||
<view class="muted">{{item.createdText}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
@@ -0,0 +1,70 @@
|
||||
.scrollarea {
|
||||
height: 100vh;
|
||||
background: #f5f6f8;
|
||||
}
|
||||
|
||||
.page {
|
||||
padding: 32rpx;
|
||||
}
|
||||
|
||||
.title {
|
||||
margin-bottom: 24rpx;
|
||||
font-size: 40rpx;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.card,
|
||||
.history-item {
|
||||
margin-top: 20rpx;
|
||||
padding: 28rpx;
|
||||
border-radius: 16rpx;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.order-title,
|
||||
.section-title {
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.muted {
|
||||
margin-top: 8rpx;
|
||||
color: #667085;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 16rpx;
|
||||
}
|
||||
|
||||
.status {
|
||||
color: #1f6feb;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.amount {
|
||||
color: #b42318;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.action-grid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 16rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
||||
.action-grid button {
|
||||
flex: 1 1 220rpx;
|
||||
}
|
||||
|
||||
.success {
|
||||
margin: 16rpx 0;
|
||||
color: #17823b;
|
||||
}
|
||||
|
||||
.error {
|
||||
margin: 16rpx 0;
|
||||
color: #c73535;
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
const { request, ensureLogin, cents } = require('../../utils/api.js')
|
||||
|
||||
Page({
|
||||
data: {
|
||||
loading: false,
|
||||
errorMessage: '',
|
||||
orders: [],
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
total: 0,
|
||||
},
|
||||
|
||||
onShow() {
|
||||
this.loadOrders()
|
||||
},
|
||||
|
||||
async loadOrders() {
|
||||
this.setData({ loading: true, errorMessage: '' })
|
||||
try {
|
||||
await ensureLogin()
|
||||
const response = await request(`/orders?page=${this.data.page}&pageSize=${this.data.pageSize}`)
|
||||
this.setData({
|
||||
orders: (response.data.items || []).map(formatOrder),
|
||||
total: response.data.total || 0,
|
||||
})
|
||||
} catch (error) {
|
||||
this.setData({ errorMessage: error.message || '订单加载失败' })
|
||||
} finally {
|
||||
this.setData({ loading: false })
|
||||
}
|
||||
},
|
||||
|
||||
openOrder(event) {
|
||||
const orderId = event.currentTarget.dataset.orderId
|
||||
if (!orderId) return
|
||||
wx.navigateTo({ url: `/pages/orders/detail?orderId=${encodeURIComponent(orderId)}` })
|
||||
},
|
||||
})
|
||||
|
||||
function formatOrder(order) {
|
||||
return {
|
||||
...order,
|
||||
totalText: cents(order.totalAmountCents),
|
||||
paidText: cents(order.paidAmountCents),
|
||||
timeText: `${formatTime(order.startAt)} 至 ${formatTime(order.endAt)}`,
|
||||
}
|
||||
}
|
||||
|
||||
function formatTime(value) {
|
||||
const date = new Date(value)
|
||||
const pad = (input) => String(input).padStart(2, '0')
|
||||
return `${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"navigationBarTitleText": "我的订单"
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
<scroll-view class="scrollarea" scroll-y type="list">
|
||||
<view class="page">
|
||||
<view class="title">我的订单</view>
|
||||
<button loading="{{loading}}" bindtap="loadOrders">刷新</button>
|
||||
<view wx:if="{{errorMessage}}" class="error">{{errorMessage}}</view>
|
||||
<view wx:if="{{!loading && orders.length === 0}}" class="empty">暂无订单</view>
|
||||
<view wx:for="{{orders}}" wx:key="id" class="order-card" bindtap="openOrder" data-order-id="{{item.id}}">
|
||||
<view class="order-title">{{item.storeName}} · {{item.roomName}}</view>
|
||||
<view class="muted">{{item.timeText}}</view>
|
||||
<view class="muted">订单号:{{item.orderNo}}</view>
|
||||
<view class="row">
|
||||
<text class="status">{{item.status}}</text>
|
||||
<text class="amount">{{item.totalText}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
@@ -0,0 +1,62 @@
|
||||
.scrollarea {
|
||||
height: 100vh;
|
||||
background: #f5f6f8;
|
||||
}
|
||||
|
||||
.page {
|
||||
padding: 32rpx;
|
||||
}
|
||||
|
||||
.title {
|
||||
margin-bottom: 24rpx;
|
||||
font-size: 40rpx;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.order-card {
|
||||
margin-top: 20rpx;
|
||||
padding: 28rpx;
|
||||
border-radius: 16rpx;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.order-card:active {
|
||||
background: #eef4ff;
|
||||
}
|
||||
|
||||
.order-title {
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.muted {
|
||||
margin-top: 8rpx;
|
||||
color: #667085;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 16rpx;
|
||||
}
|
||||
|
||||
.status {
|
||||
color: #1f6feb;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.amount {
|
||||
color: #b42318;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.error {
|
||||
margin: 20rpx 0;
|
||||
color: #c73535;
|
||||
}
|
||||
|
||||
.empty {
|
||||
padding: 80rpx 0;
|
||||
color: #888888;
|
||||
text-align: center;
|
||||
}
|
||||
@@ -113,6 +113,12 @@ Page({
|
||||
})
|
||||
},
|
||||
|
||||
openOrder(event) {
|
||||
const orderId = event.currentTarget.dataset.orderId
|
||||
if (!orderId) return
|
||||
wx.navigateTo({ url: `/pages/orders/detail?orderId=${encodeURIComponent(orderId)}` })
|
||||
},
|
||||
|
||||
pricingPayload() {
|
||||
const start = defaultStartAt()
|
||||
return {
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
<view class="result-title">订单</view>
|
||||
<view>订单编号:{{order.orderId}}</view>
|
||||
<view wx:if="{{order.reservationId}}">预占编号:{{order.reservationId}}</view>
|
||||
<button size="mini" data-order-id="{{order.orderId}}" bindtap="openOrder">查看订单</button>
|
||||
</view>
|
||||
|
||||
<view wx:if="{{payment}}" class="result-card">
|
||||
|
||||
@@ -9,7 +9,9 @@ const appJson = JSON.parse(read('miniapp/app.json'));
|
||||
for (const page of [
|
||||
'pages/index/index',
|
||||
'pages/store/detail',
|
||||
'pages/room/detail'
|
||||
'pages/room/detail',
|
||||
'pages/orders/list',
|
||||
'pages/orders/detail'
|
||||
]) {
|
||||
assert.ok(appJson.pages.includes(page), `${page} must be registered`);
|
||||
}
|
||||
@@ -41,4 +43,16 @@ for (const route of [
|
||||
assert.match(room, new RegExp(route.replace('/', '\\/')));
|
||||
}
|
||||
|
||||
const orders = read('miniapp/pages/orders/list.js')
|
||||
+ read('miniapp/pages/orders/detail.js');
|
||||
for (const route of [
|
||||
'/orders?page=',
|
||||
'/orders/${encodeURIComponent',
|
||||
'/history',
|
||||
'/cancellation-quote',
|
||||
'/cancel'
|
||||
]) {
|
||||
assert.match(orders, new RegExp(route.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||
}
|
||||
|
||||
console.log('PASS: M08-A miniapp customer pages use fixed domain and real app-api calls.');
|
||||
|
||||
Reference in New Issue
Block a user