From a075b8acf746999bc3719b46cde484546082b2a1 Mon Sep 17 00:00:00 2001 From: yml2213 Date: Thu, 9 Jul 2026 20:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=A0=B8=E9=94=80=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E7=94=B5=E5=AD=90=E5=87=AD=E8=AF=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/services/admin/kuaishou-industry-admin-service.ts | 1 - .../kuaishou-industry/consume-callback-service.test.ts | 6 ++++-- .../platforms/kuaishou-industry/consume-callback-service.ts | 2 -- .../platforms/kuaishou-industry/consume-code-service.ts | 2 -- .../services/platforms/kuaishou-industry/voucher-service.ts | 4 ---- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/apps/backend/src/services/admin/kuaishou-industry-admin-service.ts b/apps/backend/src/services/admin/kuaishou-industry-admin-service.ts index b07442aa..c8bbb595 100644 --- a/apps/backend/src/services/admin/kuaishou-industry-admin-service.ts +++ b/apps/backend/src/services/admin/kuaishou-industry-admin-service.ts @@ -111,7 +111,6 @@ export async function consumeAdminKuaishouIndustryVoucherByCode(input: JsonObjec consumeTime: Date.now(), ...(consumeType ? { consumeType } : {}), ...(input.serialNum ? { serialNum: String(input.serialNum).trim() } : {}), - ...(input.eticketType ? { eticketType: String(input.eticketType).trim() } : {}), ...(input.storeName ? { storeName: String(input.storeName).trim() } : {}), ...(input.storeAddress ? { storeAddress: String(input.storeAddress).trim() } : {}), ...(input.expressCode ? { expressCode: String(input.expressCode).trim() } : {}), diff --git a/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.test.ts b/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.test.ts index d0df3acb..c78f0e29 100644 --- a/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.test.ts +++ b/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.test.ts @@ -3,7 +3,7 @@ import assert from 'node:assert/strict' import { buildConsumeCallbackBizParams } from './consume-callback-service.js' -test('buildConsumeCallbackBizParams omits eticket status', () => { +test('buildConsumeCallbackBizParams omits unsupported consume fields', () => { const bizParams = buildConsumeCallbackBizParams({ oid: '2619000086068982', etickets: [{ @@ -14,13 +14,15 @@ test('buildConsumeCallbackBizParams omits eticket status', () => { status: 'CONSUMED', consumeType: 'consume', consumeTime: 1783596649024, + eticketType: 'DINING_OPEN_TICKET', token: 'ticket-token', seriallNum: 'CONSUME-KSVASXT6Q955WT4SS36', - }) + } as any) assert.deepEqual(bizParams.etickets, [{ id: 'KSVASXT6Q955WT4SS36', num: 1, }]) assert.equal(bizParams.consumeType, 'consume') + assert.equal('eticketType' in bizParams, false) }) diff --git a/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.ts b/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.ts index 9b955e24..33cc2e97 100644 --- a/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.ts +++ b/apps/backend/src/services/platforms/kuaishou-industry/consume-callback-service.ts @@ -18,7 +18,6 @@ export type ConsumeCallbackInput = { expressNo?: string expressCode?: string appointmentTime?: string - eticketType?: string ext?: string token: string seriallNum?: string @@ -112,7 +111,6 @@ export function buildConsumeCallbackBizParams(input: ConsumeCallbackInput): Json if (input.expressNo) bizParams.expressNo = input.expressNo if (input.expressCode) bizParams.expressCode = input.expressCode if (input.appointmentTime) bizParams.appointmentTime = input.appointmentTime - if (input.eticketType) bizParams.eticketType = input.eticketType if (input.ext) bizParams.ext = input.ext if (input.seriallNum) bizParams.seriallNum = input.seriallNum if (input.consumePoiId != null) bizParams.consumePoiId = input.consumePoiId diff --git a/apps/backend/src/services/platforms/kuaishou-industry/consume-code-service.ts b/apps/backend/src/services/platforms/kuaishou-industry/consume-code-service.ts index 923cb4eb..bf3b0c9b 100644 --- a/apps/backend/src/services/platforms/kuaishou-industry/consume-code-service.ts +++ b/apps/backend/src/services/platforms/kuaishou-industry/consume-code-service.ts @@ -47,7 +47,6 @@ export async function handleConsumeCode(rawBody: JsonObject = {}) { const consumed = await consumeKuaishouIndustryVoucher(voucher, { source: 'kuaishou_industry_consume_code', token: params.token, - eticketType: params.eticketType, consumeType: params.consumeType, consumeTime: params.consumeTime || Date.now(), storeName: params.storeName, @@ -107,7 +106,6 @@ export async function handleConsumeCode(rawBody: JsonObject = {}) { expressNo: params.expressNo, expressCode: params.expressCode, appointmentTime: params.appointmentTime, - eticketType: params.eticketType, ext: params.ext, token: params.token, seriallNum: params.seriallNum, diff --git a/apps/backend/src/services/platforms/kuaishou-industry/voucher-service.ts b/apps/backend/src/services/platforms/kuaishou-industry/voucher-service.ts index c7c07607..7f54bc3b 100644 --- a/apps/backend/src/services/platforms/kuaishou-industry/voucher-service.ts +++ b/apps/backend/src/services/platforms/kuaishou-industry/voucher-service.ts @@ -109,7 +109,6 @@ export async function consumeKuaishouIndustryVouchersForTask( input: { source?: string token?: string - eticketType?: string consumeType?: string consumeTime?: number storeName?: string @@ -130,7 +129,6 @@ export async function consumeKuaishouIndustryVouchersForTask( task, } if (input.token !== undefined) consumeInput.token = input.token - if (input.eticketType !== undefined) consumeInput.eticketType = input.eticketType if (input.storeName !== undefined) consumeInput.storeName = input.storeName if (input.storeAddress !== undefined) consumeInput.storeAddress = input.storeAddress if (input.expressCode !== undefined) consumeInput.expressCode = input.expressCode @@ -162,7 +160,6 @@ export async function consumeKuaishouIndustryVoucher( input: { source?: string token?: string - eticketType?: string consumeType?: string consumeTime?: number storeName?: string @@ -235,7 +232,6 @@ export async function consumeKuaishouIndustryVoucher( ...(input.storeAddress ? { storeAddress: input.storeAddress } : {}), ...(input.expressCode ? { expressCode: input.expressCode } : {}), ...(input.expressNo ? { expressNo: input.expressNo } : {}), - ...(input.eticketType ? { eticketType: input.eticketType } : {}), }) if (!callbackResult.success) {