From b07c451700b66cc4a06b132e22c9ad9d391ed3d7 Mon Sep 17 00:00:00 2001 From: Codex Date: Sat, 27 Jun 2026 16:07:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(M08-B):=20=E6=8E=A5=E5=85=A5=E4=BF=9D?= =?UTF-8?q?=E6=B4=81=E5=BE=AE=E4=BF=A1=E8=BD=AC=E8=B4=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- backend/package.json | 2 +- .../src/cleaning/cleaning-payout-service.ts | 202 ++++++++++++++++++ .../src/cleaning/cleaning-task-repository.ts | 40 +++- backend/src/config.ts | 5 +- backend/src/db/migration-runner.ts | 10 +- backend/src/payments/wechat-pay-client.ts | 56 ++++- backend/src/routes/cleaning.ts | 44 +++- backend/src/server.ts | 9 + .../tests/cleaning-payout-service.test.mjs | 177 +++++++++++++++ backend/tests/cleaning-route.test.mjs | 22 ++ backend/tests/migration-contract.test.mjs | 10 + backend/tests/migration-runner.test.mjs | 3 +- backend/tests/wechat-pay.test.mjs | 23 +- ...2729_m08b_cleaning_transfer_state.down.sql | 7 + ...062729_m08b_cleaning_transfer_state.up.sql | 7 + ...29_m08b_cleaning_transfer_state.verify.sql | 16 ++ .../2026-06-25-M08-B-cleaning.md | 8 + .../db-changelog/2026-06-25-M08-B-cleaning.md | 11 + docs/devlogs/2026-06-25-M08-B-保洁端.md | 20 +- docs/feature-status.md | 6 +- docs/module-status.md | 8 +- 22 files changed, 663 insertions(+), 27 deletions(-) create mode 100644 backend/src/cleaning/cleaning-payout-service.ts create mode 100644 backend/tests/cleaning-payout-service.test.mjs create mode 100644 database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql create mode 100644 database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql create mode 100644 database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql diff --git a/README.md b/README.md index dab8f00..9e64b06 100644 --- a/README.md +++ b/README.md @@ -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-B`（PARTIAL） -- 最近工程提交：本轮 `M08-B` 发放增量，补保洁结算发放成功标记和发放失败记录。 -- 下一工程目标：继续 M08-B，补真实微信零钱/企业付款适配器和管理界面。 +- 最近工程提交：本轮 `M08-B` 微信转账适配增量，补保洁结算微信商家转账请求、转账中间态落库和非生产 Mock 门禁。 +- 下一工程目标：继续 M08-B，补微信转账回调/轮询闭环、真实商户场景报备联调和管理界面。 ## 版本递进 diff --git a/backend/package.json b/backend/package.json index f1d7e02..4cb64b8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -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-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 && node tests/cleaning-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 && node tests/cleaning-payout-service.test.mjs && node tests/cleaning-route.test.mjs" }, "dependencies": { "@fastify/cors": "^11.2.0", diff --git a/backend/src/cleaning/cleaning-payout-service.ts b/backend/src/cleaning/cleaning-payout-service.ts new file mode 100644 index 0000000..8ef275d --- /dev/null +++ b/backend/src/cleaning/cleaning-payout-service.ts @@ -0,0 +1,202 @@ +import type { RowDataPacket } from 'mysql2/promise'; +import type { MySqlPool } from '../db/mysql.js'; +import { + WechatPayClient, + WechatPayError, + type WechatPayCredential +} from '../payments/wechat-pay-client.js'; +import { + CleaningTaskError, + type CleaningActor, + type CleaningTaskRepository +} from './cleaning-task-repository.js'; + +interface SettlementPayoutRow extends RowDataPacket { + id: string; + settlementNo: string; + cleanerUserId: string; + storeId: string | null; + status: 'DRAFT' | 'CONFIRMED' | 'PAID' | 'CANCELLED'; + totalRewardCents: number; + payoutReference: string; + payoutState: string; +} + +interface AccountRow extends RowDataPacket { + id: string; + platformAppId: string | null; + storeId: string | null; + merchantId: string; + credentialRef: string; + authorizationStatus: string; +} + +interface IdentityRow extends RowDataPacket { + openid: string; +} + +export class CleaningPayoutError extends Error { + constructor(public readonly code: string, message = code) { + super(message); + } +} + +export class CleaningPayoutService { + constructor( + private readonly pool: MySqlPool, + private readonly repository: Pick, + private readonly client: WechatPayClient, + private readonly credentials: ReadonlyMap, + private readonly mockEnabled: boolean + ) {} + + async executeWechatTransfer(input: CleaningActor & { + settlementId: string; + mode: 'API' | 'MOCK'; + note?: string; + }) { + const settlement = await this.loadSettlement(input.tenantId, input.settlementId); + if (settlement.status === 'PAID') { + return { settlement, idempotent: true, transferState: 'SUCCESS' }; + } + if (settlement.status !== 'CONFIRMED') { + throw new CleaningPayoutError('CLEANING_PAYOUT_SETTLEMENT_NOT_CONFIRMED'); + } + if (Number(settlement.totalRewardCents) <= 0) { + throw new CleaningPayoutError('CLEANING_PAYOUT_AMOUNT_INVALID'); + } + if (input.mode === 'MOCK' && !this.mockEnabled) { + throw new CleaningPayoutError('CLEANING_PAYOUT_MOCK_DISABLED'); + } + const account = await this.resolveCollectionAccount(input.tenantId, settlement.storeId); + if (account.authorizationStatus !== 'AUTHORIZED') { + throw new CleaningPayoutError('CLEANING_PAYOUT_ACCOUNT_NOT_AUTHORIZED'); + } + const credential = this.resolveCredential(account.credentialRef); + if (!credential) throw new CleaningPayoutError('WECHAT_CREDENTIAL_NOT_CONFIGURED'); + if (credential.merchantId !== account.merchantId) { + throw new CleaningPayoutError('CLEANING_PAYOUT_MERCHANT_MISMATCH'); + } + const outBillNo = normalizeOutBillNo(settlement.settlementNo, settlement.id); + if (input.mode === 'MOCK') { + const paid = await this.repository.markSettlementPaid({ + ...input, + payoutChannel: 'WECHAT_TRANSFER_MOCK', + payoutReference: outBillNo, + note: input.note + }); + return { settlement: paid, idempotent: false, transferState: 'SUCCESS' }; + } + const openid = await this.resolveCleanerOpenid( + input.tenantId, + account.platformAppId, + settlement.cleanerUserId + ); + const sceneId = credential.transferSceneId; + if (!sceneId) throw new CleaningPayoutError('WECHAT_TRANSFER_SCENE_NOT_CONFIGURED'); + try { + const result = await this.client.createMerchantTransfer(credential, { + outBillNo, + openid, + amountCents: Number(settlement.totalRewardCents), + remark: `Cleaning settlement ${settlement.id}`, + sceneId, + notifyUrl: credential.transferNotifyUrl || undefined, + reportInfos: credential.transferSceneReportInfos ?? [] + }); + if (result.state === 'SUCCESS') { + const paid = await this.repository.markSettlementPaid({ + ...input, + payoutChannel: 'WECHAT_TRANSFER', + payoutReference: result.transferBillNo || result.outBillNo, + note: input.note + }); + return { settlement: paid, idempotent: false, transferState: result.state }; + } + if (result.state === 'FAIL') { + const failed = await this.repository.recordSettlementPayoutFailure({ + ...input, + payoutChannel: 'WECHAT_TRANSFER', + payoutReference: result.transferBillNo || result.outBillNo, + error: result.failReason || 'WECHAT_TRANSFER_FAILED', + note: input.note + }); + return { settlement: failed, idempotent: false, transferState: result.state }; + } + const pending = await this.repository.recordSettlementPayoutPending({ + ...input, + payoutChannel: 'WECHAT_TRANSFER', + payoutReference: result.transferBillNo || result.outBillNo, + payoutState: result.state, + payoutPackageInfo: result.packageInfo, + note: input.note + }); + return { settlement: pending, idempotent: false, transferState: result.state }; + } catch (error) { + if (error instanceof WechatPayError) { + await this.repository.recordSettlementPayoutFailure({ + ...input, + payoutChannel: 'WECHAT_TRANSFER', + payoutReference: outBillNo, + error: error.code, + note: input.note + }); + } + throw error; + } + } + + private async loadSettlement(tenantId: string, settlementId: string) { + const [rows] = await this.pool.execute( + `SELECT id, settlement_no AS settlementNo, cleaner_user_id AS cleanerUserId, + store_id AS storeId, status, total_reward_cents AS totalRewardCents, + payout_reference AS payoutReference, payout_state AS payoutState + FROM qipai_cleaning_settlements + WHERE tenant_id = ? AND id = ? AND deleted_at IS NULL LIMIT 1`, + [tenantId, settlementId] + ); + if (!rows[0]) throw new CleaningTaskError('CLEANING_SETTLEMENT_NOT_FOUND'); + return rows[0]; + } + + private async resolveCollectionAccount(tenantId: string, storeId: string | null) { + const [rows] = await this.pool.execute( + `SELECT id, platform_app_id AS platformAppId, store_id AS storeId, + merchant_id AS merchantId, credential_ref AS credentialRef, + authorization_status AS authorizationStatus + FROM qipai_collection_accounts + WHERE tenant_id = ? AND provider = 'WECHAT' AND enabled = 1 + AND (store_id IS NULL OR store_id <=> ?) + ORDER BY (store_id IS NOT NULL) DESC, id DESC LIMIT 1`, + [tenantId, storeId] + ); + if (!rows[0]) throw new CleaningPayoutError('CLEANING_PAYOUT_ACCOUNT_NOT_FOUND'); + return rows[0]; + } + + private async resolveCleanerOpenid(tenantId: string, platformAppId: string | null, cleanerUserId: string) { + const params: Array = [tenantId, cleanerUserId]; + const platformFilter = platformAppId ? 'AND platform_app_id = ?' : ''; + if (platformAppId) params.push(platformAppId); + const [rows] = await this.pool.execute( + `SELECT openid FROM qipai_user_identities + WHERE tenant_id = ? AND user_id = ? AND provider = 'WECHAT_MINIAPP' + AND deleted_at IS NULL ${platformFilter} + ORDER BY updated_at DESC, id DESC LIMIT 1`, + params + ); + if (!rows[0]?.openid) throw new CleaningPayoutError('WECHAT_OPENID_NOT_FOUND'); + return rows[0].openid; + } + + private resolveCredential(reference: string) { + return this.credentials.get(reference) + ?? this.credentials.get(reference.replace(/^env:/, '')); + } +} + +function normalizeOutBillNo(settlementNo: string, settlementId: string) { + const normalized = settlementNo.replace(/[^A-Za-z0-9_-]/g, ''); + return (normalized || `CLP${settlementId}`).slice(0, 32); +} diff --git a/backend/src/cleaning/cleaning-task-repository.ts b/backend/src/cleaning/cleaning-task-repository.ts index 37316ba..c472fd0 100644 --- a/backend/src/cleaning/cleaning-task-repository.ts +++ b/backend/src/cleaning/cleaning-task-repository.ts @@ -7,6 +7,7 @@ export const cleaningTaskStatuses = [ 'REJECTED', 'EXEMPT', 'SETTLED', 'CANCELLED' ] as const; export type CleaningTaskStatus = typeof cleaningTaskStatuses[number]; +export type CleaningSettlementStatus = 'DRAFT' | 'CONFIRMED' | 'PAID' | 'CANCELLED'; export class CleaningTaskError extends Error { constructor(public readonly code: string) { super(code); } @@ -79,7 +80,7 @@ interface SettlementRow extends RowDataPacket { cleanerName: string; storeId: string | null; storeName: string | null; - status: 'DRAFT' | 'CONFIRMED' | 'PAID' | 'CANCELLED'; + status: CleaningSettlementStatus; taskCount: number; totalRewardCents: number; periodStart: Date | null; @@ -89,6 +90,8 @@ interface SettlementRow extends RowDataPacket { paidAt: Date | null; payoutChannel: string; payoutReference: string; + payoutState: string; + payoutPackageInfo: string; payoutError: string; note: string; createdAt: Date; @@ -321,7 +324,7 @@ export class CleaningTaskRepository { } async listSettlements(input: CleaningActor & { - page: number; pageSize: number; status?: 'DRAFT' | 'CONFIRMED' | 'PAID' | 'CANCELLED'; + page: number; pageSize: number; status?: CleaningSettlementStatus; }) { this.assertSettlement(input.access, 'read'); const where = [ @@ -348,6 +351,7 @@ export class CleaningTaskRepository { s.period_start AS periodStart, s.period_end AS periodEnd, s.paid_by AS paidBy, s.confirmed_at AS confirmedAt, s.paid_at AS paidAt, s.payout_channel AS payoutChannel, s.payout_reference AS payoutReference, + s.payout_state AS payoutState, s.payout_package_info AS payoutPackageInfo, s.payout_error AS payoutError, s.note, s.created_at AS createdAt FROM qipai_cleaning_settlements s @@ -478,7 +482,8 @@ export class CleaningTaskRepository { const [result] = await connection.execute( `UPDATE qipai_cleaning_settlements s SET s.status = 'PAID', s.paid_by = ?, s.paid_at = UTC_TIMESTAMP(3), - s.payout_channel = ?, s.payout_reference = ?, s.payout_error = '', + s.payout_channel = ?, s.payout_reference = ?, s.payout_state = 'SUCCESS', + s.payout_package_info = '', s.payout_error = '', s.note = CASE WHEN ? = '' THEN s.note ELSE ? END WHERE s.tenant_id = ? AND s.id = ? AND s.status = 'CONFIRMED' AND s.deleted_at IS NULL AND ${storeScopeSql(input.access, 'COALESCE(s.store_id, 0)')}`, @@ -501,7 +506,7 @@ export class CleaningTaskRepository { `UPDATE qipai_cleaning_settlements s SET s.payout_channel = CASE WHEN ? = '' THEN s.payout_channel ELSE ? END, s.payout_reference = CASE WHEN ? = '' THEN s.payout_reference ELSE ? END, - s.payout_error = ?, + s.payout_state = 'FAIL', s.payout_package_info = '', s.payout_error = ?, s.note = CASE WHEN ? = '' THEN s.note ELSE ? END WHERE s.tenant_id = ? AND s.id = ? AND s.status = 'CONFIRMED' AND s.deleted_at IS NULL AND ${storeScopeSql(input.access, 'COALESCE(s.store_id, 0)')}`, @@ -517,6 +522,30 @@ export class CleaningTaskRepository { }); } + async recordSettlementPayoutPending(input: CleaningActor & { + settlementId: string; payoutChannel: string; payoutReference: string; + payoutState: string; payoutPackageInfo?: string; note?: string; + }) { + this.assertSettlement(input.access, 'write'); + return this.transaction(async (connection) => { + const [result] = await connection.execute( + `UPDATE qipai_cleaning_settlements s + SET s.payout_channel = ?, s.payout_reference = ?, s.payout_state = ?, + s.payout_package_info = ?, s.payout_error = '', + s.note = CASE WHEN ? = '' THEN s.note ELSE ? END + WHERE s.tenant_id = ? AND s.id = ? AND s.status = 'CONFIRMED' AND s.deleted_at IS NULL + AND ${storeScopeSql(input.access, 'COALESCE(s.store_id, 0)')}`, + [ + input.payoutChannel, input.payoutReference, input.payoutState.slice(0, 32), + (input.payoutPackageInfo ?? '').slice(0, 1024), + input.note ?? '', input.note ?? '', input.tenantId, input.settlementId + ] + ); + if (result.affectedRows !== 1) throw new CleaningTaskError('CLEANING_SETTLEMENT_STATUS_CONFLICT'); + return this.getSettlement(connection, input.tenantId, input.settlementId); + }); + } + async reclaimTimeouts(input: CleaningActor & { olderThanMinutes: number; limit: number }) { this.assertCleaner(input.access, 'write'); const [rows] = await this.pool.execute( @@ -921,6 +950,7 @@ export class CleaningTaskRepository { s.period_start AS periodStart, s.period_end AS periodEnd, s.paid_by AS paidBy, s.confirmed_at AS confirmedAt, s.paid_at AS paidAt, s.payout_channel AS payoutChannel, s.payout_reference AS payoutReference, + s.payout_state AS payoutState, s.payout_package_info AS payoutPackageInfo, s.payout_error AS payoutError, s.note, s.created_at AS createdAt FROM qipai_cleaning_settlements s @@ -1017,6 +1047,8 @@ function publicSettlement(row: SettlementRow) { paidAt: row.paidAt, payoutChannel: row.payoutChannel, payoutReference: row.payoutReference, + payoutState: row.payoutState, + payoutPackageInfo: row.payoutPackageInfo, payoutError: row.payoutError, note: row.note, createdAt: row.createdAt diff --git a/backend/src/config.ts b/backend/src/config.ts index 9e676c6..f0c89ab 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -19,6 +19,7 @@ const configSchema = z.object({ QIPAI_TEST_PAYMENT_ENABLED: z.enum(['true', 'false']).default('false'), QIPAI_WECHAT_PAY_CREDENTIALS: z.string().default('{}'), QIPAI_PROFIT_SHARE_MOCK_ENABLED: z.enum(['true', 'false']).default('false'), + QIPAI_CLEANING_PAYOUT_MOCK_ENABLED: z.enum(['true', 'false']).default('false'), QIPAI_THIRD_PARTY_CREDENTIALS: z.string().default('{}'), QIPAI_MQTT_URL: z.string().url().default('mqtt://101.42.38.246:1883'), QIPAI_MQTT_CLIENT_ID: z.string().min(1).max(128).default('qipai-backend'), @@ -74,7 +75,9 @@ export function loadConfig(env: NodeJS.ProcessEnv = process.env) { && parsed.QIPAI_TEST_PAYMENT_ENABLED === 'true', wechatCredentialsJson: parsed.QIPAI_WECHAT_PAY_CREDENTIALS, profitShareMockEnabled: parsed.NODE_ENV !== 'production' - && parsed.QIPAI_PROFIT_SHARE_MOCK_ENABLED === 'true' + && parsed.QIPAI_PROFIT_SHARE_MOCK_ENABLED === 'true', + cleaningPayoutMockEnabled: parsed.NODE_ENV !== 'production' + && parsed.QIPAI_CLEANING_PAYOUT_MOCK_ENABLED === 'true' }, thirdParty: { credentialsJson: parsed.QIPAI_THIRD_PARTY_CREDENTIALS diff --git a/backend/src/db/migration-runner.ts b/backend/src/db/migration-runner.ts index 5148b2b..3e8d97f 100644 --- a/backend/src/db/migration-runner.ts +++ b/backend/src/db/migration-runner.ts @@ -48,7 +48,8 @@ const migrationFiles: Record = { 'database/migrations/2026062525_m08b_cleaner_tasks.up.sql', 'database/migrations/2026062626_m08b_cleaning_settlements.up.sql', 'database/migrations/2026062627_m08b_cleaning_collaboration.up.sql', - 'database/migrations/2026062728_m08b_cleaning_payouts.up.sql' + 'database/migrations/2026062728_m08b_cleaning_payouts.up.sql', + 'database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql' ], verify: [ 'database/migrations/2026061601_m01b_core_schema.verify.sql', @@ -78,9 +79,11 @@ const migrationFiles: Record = { 'database/migrations/2026062525_m08b_cleaner_tasks.verify.sql', 'database/migrations/2026062626_m08b_cleaning_settlements.verify.sql', 'database/migrations/2026062627_m08b_cleaning_collaboration.verify.sql', - 'database/migrations/2026062728_m08b_cleaning_payouts.verify.sql' + 'database/migrations/2026062728_m08b_cleaning_payouts.verify.sql', + 'database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql' ], down: [ + 'database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql', 'database/migrations/2026062728_m08b_cleaning_payouts.down.sql', 'database/migrations/2026062627_m08b_cleaning_collaboration.down.sql', 'database/migrations/2026062626_m08b_cleaning_settlements.down.sql', @@ -251,7 +254,8 @@ export async function executeMigrationPlan( 2, 8, 4, 3, 1, 2, 9, 5, 2, 1, 1, 7, 5, 1, - 4, 1, 1, 1 + 4, 1, 1, 1, + 2, 1, 1 ][index] ?? 1; if (!Array.isArray(result) || result.length < minimumRows) { throw new Error( diff --git a/backend/src/payments/wechat-pay-client.ts b/backend/src/payments/wechat-pay-client.ts index f88a567..501a0fc 100644 --- a/backend/src/payments/wechat-pay-client.ts +++ b/backend/src/payments/wechat-pay-client.ts @@ -10,6 +10,9 @@ export interface WechatPayCredential { apiV3Key: string; platformCertificates: Record; profitShareReceivers?: Record; + transferSceneId?: string; + transferSceneReportInfos?: Array<{ infoType: string; infoContent: string }>; + transferNotifyUrl?: string; } export interface WechatPayTransport { @@ -173,6 +176,40 @@ export class WechatPayClient { }); } + async createMerchantTransfer( + credential: WechatPayCredential, + input: { + outBillNo: string; + openid: string; + amountCents: number; + remark: string; + sceneId: string; + notifyUrl?: string; + reportInfos: Array<{ infoType: string; infoContent: string }>; + } + ) { + const result = await this.apiRequest(credential, 'POST', '/v3/fund-app/mch-transfer/transfer-bills', { + appid: credential.appId, + out_bill_no: input.outBillNo, + transfer_scene_id: input.sceneId, + openid: input.openid, + transfer_amount: input.amountCents, + transfer_remark: input.remark.slice(0, 32), + notify_url: input.notifyUrl, + transfer_scene_report_infos: input.reportInfos.length > 0 ? input.reportInfos.map((item) => ({ + info_type: item.infoType.slice(0, 15), + info_content: item.infoContent.slice(0, 32) + })) : undefined + }); + return { + outBillNo: stringField(result, 'out_bill_no'), + transferBillNo: optionalStringField(result, 'transfer_bill_no'), + state: stringField(result, 'state'), + failReason: optionalStringField(result, 'fail_reason'), + packageInfo: optionalStringField(result, 'package_info') + }; + } + verifyAndDecrypt( credential: WechatPayCredential, headers: WechatNotificationHeaders, @@ -279,7 +316,10 @@ export function parseWechatPayCredentials(value: string) { } return [reference, account]; }) - ) : {} + ) : {}, + transferSceneId: optionalStringField(item, 'transferSceneId'), + transferSceneReportInfos: parseTransferReportInfos(item.transferSceneReportInfos), + transferNotifyUrl: optionalStringField(item, 'transferNotifyUrl') }); } return credentials; @@ -327,3 +367,17 @@ function optionalStringField(value: Record, key: string) { const field = value[key]; return typeof field === 'string' ? field : ''; } + +function parseTransferReportInfos(value: unknown) { + if (!Array.isArray(value)) return undefined; + return value.map((item) => { + if (!item || typeof item !== 'object' || Array.isArray(item)) { + throw new WechatPayError('WECHAT_TRANSFER_REPORT_INVALID'); + } + const raw = item as Record; + return { + infoType: stringField(raw, 'infoType'), + infoContent: stringField(raw, 'infoContent') + }; + }); +} diff --git a/backend/src/routes/cleaning.ts b/backend/src/routes/cleaning.ts index 3af612f..e7b94b4 100644 --- a/backend/src/routes/cleaning.ts +++ b/backend/src/routes/cleaning.ts @@ -10,6 +10,11 @@ import { type CleaningActor, type CleaningTaskRepository } from '../cleaning/cleaning-task-repository.js'; +import { + CleaningPayoutError, + type CleaningPayoutService +} from '../cleaning/cleaning-payout-service.js'; +import { WechatPayError } from '../payments/wechat-pay-client.js'; const listSchema = z.object({ page: z.coerce.number().int().min(1).default(1), @@ -65,6 +70,10 @@ const settlementPayoutFailureSchema = z.object({ error: z.string().trim().min(1).max(512), note: z.string().trim().max(512).optional() }).strict(); +const settlementWechatTransferSchema = z.object({ + mode: z.enum(['API', 'MOCK']).default('API'), + note: z.string().trim().max(512).optional() +}).strict(); const reclaimSchema = z.object({ olderThanMinutes: z.coerce.number().int().min(5).max(1440).default(60), limit: z.coerce.number().int().min(1).max(100).default(20) @@ -78,6 +87,7 @@ export interface CleaningRouteOptions { | 'recordSettlementPayoutFailure' | 'reclaimTimeouts' | 'assertCanUploadPhoto' | 'stats'>; mediaStorage?: MediaStorage; + payoutService?: Pick; authRepository: Pick; accessControl: { getAccessProfile(tenantId: string, userId: string): Promise }; jwtSecret: string; @@ -424,6 +434,29 @@ export async function registerCleaningRoutes( traceId: request.traceId })); }); + + app.post('/admin-api/cleaning/settlements/:settlementId/wechat-transfer', async (request, reply) => { + if (!options.payoutService) return reply.status(501).send({ + code: 'CLEANING_PAYOUT_UNAVAILABLE', + message: 'Cleaning payout service is not configured.', + traceId: request.traceId + }); + const actor = await requireActor(request, reply, options, 'write'); + if (!actor) return; + const params = settlementParamsSchema.safeParse(request.params); + const body = settlementWechatTransferSchema.safeParse(request.body ?? {}); + if (!params.success || !body.success) return invalid(reply, request.traceId); + return handle(reply, request.traceId, async () => ({ + code: 0, + data: await options.payoutService!.executeWechatTransfer({ + ...actor, + settlementId: params.data.settlementId, + mode: body.data.mode, + note: body.data.note + }), + traceId: request.traceId + })); + }); } async function requireActor( @@ -474,11 +507,14 @@ async function handle(reply: FastifyReply, traceId: string, work: () => Promise< traceId }); } - if (!(error instanceof CleaningTaskError)) throw error; - const statusCode = error.code === 'CLEANING_TASK_FORBIDDEN' - || error.code === 'CLEANING_SETTLEMENT_FORBIDDEN' ? 403 : 409; + if (!(error instanceof CleaningTaskError) + && !(error instanceof CleaningPayoutError) + && !(error instanceof WechatPayError)) throw error; + const code = error.code; + const statusCode = code === 'CLEANING_TASK_FORBIDDEN' + || code === 'CLEANING_SETTLEMENT_FORBIDDEN' ? 403 : 409; return reply.status(statusCode).send({ - code: error.code, + code, message: 'The cleaning task request cannot be completed.', traceId }); diff --git a/backend/src/server.ts b/backend/src/server.ts index e163290..f8e6614 100644 --- a/backend/src/server.ts +++ b/backend/src/server.ts @@ -38,6 +38,7 @@ import { RechargeService } from './wallets/recharge-service.js'; import { WalletLedgerService } from './wallets/wallet-ledger-service.js'; import { MarketingBenefitService } from './wallets/marketing-benefit-service.js'; import { CleaningTaskRepository } from './cleaning/cleaning-task-repository.js'; +import { CleaningPayoutService } from './cleaning/cleaning-payout-service.js'; const config = loadConfig(); const pool = createMySqlPool(config); @@ -50,6 +51,13 @@ const cleaningTaskRepository = new CleaningTaskRepository(pool); const paymentRepository = new PaymentRepository(pool, walletLedgerService, marketingBenefits); const wechatCredentials = parseWechatPayCredentials(config.payment.wechatCredentialsJson); const wechatPayClient = new WechatPayClient(new FetchWechatPayTransport()); +const cleaningPayoutService = new CleaningPayoutService( + pool, + cleaningTaskRepository, + wechatPayClient, + wechatCredentials, + config.payment.cleaningPayoutMockEnabled +); const thirdPartyCredentials = parseThirdPartyCredentials(config.thirdParty.credentialsJson); const iotMessages = new IotMessageService(pool); const mqtt = new MqttService(config.mqtt, undefined, (topic, payload) => @@ -189,6 +197,7 @@ const app = await buildApp({ }, cleaning: { repository: cleaningTaskRepository, + payoutService: cleaningPayoutService, mediaStorage: new MediaStorage(resolve(process.cwd(), 'shared', 'uploads')), authRepository, accessControl, diff --git a/backend/tests/cleaning-payout-service.test.mjs b/backend/tests/cleaning-payout-service.test.mjs new file mode 100644 index 0000000..4331ce1 --- /dev/null +++ b/backend/tests/cleaning-payout-service.test.mjs @@ -0,0 +1,177 @@ +import assert from 'node:assert/strict'; +import { loadConfig } from '../dist/config.js'; +import { + CleaningPayoutError, + CleaningPayoutService +} from '../dist/cleaning/cleaning-payout-service.js'; + +assert.equal(loadConfig({ + NODE_ENV: 'production', + QIPAI_MQTT_USERNAME: 'backend-test', + QIPAI_MQTT_PASSWORD: 'not-a-real-secret', + QIPAI_JWT_SECRET: 'production-cleaning-payout-secret-long-enough', + QIPAI_CLEANING_PAYOUT_MOCK_ENABLED: 'true' +}).payment.cleaningPayoutMockEnabled, false); +assert.equal(loadConfig({ + NODE_ENV: 'test', + QIPAI_CLEANING_PAYOUT_MOCK_ENABLED: 'true' +}).payment.cleaningPayoutMockEnabled, true); + +const actor = { + tenantId: '7', + userId: '21', + access: { roles: ['TENANT_ADMIN'], capabilities: ['tenant.manage'], storeIds: [] }, + traceId: 'cleaning-payout-test' +}; + +{ + const harness = createHarness({ transferState: 'SUCCESS' }); + const result = await harness.service.executeWechatTransfer({ + ...actor, + settlementId: '501', + mode: 'API' + }); + assert.equal(result.transferState, 'SUCCESS'); + assert.equal(harness.repository.paid[0].payoutChannel, 'WECHAT_TRANSFER'); + assert.equal(harness.state.transferInput.amountCents, 1200); + assert.equal(harness.state.transferInput.openid, 'openid-cleaner'); +} + +{ + const harness = createHarness({ transferState: 'WAIT_USER_CONFIRM', packageInfo: 'package-info' }); + const result = await harness.service.executeWechatTransfer({ + ...actor, + settlementId: '501', + mode: 'API', + note: 'need user confirm' + }); + assert.equal(result.transferState, 'WAIT_USER_CONFIRM'); + assert.equal(harness.repository.pending[0].payoutState, 'WAIT_USER_CONFIRM'); + assert.equal(harness.repository.pending[0].payoutPackageInfo, 'package-info'); + assert.equal(harness.repository.paid.length, 0); +} + +{ + const harness = createHarness({ transferState: 'FAIL', failReason: 'REAL_NAME_CHECK_FAILED' }); + const result = await harness.service.executeWechatTransfer({ + ...actor, + settlementId: '501', + mode: 'API' + }); + assert.equal(result.transferState, 'FAIL'); + assert.equal(harness.repository.failures[0].error, 'REAL_NAME_CHECK_FAILED'); +} + +{ + const harness = createHarness({ mockEnabled: true }); + const result = await harness.service.executeWechatTransfer({ + ...actor, + settlementId: '501', + mode: 'MOCK' + }); + assert.equal(result.transferState, 'SUCCESS'); + assert.equal(harness.repository.paid[0].payoutChannel, 'WECHAT_TRANSFER_MOCK'); +} + +{ + const harness = createHarness({ mockEnabled: false }); + await assert.rejects( + () => harness.service.executeWechatTransfer({ + ...actor, + settlementId: '501', + mode: 'MOCK' + }), + (error) => error instanceof CleaningPayoutError + && error.code === 'CLEANING_PAYOUT_MOCK_DISABLED' + ); +} + +function createHarness(options = {}) { + const state = { + transferInput: null, + settlement: { + id: '501', + settlementNo: 'CLS-20260627-501', + cleanerUserId: '31', + storeId: '11', + status: options.status ?? 'CONFIRMED', + totalRewardCents: 1200, + payoutReference: '', + payoutState: '' + }, + account: { + id: '41', + platformAppId: '9', + storeId: '11', + merchantId: '1900000109', + credentialRef: 'wechat-cleaning', + authorizationStatus: options.authorizationStatus ?? 'AUTHORIZED' + } + }; + const pool = { + async execute(sql) { + if (sql.includes('FROM qipai_cleaning_settlements')) { + return [[state.settlement], []]; + } + if (sql.includes('FROM qipai_collection_accounts')) { + return [[state.account], []]; + } + if (sql.includes('FROM qipai_user_identities')) { + return [[{ openid: 'openid-cleaner' }], []]; + } + throw new Error(`Unexpected SQL: ${sql}`); + } + }; + const repository = { + paid: [], + failures: [], + pending: [], + async markSettlementPaid(input) { + this.paid.push(input); + return { ...state.settlement, status: 'PAID', payoutReference: input.payoutReference }; + }, + async recordSettlementPayoutFailure(input) { + this.failures.push(input); + return { ...state.settlement, payoutError: input.error }; + }, + async recordSettlementPayoutPending(input) { + this.pending.push(input); + return { ...state.settlement, payoutState: input.payoutState }; + } + }; + const client = { + async createMerchantTransfer(_credential, input) { + state.transferInput = input; + return { + outBillNo: input.outBillNo, + transferBillNo: 'wx-transfer-501', + state: options.transferState ?? 'SUCCESS', + failReason: options.failReason ?? '', + packageInfo: options.packageInfo ?? '' + }; + } + }; + const credential = { + appId: 'wx-test', + merchantId: '1900000109', + serialNo: 'serial', + privateKeyPem: 'private-key', + apiV3Key: '0123456789abcdef0123456789abcdef', + platformCertificates: {}, + transferSceneId: '1000', + transferSceneReportInfos: [{ infoType: '岗位类型', infoContent: '保洁员' }] + }; + return { + state, + repository, + service: new CleaningPayoutService( + pool, + repository, + client, + new Map([['wechat-cleaning', credential]]), + options.mockEnabled ?? false + ) + }; +} + +console.log('PASS: M08-B cleaning payout service handles WeChat transfer states and mock gate.'); diff --git a/backend/tests/cleaning-route.test.mjs b/backend/tests/cleaning-route.test.mjs index eebc89b..71a3535 100644 --- a/backend/tests/cleaning-route.test.mjs +++ b/backend/tests/cleaning-route.test.mjs @@ -151,6 +151,16 @@ const app = await buildApp({ return { byStatus: { SUBMITTED: 2 }, pendingSettlementCents: 1200 }; } }, + payoutService: { + async executeWechatTransfer(input) { + calls.push(['executeWechatTransfer', input]); + return { + settlement: settlementResponse(input.mode === 'MOCK' ? 'PAID' : 'CONFIRMED'), + transferState: input.mode === 'MOCK' ? 'SUCCESS' : 'WAIT_USER_CONFIRM', + idempotent: false + }; + } + }, mediaStorage: { async storeImage(input) { calls.push(['storeImage', input]); @@ -373,6 +383,18 @@ assert.equal(paidSettlement.json().data.status, 'PAID'); assert.equal(paidSettlement.json().data.payoutReference, 'wx-paid-001'); assert.equal(calls.at(-1)[0], 'markSettlementPaid'); +const wechatTransfer = await app.inject({ + method: 'POST', + url: '/admin-api/cleaning/settlements/501/wechat-transfer', + headers: { authorization: `Bearer ${token}` }, + payload: { mode: 'API', note: 'wechat transfer' } +}); +assert.equal(wechatTransfer.statusCode, 200); +assert.equal(wechatTransfer.json().data.transferState, 'WAIT_USER_CONFIRM'); +assert.equal(calls.at(-1)[0], 'executeWechatTransfer'); +assert.equal(calls.at(-1)[1].settlementId, '501'); +assert.equal(calls.at(-1)[1].mode, 'API'); + const reclaimed = await app.inject({ method: 'POST', url: '/admin-api/cleaning/reclaim-timeouts', diff --git a/backend/tests/migration-contract.test.mjs b/backend/tests/migration-contract.test.mjs index 3c3cdf8..0a687d1 100644 --- a/backend/tests/migration-contract.test.mjs +++ b/backend/tests/migration-contract.test.mjs @@ -93,6 +93,9 @@ const cleaningCollaborationVerifySql = read('database/migrations/2026062627_m08b const cleaningPayoutUpSql = read('database/migrations/2026062728_m08b_cleaning_payouts.up.sql'); const cleaningPayoutDownSql = read('database/migrations/2026062728_m08b_cleaning_payouts.down.sql'); const cleaningPayoutVerifySql = read('database/migrations/2026062728_m08b_cleaning_payouts.verify.sql'); +const cleaningTransferStateUpSql = read('database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql'); +const cleaningTransferStateDownSql = read('database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql'); +const cleaningTransferStateVerifySql = read('database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql'); const coreTables = [ 'qipai_schema_migrations', @@ -440,4 +443,11 @@ assert.match(cleaningPayoutDownSql, /DROP COLUMN payout_error/); assert.match(cleaningPayoutVerifySql, /'payout_reference'/); assert.match(cleaningPayoutVerifySql, /'2026062728'/); +assert.match(cleaningTransferStateUpSql, /ADD COLUMN payout_state VARCHAR\(32\) NOT NULL DEFAULT ''/); +assert.match(cleaningTransferStateUpSql, /ADD COLUMN payout_package_info VARCHAR\(1024\) NOT NULL DEFAULT ''/); +assert.match(cleaningTransferStateUpSql, /idx_qipai_cleaning_settlement_transfer_state/); +assert.match(cleaningTransferStateDownSql, /DROP COLUMN payout_package_info/); +assert.match(cleaningTransferStateVerifySql, /'payout_state'/); +assert.match(cleaningTransferStateVerifySql, /'2026062729'/); + console.log('PASS: M01-B through M08-B migration contracts are present.'); diff --git a/backend/tests/migration-runner.test.mjs b/backend/tests/migration-runner.test.mjs index b95e29d..18c8c20 100644 --- a/backend/tests/migration-runner.test.mjs +++ b/backend/tests/migration-runner.test.mjs @@ -38,7 +38,8 @@ assert.match(plan.file, /2026062524_m08a_recharge_wechat\.up\.sql/); assert.match(plan.file, /2026062525_m08b_cleaner_tasks\.up\.sql/); assert.match(plan.file, /2026062626_m08b_cleaning_settlements\.up\.sql/); assert.match(plan.file, /2026062627_m08b_cleaning_collaboration\.up\.sql/); -assert.match(plan.file, /2026062728_m08b_cleaning_payouts\.up\.sql$/); +assert.match(plan.file, /2026062728_m08b_cleaning_payouts\.up\.sql/); +assert.match(plan.file, /2026062729_m08b_cleaning_transfer_state\.up\.sql$/); assert.match(plan.checksum, /^[a-f0-9]{64}$/); assert.ok(plan.statements.length >= 11); diff --git a/backend/tests/wechat-pay.test.mjs b/backend/tests/wechat-pay.test.mjs index c51d4c9..b235e6f 100644 --- a/backend/tests/wechat-pay.test.mjs +++ b/backend/tests/wechat-pay.test.mjs @@ -29,7 +29,13 @@ const responses = [ { prepay_id: 'wx-prepay-test' }, { trade_state: 'SUCCESS', transaction_id: 'wx-transaction-test' }, { refund_id: 'wx-refund-test', status: 'PROCESSING' }, - { download_url: 'https://api.mch.weixin.qq.com/v3/billdownload/file?token=sanitized' } + { download_url: 'https://api.mch.weixin.qq.com/v3/billdownload/file?token=sanitized' }, + { + out_bill_no: 'CLP501', + transfer_bill_no: 'wx-transfer-501', + state: 'WAIT_USER_CONFIRM', + package_info: 'package-info' + } ]; const transport = { async request(input) { @@ -73,6 +79,21 @@ assert.match((await client.downloadTradeBill( credential, '2026-06-21', 'ALL' )).download_url, /^https:/); +const transfer = await client.createMerchantTransfer(credential, { + outBillNo: 'CLP501', + openid: 'openid-sanitized', + amountCents: 800, + remark: '保洁结算501', + sceneId: '1000', + reportInfos: [{ infoType: '岗位类型', infoContent: '保洁员' }] +}); +assert.equal(transfer.state, 'WAIT_USER_CONFIRM'); +assert.equal(transfer.packageInfo, 'package-info'); +assert.match(requests[4].url, /\/v3\/fund-app\/mch-transfer\/transfer-bills$/); +assert.match(requests[4].body, /"out_bill_no":"CLP501"/); +assert.match(requests[4].body, /"transfer_amount":800/); +assert.equal(requests[4].headers.Authorization.includes(merchantKeys.privateKey), false); + const notification = encryptedNotification({ out_trade_no: 'PAY-M05B-001', transaction_id: 'wx-transaction-test', diff --git a/database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql b/database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql new file mode 100644 index 0000000..9988172 --- /dev/null +++ b/database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql @@ -0,0 +1,7 @@ +DELETE FROM qipai_schema_migrations +WHERE version = '2026062729'; + +ALTER TABLE qipai_cleaning_settlements + DROP INDEX idx_qipai_cleaning_settlement_transfer_state, + DROP COLUMN payout_package_info, + DROP COLUMN payout_state; diff --git a/database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql b/database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql new file mode 100644 index 0000000..03abc84 --- /dev/null +++ b/database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql @@ -0,0 +1,7 @@ +ALTER TABLE qipai_cleaning_settlements + ADD COLUMN payout_state VARCHAR(32) NOT NULL DEFAULT '' AFTER payout_reference, + ADD COLUMN payout_package_info VARCHAR(1024) NOT NULL DEFAULT '' AFTER payout_state, + ADD KEY idx_qipai_cleaning_settlement_transfer_state (tenant_id, payout_state, updated_at); + +INSERT IGNORE INTO qipai_schema_migrations (version, name) +VALUES ('2026062729', 'm08b_cleaning_transfer_state'); diff --git a/database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql b/database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql new file mode 100644 index 0000000..ee6d665 --- /dev/null +++ b/database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql @@ -0,0 +1,16 @@ +SELECT column_name +FROM information_schema.columns +WHERE table_schema = DATABASE() + AND table_name = 'qipai_cleaning_settlements' + AND column_name IN ('payout_state', 'payout_package_info'); + +SELECT index_name +FROM information_schema.statistics +WHERE table_schema = DATABASE() + AND table_name = 'qipai_cleaning_settlements' + AND index_name = 'idx_qipai_cleaning_settlement_transfer_state' +GROUP BY index_name; + +SELECT version +FROM qipai_schema_migrations +WHERE version = '2026062729'; diff --git a/docs/api-changelog/2026-06-25-M08-B-cleaning.md b/docs/api-changelog/2026-06-25-M08-B-cleaning.md index f72b879..151c52d 100644 --- a/docs/api-changelog/2026-06-25-M08-B-cleaning.md +++ b/docs/api-changelog/2026-06-25-M08-B-cleaning.md @@ -132,3 +132,11 @@ - 说明：移除未结算协作者并把剩余奖励回算到负责人；负责人不可通过该接口移除。 - `POST /admin-api/cleaning/settlements` - 追加说明：多人协作任务按 `qipai_cleaning_task_members.reward_cents` 分别为每个保洁员生成结算明细；所有有效成员均完成结算后任务才整体转为 `SETTLED`。 +## 2026-06-27 微信转账适配增量 + +- `POST /admin-api/cleaning/settlements/:settlementId/wechat-transfer` + - 登录：必须。 + - 权限：`cleaning.task.write`、`tenant.manage` 或 `PLATFORM_ADMIN`；服务层继续校验 `cleaning.settlement.write`。 + - Body：`mode?: "API" | "MOCK"`，`note?: string`。 + - 说明：对 `CONFIRMED` 保洁结算单发起微信商家转账。`API` 模式会校验门店/全局微信收款账户、商户凭据、保洁员微信 openid 和转账场景配置；`MOCK` 仅非生产环境可用。 + - 返回：成功转账直接返回 `PAID` 结算单；微信返回 `FAIL` 时记录失败原因；微信返回待确认或处理中状态时保留 `CONFIRMED`，并返回 `payoutState`、`payoutReference` 和 `payoutPackageInfo`。 diff --git a/docs/db-changelog/2026-06-25-M08-B-cleaning.md b/docs/db-changelog/2026-06-25-M08-B-cleaning.md index b88bf2d..00edbe2 100644 --- a/docs/db-changelog/2026-06-25-M08-B-cleaning.md +++ b/docs/db-changelog/2026-06-25-M08-B-cleaning.md @@ -63,3 +63,14 @@ - 新增 `payout_reference`，记录外部付款流水或人工凭证号。 - 新增 `payout_error`，记录最近一次发放失败原因，成功标记为 `PAID` 时清空。 - 新增 `idx_qipai_cleaning_settlement_payout`，支持按租户、状态和发放时间查询。 +## 2026-06-27 微信转账适配增量 + +- 新增迁移： + - `database/migrations/2026062729_m08b_cleaning_transfer_state.up.sql` + - `database/migrations/2026062729_m08b_cleaning_transfer_state.down.sql` + - `database/migrations/2026062729_m08b_cleaning_transfer_state.verify.sql` +- 调整 `qipai_cleaning_settlements`： + - 新增 `payout_state`，记录微信转账结果或中间态，例如 `SUCCESS`、`FAIL`、`WAIT_USER_CONFIRM`、`PROCESSING`。 + - 新增 `payout_package_info`，保存微信待用户确认等场景返回的 package 信息。 + - 新增 `idx_qipai_cleaning_settlement_transfer_state`，支持按租户、转账状态和更新时间筛选待跟进结算单。 +- 既有 `payout_channel`、`payout_reference`、`payout_error` 继续保存发放渠道、外部流水和最近失败原因；`PAID` 时同步将 `payout_state` 标记为 `SUCCESS`。 diff --git a/docs/devlogs/2026-06-25-M08-B-保洁端.md b/docs/devlogs/2026-06-25-M08-B-保洁端.md index 19df88e..c3dc966 100644 --- a/docs/devlogs/2026-06-25-M08-B-保洁端.md +++ b/docs/devlogs/2026-06-25-M08-B-保洁端.md @@ -50,6 +50,14 @@ - 新增 `POST /admin-api/cleaning/settlements/:settlementId/payout-failure`，仅允许对 `CONFIRMED` 结算单记录发放失败原因，保留 `CONFIRMED` 状态，支持修复外部付款后重试。 - 结算单查询返回新增发放字段，管理端后续可以直接展示发放状态、渠道流水和失败原因。 +## 2026-06-27 微信转账适配增量 + +- `WechatPayClient` 新增微信支付商家转账请求能力，按商户转账单号、转账场景、openid、金额、备注、通知地址和场景报备信息发起 `POST /v3/fund-app/mch-transfer/transfer-bills`，并解析微信转账单号、状态、失败原因和 `package_info`。 +- 新增 `CleaningPayoutService`，从结算单解析租户、门店、保洁员、金额和状态，复用门店/全局微信收款账户与环境凭据，校验商户号一致、收款账户已授权、保洁员存在微信 openid，再执行真实微信转账或测试 Mock。 +- 新增 `QIPAI_CLEANING_PAYOUT_MOCK_ENABLED`，仅非生产环境允许 Mock 发放；生产环境不会因为误配打开 Mock。 +- 新增 `2026062729_m08b_cleaning_transfer_state` 迁移，为保洁结算单增加 `payout_state` 和 `payout_package_info`，记录 `SUCCESS`、`FAIL`、`WAIT_USER_CONFIRM`、`PROCESSING` 等微信转账中间态。 +- 新增 `POST /admin-api/cleaning/settlements/:settlementId/wechat-transfer`，管理员可对 `CONFIRMED` 结算单发起微信转账；成功直接落 `PAID`，失败记录失败原因，待用户确认/处理中则保留 `CONFIRMED` 并写入中间态和微信 package 信息，便于后续查询或回调闭环。 + ## 验收结果 - `npm run build`（`backend/`）：PASS。 @@ -73,14 +81,22 @@ - 发放闭环增量后 `node tests/migration-contract.test.mjs`：PASS。 - 发放闭环增量后 `node tests/migration-runner.test.mjs`：PASS。 - 发放闭环增量后 `node tests/cleaning-route.test.mjs`：PASS，覆盖结算发放成功和发放失败记录路由。 + - 微信转账适配增量后 `npm run build`（`backend/`）：PASS。 + - 微信转账适配增量后 `node tests/wechat-pay.test.mjs`：PASS，覆盖商家转账请求签名与载荷。 + - 微信转账适配增量后 `node tests/cleaning-payout-service.test.mjs`：PASS，覆盖真实 API 成功、失败、待确认和 Mock 门禁。 + - 微信转账适配增量后 `node tests/cleaning-route.test.mjs`：PASS，覆盖微信转账路由。 + - 微信转账适配增量后 `node tests/migration-contract.test.mjs`：PASS。 + - 微信转账适配增量后 `node tests/migration-runner.test.mjs`：PASS。 + - 微信转账适配增量后 `node scripts/check-miniapp-m08-a.mjs`：PASS。 + - 微信转账适配增量后 `npm test`（`backend/`）：PASS。 ## 状态 -M08-B 保持 `PARTIAL`。当前已完成保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理员任务查询、指派、验收、驳回、超时回收、多人协作分账、待结算候选、正式结算单生成、确认、发放成功标记和发放失败记录基础工程闭环；真实微信零钱/企业付款适配器接入和后台/小程序管理界面仍待继续。M08-A 的真机合法域名、真实微信支付和实物开门验证按外部条件阻塞保留，不阻断 M08-B 工程推进。 +M08-B 保持 `PARTIAL`。当前已完成保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理员任务查询、指派、验收、驳回、超时回收、多人协作分账、待结算候选、正式结算单生成、确认、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库和非生产 Mock 门禁；微信转账回调/轮询闭环、真实商户场景报备联调和后台/小程序管理界面仍待继续。M08-A 的真机合法域名、真实微信支付和实物开门验证按外部条件阻塞保留，不阻断 M08-B 工程推进。 ## 提交 -- 工程提交：`03496d7` +- 工程提交：`M08-B微信转账适配增量` - 远端校验：待本轮 push 后执行 `HEAD == origin/main`。 diff --git a/docs/feature-status.md b/docs/feature-status.md index cb5de71..9105284 100644 --- a/docs/feature-status.md +++ b/docs/feature-status.md @@ -17,14 +17,14 @@ | 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 | `M08-B发放增量` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起、余额支付、优惠券/套餐下单抵扣参数与可视化选择器、受控 Wi-Fi、订单列表、订单详情、状态历史、取消入口、订单权限开门入口、续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细，以及保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做入口、统计和管理侧验收/驳回/指派/结算/多人协作/发放 API；`scripts/check-miniapp-m08-a.mjs`、相关会员/权益/充值/保洁测试通过。 | M08-A 真机联调缺微信后台/商户/硬件条件；M08-B 真实微信零钱/企业付款适配器和管理界面待继续。 | 继续 M08-B，补真实发放适配器和管理界面。 | +| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `M08-B微信转账适配增量` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起、余额支付、优惠券/套餐下单抵扣参数与可视化选择器、受控 Wi-Fi、订单列表、订单详情、状态历史、取消入口、订单权限开门入口、续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细，以及保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做入口、统计和管理侧验收/驳回/指派/结算/多人协作/发放 API；后端已接入微信商家转账适配、转账中间态落库和非生产 Mock 门禁；`scripts/check-miniapp-m08-a.mjs`、相关会员/权益/充值/保洁测试通过。 | M08-A 真机联调缺微信后台/商户/硬件条件；M08-B 微信转账回调/轮询闭环、真实商户场景报备联调和管理界面待继续。 | 继续 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 完成小程序角色界面与真机登录。 | | AUTH-002 | 多级权限 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已建立六类角色、权限目录、用户角色和门店范围；后台员工 API 同时执行 capability、租户和门店范围校验，越权分配被拒绝并记录审计。 | 后续业务资源接口和前端按钮/菜单仍需逐模块接入。 | M03 起所有管理接口复用 capability 与数据范围；M08 完成前端菜单按钮控制。 | | CLN-001 | 保洁人员管理 | M08-B/M09 | PARTIAL | `2a4dcd0` | `CLEANER` 角色已接入 `cleaning.task.read/write` 和 `cleaning.statistics.read`，保洁接口按登录态、capability 和门店范围裁剪任务大厅。 | 员工授权管理页面和保洁员资料管理仍待管理员端/后台接入。 | 继续 M08-B/M09，补管理员指派和保洁员管理界面。 | -| CLN-002 | 保洁任务大厅 | M08-B/M09 | PARTIAL | `M08-B发放增量` | 新增 `qipai_cleaning_tasks`、`qipai_cleaning_task_events`、`GET /app-api/cleaning/tasks/hall`、`GET /app-api/cleaning/tasks/mine`、接单、开始、照片上传、提交验收、驳回补做接口；订单 `FINISHED` 时同事务幂等创建 `WAITING` 保洁任务；管理侧已支持任务查询、指派、验收、驳回、超时回收、协作者查看/添加/移除、待结算候选、正式结算单生成/确认、发放成功标记和发放失败记录；小程序 `pages/cleaner/tasks` 已调用真实 app-api 并支持相机/相册上传。 | 真实微信零钱/企业付款适配器和管理界面仍待继续。 | 继续 M08-B，补真实发放适配器和管理界面。 | -| CLN-003 | 保洁统计 | M08-B/M09 | PARTIAL | `M08-B发放增量` | 新增 `GET /app-api/cleaning/stats`，返回当前保洁员负责人/协作者任务状态计数和按成员分账计算的待结算金额，小程序展示已抢、进行、待验、完成和待结算金额；管理侧新增结算单、结算明细、任务成员底表和发放字段，生成结算时按成员固化奖励金额，发放结果记录渠道、流水和失败原因。 | 统计明细、周期筛选、驳回数、结算单反查详情、真实发放适配器和管理界面待继续。 | M08-B/M09-C 补统计明细、结算口径校验和管理界面。 | +| CLN-002 | 保洁任务大厅 | M08-B/M09 | PARTIAL | `M08-B微信转账适配增量` | 新增 `qipai_cleaning_tasks`、`qipai_cleaning_task_events`、`GET /app-api/cleaning/tasks/hall`、`GET /app-api/cleaning/tasks/mine`、接单、开始、照片上传、提交验收、驳回补做接口；订单 `FINISHED` 时同事务幂等创建 `WAITING` 保洁任务；管理侧已支持任务查询、指派、验收、驳回、超时回收、协作者查看/添加/移除、待结算候选、正式结算单生成/确认、发放成功标记、发放失败记录和微信转账发放；小程序 `pages/cleaner/tasks` 已调用真实 app-api 并支持相机/相册上传。 | 微信转账回调/轮询闭环、真实商户场景报备联调和管理界面仍待继续。 | 继续 M08-B，补转账回调/轮询和管理界面。 | +| CLN-003 | 保洁统计 | M08-B/M09 | PARTIAL | `M08-B微信转账适配增量` | 新增 `GET /app-api/cleaning/stats`，返回当前保洁员负责人/协作者任务状态计数和按成员分账计算的待结算金额，小程序展示已抢、进行、待验、完成和待结算金额；管理侧新增结算单、结算明细、任务成员底表和发放字段，生成结算时按成员固化奖励金额，发放结果记录渠道、流水、失败原因、微信转账状态和 package 信息。 | 统计明细、周期筛选、驳回数、结算单反查详情、微信转账回调/轮询闭环和管理界面待继续。 | M08-B/M09-C 补统计明细、结算口径校验、转账闭环和管理界面。 | | STAFF-001 | 员工账号 | M02-D/M08 | PARTIAL | `5a300a8` | 已实现创建员工、分配角色/门店、禁用、备注、重置会话和审计；WSL MySQL 实测权限变化撤销活动会话。 | 后台与管理员小程序页面尚未实现。 | M08 接入管理界面。 | | BKG-002 | 后台用户管理 | M02-D/M08 | PARTIAL | `5a300a8` | 已实现分页筛选 API、注册/登录时间、状态、角色、门店范围以及手机号/IP 脱敏。 | Vue3 后台页面尚未实现。 | M08 实现响应式用户管理页面。 | | TEN-001 | 多门店支持 | M02/M03 | PARTIAL | `15139b3` | 门店 CRUD 与门店管理员数据范围已实现；跨门店写操作在 Windows 和 WSL MySQL 实测被拒绝。 | 地图选店、前端切换与完整订单数据范围待后续阶段。 | M03-C 接入地图选店，M04 起业务资源继承门店范围。 | diff --git a/docs/module-status.md b/docs/module-status.md index 60ffba9..e0fdb13 100644 --- a/docs/module-status.md +++ b/docs/module-status.md @@ -7,11 +7,11 @@ execution_cursor: stage_status: PARTIAL last_completed_stage: M07-D next_stage: M08-B - last_engineering_commit: `M08-B发放增量` + last_engineering_commit: `M08-B微信转账适配增量` last_push_verified: true base_branch: main - blocked_reason: "M08-A 真机合法域名、真实微信支付和实物开门验证缺微信后台/商户/硬件现场条件；M08-B 已完成照片上传、驳回补做、订单结束自动建保洁任务、管理员查询/指派/验收/驳回、超时回收、待结算候选、正式结算单生成/确认、多保洁员协作分账策略、发放成功标记和发放失败记录，仍需继续补真实微信零钱/企业付款适配器和管理界面。M06-G 真实硬件联调仍缺生产 MQTT 账号/ACL、DeviceID、控制箱、门锁、插座和现场配线。" - updated_at: 2026-06-27T16:00:00+08:00 + blocked_reason: "M08-A 真机合法域名、真实微信支付和实物开门验证缺微信后台/商户/硬件现场条件；M08-B 已完成照片上传、驳回补做、订单结束自动建保洁任务、管理员查询/指派/验收/驳回、超时回收、待结算候选、正式结算单生成/确认、多保洁员协作分账策略、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库和非生产 Mock 门禁，仍需继续补微信转账回调/轮询闭环、真实商户场景报备联调和管理界面。M06-G 真实硬件联调仍缺生产 MQTT 账号/ACL、DeviceID、控制箱、门锁、插座和现场配线。" + updated_at: 2026-06-27T16:30:00+08:00 ``` | 模块 | 状态 | 最近提交 | 最近开发日志 | 备注 | @@ -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 | `M08-B发放增量` | docs/devlogs/2026-06-25-M08-B-保洁端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起与通知入账、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算、取消订单、订单权限开门、顾客续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细、优惠券/套餐/余额下单抵扣工程闭环和权益可视化选择器；真机合法域名、真实微信支付和实物开门验证按 BLOCKED_EXTERNAL 旁路。M08-B 已完成保洁任务底表、权限、任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理员查询、指派、验收、驳回、超时回收、待结算候选、正式结算单生成/确认、多保洁员协作分账策略、发放成功标记和发放失败记录；真实微信零钱/企业付款适配器和管理界面待继续。 | +| M08 微信原生小程序完整业务 | PARTIAL | `M08-B微信转账适配增量` | docs/devlogs/2026-06-25-M08-B-保洁端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起与通知入账、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算、取消订单、订单权限开门、顾客续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细、优惠券/套餐/余额下单抵扣工程闭环和权益可视化选择器；真机合法域名、真实微信支付和实物开门验证按 BLOCKED_EXTERNAL 旁路。M08-B 已完成保洁任务底表、权限、任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理员查询、指派、验收、驳回、超时回收、待结算候选、正式结算单生成/确认、多保洁员协作分账策略、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库和非生产 Mock 门禁；微信转账回调/轮询闭环、真实商户场景报备联调和管理界面待继续。 | | M09 后台管理端完整业务 | TODO | - | - | - | | M10 部署、域名、验收和运维闭环 | TODO | - | - | - |