feat: 完善履约路由、订单服务与自动核销

This commit is contained in:
yml2213
2026-11-05 14:59:58 +08:00
parent 517d763f17
commit 1df88cc639
54 changed files with 3166 additions and 318 deletions
@@ -1,14 +1,10 @@
/**
* 91 卡券交付前核销:
* 在查询接口即将返回 orderStatus=20 + cards 前,同步核销行业电子凭证,
* 把「核销时间」提前到链接交付时刻,降低「拿链即退」误退窗口。
*
* 语义:核销 = 领取链接已交付(售出闭环),≠ 游戏内道具已到账。
* 91 卡券交付时安排延迟核销。
*
* 查询接口仍按任务 ready 状态返回 cards,但平台核销不再同步阻塞交付;
* 这里投递 link_generated 事件,后续由持久化定时任务按配置延迟执行。
*/
import { attachKuaishouIndustryVoucherToTask } from '../platforms/kuaishou-industry/voucher-binding-service.js'
import { consumeKuaishouIndustryVoucher } from '../platforms/kuaishou-industry/voucher-service.js'
import { listKuaishouIndustryVouchersByOid } from '../../repositories/kuaishou-industry-voucher-repo.js'
import { scheduleVoucherConsumeForTask } from '../fulfillment/voucher-consume-queue-service.js'
import { logIntegration, logWarn } from '../../utils/logger.js'
import type { KuaishouIndustryVoucherRow, OrderRow, TaskRow } from '../../types/repository/rows.js'
@@ -55,18 +51,7 @@ export function resolveIndustryVoucherForTask(
return null
}
function isVoucherConsumed(voucher: Pick<KuaishouIndustryVoucherRow, 'status'>): boolean {
return (
String(voucher.status || '')
.trim()
.toUpperCase() === 'CONSUMED'
)
}
/**
* 对即将交付给 91 的 ready 任务同步核销行业凭证(幂等)。
* 失败时调用方应返回 orderStatus=10,避免「未核销却已发链」。
*/
/** 对即将交付给 91 的 ready 任务投递延迟核销任务。 */
export async function consumeIndustryVouchersBeforeOpen91Deliver(options: {
order: OrderRow
tasks: TaskRow[]
@@ -95,59 +80,29 @@ export async function consumeIndustryVouchersBeforeOpen91Deliver(options: {
}
const oid = String(options.order.platform_order_id || '').trim()
const vouchers = oid ? await listKuaishouIndustryVouchersByOid(oid) : []
const consumedTaskIds: number[] = []
const alreadyConsumedTaskIds: number[] = []
const failed: Array<{ taskId: number; errorMessage: string }> = []
for (const task of readyTasks) {
const taskId = Number(task.id || 0)
const voucher = resolveIndustryVoucherForTask(task, vouchers)
if (!voucher) {
try {
await scheduleVoucherConsumeForTask(task, 'link_generated')
} catch (error) {
failed.push({
taskId,
errorMessage: '交付前核销失败:未找到对应电子凭证',
errorMessage: error instanceof Error ? error.message : '安排自动核销失败',
})
continue
}
const alreadyConsumed = isVoucherConsumed(voucher)
const result = await consumeKuaishouIndustryVoucher(voucher, {
source,
task,
token: String(voucher.token || '').trim(),
consumeTime: Date.now(),
})
if (!result.ok || !result.voucher) {
failed.push({
taskId,
errorMessage: result.errorMessage || '电子凭证核销回调失败',
})
continue
}
await attachKuaishouIndustryVoucherToTask(task, result.voucher, {
source,
})
if (alreadyConsumed) {
alreadyConsumedTaskIds.push(taskId)
} else {
consumedTaskIds.push(taskId)
}
}
if (failed.length > 0) {
const errorMessage = failed[0]?.errorMessage || '电子凭证核销失败,暂缓交付领取链接'
logWarn('[open-91/query]', '91交付前核销失败,暂不返回 cards', {
const errorMessage = failed[0]?.errorMessage || '安排自动核销失败'
logWarn('[open-91/query]', '91交付时安排自动核销失败', {
requestId: options.requestId || '',
orderId: options.order.id,
orderNo: oid,
failedTaskIds: failed.map((item) => item.taskId),
failed,
consumedTaskIds,
alreadyConsumedTaskIds,
errorMessage,
})
@@ -156,24 +111,24 @@ export async function consumeIndustryVouchersBeforeOpen91Deliver(options: {
ok: false,
errorMessage,
failedTaskIds: failed.map((item) => item.taskId),
consumedTaskIds,
consumedTaskIds: [],
alreadyConsumedTaskIds,
}
}
logIntegration('[open-91/query]', '91交付前核销完成', {
logIntegration('[open-91/query]', '91交付时核销任务已投递', {
requestId: options.requestId || '',
orderId: options.order.id,
orderNo: oid,
readyTaskCount: readyTasks.length,
consumedTaskIds,
taskCount: readyTasks.length,
alreadyConsumedTaskIds,
source,
})
return {
ok: true,
consumedTaskIds,
consumedTaskIds: [],
alreadyConsumedTaskIds,
}
}