From fea82bff362eafa277107d9580b9d0e81002e2e8 Mon Sep 17 00:00:00 2001 From: yml2213 Date: Sat, 12 Sep 2026 17:46:47 +0800 Subject: [PATCH] =?UTF-8?q?style(backend):=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B9=B6=E4=BF=AE=E5=A4=8Dfloating-promises?= =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87pre-push=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/src/repositories/order-repo.ts | 1 - .../worker-platform/product-match-repo.ts | 2 +- .../src/routes/admin/platform-config/pdd.ts | 25 ++++++++--------- .../notification/domain-notifications.ts | 1 - .../pdd/pdd-source-config-service.ts | 13 +++------ .../platforms/pdd/pdd-sync-service.ts | 11 ++++---- .../services/scheduler/data-retention-job.ts | 28 +++++++++---------- .../services/scheduler/pdd-order-sync-job.ts | 5 +++- .../admin-kuaishou-match-service.ts | 12 ++------ .../sync-worker-orders-service.ts | 8 ++---- .../worker-product-match-config-service.ts | 12 ++++---- apps/backend/src/utils/random.ts | 8 +++--- 12 files changed, 55 insertions(+), 71 deletions(-) diff --git a/apps/backend/src/repositories/order-repo.ts b/apps/backend/src/repositories/order-repo.ts index 893df946..05df2a71 100644 --- a/apps/backend/src/repositories/order-repo.ts +++ b/apps/backend/src/repositories/order-repo.ts @@ -86,7 +86,6 @@ export async function findLatestOrderByAnyPlatformOrderId( return result.rows[0] || null } - export async function findExistingPlatformOrderIds({ provider = 'pdd', platform = 'pdd', diff --git a/apps/backend/src/repositories/worker-platform/product-match-repo.ts b/apps/backend/src/repositories/worker-platform/product-match-repo.ts index d22e999f..97f76b9f 100644 --- a/apps/backend/src/repositories/worker-platform/product-match-repo.ts +++ b/apps/backend/src/repositories/worker-platform/product-match-repo.ts @@ -376,7 +376,7 @@ export async function pruneWorkProductMatchLogs( } const remainingRes = await query<{ total: number }>( - "SELECT COUNT(*)::int AS total FROM work_product_match_logs", + 'SELECT COUNT(*)::int AS total FROM work_product_match_logs', ) const remainingTotal = Number(remainingRes.rows[0]?.total || 0) diff --git a/apps/backend/src/routes/admin/platform-config/pdd.ts b/apps/backend/src/routes/admin/platform-config/pdd.ts index ef45957e..896628ea 100644 --- a/apps/backend/src/routes/admin/platform-config/pdd.ts +++ b/apps/backend/src/routes/admin/platform-config/pdd.ts @@ -71,19 +71,16 @@ router.post( */ router.post( '/pdd/stores/:shopId', - createJsonHandler( - (req) => savePddStore(req.params.shopId, (req.body || {}) as JsonObject), - { - successMessage: '拼多多店铺配置已更新', - errorMessage: '更新拼多多店铺配置失败', - scope: '[admin/platform-config/pdd/stores/:shopId]', - audit: (req) => ({ - action: 'platform_pdd_store_updated', - targetType: 'platform_store', - targetId: String(req.params.shopId || ''), - }), - }, - ), + createJsonHandler((req) => savePddStore(req.params.shopId, (req.body || {}) as JsonObject), { + successMessage: '拼多多店铺配置已更新', + errorMessage: '更新拼多多店铺配置失败', + scope: '[admin/platform-config/pdd/stores/:shopId]', + audit: (req) => ({ + action: 'platform_pdd_store_updated', + targetType: 'platform_store', + targetId: String(req.params.shopId || ''), + }), + }), ) /** @@ -150,7 +147,7 @@ router.post( }) if (!result.valid) { - notifyPddCookieExpired({ + void notifyPddCookieExpired({ shopId: existingStore.shopId, shopName: existingStore.shopName, message: result.message, diff --git a/apps/backend/src/services/notification/domain-notifications.ts b/apps/backend/src/services/notification/domain-notifications.ts index fa000d47..18b76266 100644 --- a/apps/backend/src/services/notification/domain-notifications.ts +++ b/apps/backend/src/services/notification/domain-notifications.ts @@ -293,7 +293,6 @@ function markNotificationCooldown(cooldownKey: unknown) { notificationCooldownMap.set(key, Date.now()) } - export interface PddCookieExpiredPayload { shopId: string shopName?: string | undefined diff --git a/apps/backend/src/services/platforms/pdd/pdd-source-config-service.ts b/apps/backend/src/services/platforms/pdd/pdd-source-config-service.ts index f231081c..5f322024 100644 --- a/apps/backend/src/services/platforms/pdd/pdd-source-config-service.ts +++ b/apps/backend/src/services/platforms/pdd/pdd-source-config-service.ts @@ -219,19 +219,14 @@ export function normalizePddSourcesConfig(rawValue: unknown): PddSourcesConfig { : 20 const rawOrderType = Number(source.orderType) - const orderType = Number.isInteger(rawOrderType) && [0, 1, 2].includes(rawOrderType) - ? rawOrderType - : 2 + const orderType = + Number.isInteger(rawOrderType) && [0, 1, 2].includes(rawOrderType) ? rawOrderType : 2 const rawPageSize = Number(source.pageSize) - const pageSize = Number.isInteger(rawPageSize) - ? Math.min(100, Math.max(10, rawPageSize)) - : 50 + const pageSize = Number.isInteger(rawPageSize) ? Math.min(100, Math.max(10, rawPageSize)) : 50 const rawMaxPages = Number(source.maxPages) - const maxPages = Number.isInteger(rawMaxPages) - ? Math.min(20, Math.max(1, rawMaxPages)) - : 5 + const maxPages = Number.isInteger(rawMaxPages) ? Math.min(20, Math.max(1, rawMaxPages)) : 5 return { enabled: source.enabled !== false, diff --git a/apps/backend/src/services/platforms/pdd/pdd-sync-service.ts b/apps/backend/src/services/platforms/pdd/pdd-sync-service.ts index b1a2de3b..ae87ef3e 100644 --- a/apps/backend/src/services/platforms/pdd/pdd-sync-service.ts +++ b/apps/backend/src/services/platforms/pdd/pdd-sync-service.ts @@ -85,7 +85,10 @@ export async function syncStoreOrders( const client = new PddClient(store) const sourcesConfig = getPddSourcesConfig() - const pageSize = Math.min(100, Math.max(1, Number(options.pageSize || sourcesConfig.pageSize || 50))) + const pageSize = Math.min( + 100, + Math.max(1, Number(options.pageSize || sourcesConfig.pageSize || 50)), + ) const initialPage = Math.max(1, Number(options.pageNumber || 1)) const orderType = options.orderType ?? sourcesConfig.orderType ?? 2 // 2: 已发货 (Shipped, default) @@ -130,9 +133,7 @@ export async function syncStoreOrders( totalFetched += items.length // 提取本页订单号并批量排查数据库已有状态 - const pageOrderSns = items - .map((item) => String(item.order_sn || '').trim()) - .filter(Boolean) + const pageOrderSns = items.map((item) => String(item.order_sn || '').trim()).filter(Boolean) const checkExisting = options.checkExistingOrderIds || @@ -279,7 +280,7 @@ export async function syncStoreOrders( lastCheckedAt: new Date().toISOString(), }).catch(() => null) - notifyPddCookieExpired({ + void notifyPddCookieExpired({ shopId, shopName, message: errMsg, diff --git a/apps/backend/src/services/scheduler/data-retention-job.ts b/apps/backend/src/services/scheduler/data-retention-job.ts index 537970f6..ee535c4f 100644 --- a/apps/backend/src/services/scheduler/data-retention-job.ts +++ b/apps/backend/src/services/scheduler/data-retention-job.ts @@ -1,10 +1,10 @@ -import { query } from "../../db/client.js" -import { runtimeConfig } from "../../config/runtime.js" -import { getWorkerProductMatchConfig } from "../worker-platform/worker-product-match-config-service.js" -import { pruneWorkProductMatchLogs } from "../../repositories/worker-platform/product-match-repo.js" +import { query } from '../../db/client.js' +import { runtimeConfig } from '../../config/runtime.js' +import { getWorkerProductMatchConfig } from '../worker-platform/worker-product-match-config-service.js' +import { pruneWorkProductMatchLogs } from '../../repositories/worker-platform/product-match-repo.js' export type DataRetentionResult = { - status: "ok" + status: 'ok' message: string rawPayloadRows: number taskEventRows: number @@ -31,20 +31,20 @@ export async function runDataRetentionJob(): Promise { // 2. 清理其他报文与日志 const rawPayloadRows = - (await scrubJsonColumnInBatches("orders", "updated_at", rawPayloadDays)) + - (await scrubJsonColumnInBatches("kuaishou_industry_vouchers", "updated_at", rawPayloadDays)) + (await scrubJsonColumnInBatches('orders', 'updated_at', rawPayloadDays)) + + (await scrubJsonColumnInBatches('kuaishou_industry_vouchers', 'updated_at', rawPayloadDays)) const matchLogRows = await scrubJsonColumnInBatches( - "work_product_match_logs", - "created_at", + 'work_product_match_logs', + 'created_at', rawPayloadDays, ) - const taskEventRows = await deleteOldRowsInBatches("task_events", taskEventDays) - const webhookEventRows = await deleteOldRowsInBatches("webhook_events", webhookEventDays) - const auditLogRows = await deleteOldRowsInBatches("admin_audit_logs", auditLogDays) + const taskEventRows = await deleteOldRowsInBatches('task_events', taskEventDays) + const webhookEventRows = await deleteOldRowsInBatches('webhook_events', webhookEventDays) + const auditLogRows = await deleteOldRowsInBatches('admin_audit_logs', auditLogDays) return { - status: "ok", - message: "数据保留清理完成", + status: 'ok', + message: '数据保留清理完成', rawPayloadRows, matchLogRows, matchLogDeletedRows: matchLogPruneResult.totalDeleted, diff --git a/apps/backend/src/services/scheduler/pdd-order-sync-job.ts b/apps/backend/src/services/scheduler/pdd-order-sync-job.ts index e2905971..55cfebfe 100644 --- a/apps/backend/src/services/scheduler/pdd-order-sync-job.ts +++ b/apps/backend/src/services/scheduler/pdd-order-sync-job.ts @@ -14,7 +14,10 @@ export async function runPddOrderSyncJob(job: JsonObject) { ? (job.config as JsonObject) : {} const sourcesConfig = getPddSourcesConfig() - const pageSize = Math.min(100, Math.max(1, Number(config.pageSize || sourcesConfig.pageSize || 50))) + const pageSize = Math.min( + 100, + Math.max(1, Number(config.pageSize || sourcesConfig.pageSize || 50)), + ) const maxPages = Math.min(20, Math.max(1, Number(config.maxPages || sourcesConfig.maxPages || 5))) const orderType = Number(config.orderType ?? sourcesConfig.orderType ?? 2) diff --git a/apps/backend/src/services/worker-platform/admin-kuaishou-match-service.ts b/apps/backend/src/services/worker-platform/admin-kuaishou-match-service.ts index 0baae78e..7af68d55 100644 --- a/apps/backend/src/services/worker-platform/admin-kuaishou-match-service.ts +++ b/apps/backend/src/services/worker-platform/admin-kuaishou-match-service.ts @@ -251,21 +251,15 @@ export async function listAdminKuaishouMatchSources(payload: JsonObject = {}) { for (const row of recentOrderItemsResult.rows) { const snapshot = safeParseJson(row.item_snapshot_json) const ksc = safeParseJson(snapshot.kuaishouSendCode) - const sellerId = normalizeKuaishouMatchId( - ksc.sellerId || row.shop_id || row.platform, - ) + const sellerId = normalizeKuaishouMatchId(ksc.sellerId || row.shop_id || row.platform) const relItemId = normalizeKuaishouMatchId( ksc.relItemId || row.sku_code || snapshot.goodsId || snapshot.goods_id, ) const itemTitle = String( ksc.itemTitle || snapshot.goodsName || snapshot.goods_name || row.sku_name || '', ).trim() - const relSkuId = normalizeKuaishouMatchId( - ksc.relSkuId || snapshot.spec || row.sku_code, - ) - const skuNick = String( - ksc.skuNick || snapshot.spec || row.sku_name || '', - ).trim() + const relSkuId = normalizeKuaishouMatchId(ksc.relSkuId || snapshot.spec || row.sku_code) + const skuNick = String(ksc.skuNick || snapshot.spec || row.sku_name || '').trim() if (!sellerId || (!relItemId && !itemTitle)) continue diff --git a/apps/backend/src/services/worker-platform/sync-worker-orders-service.ts b/apps/backend/src/services/worker-platform/sync-worker-orders-service.ts index c28b1f66..19dd7313 100644 --- a/apps/backend/src/services/worker-platform/sync-worker-orders-service.ts +++ b/apps/backend/src/services/worker-platform/sync-worker-orders-service.ts @@ -62,12 +62,8 @@ export async function syncWorkerOrdersForSourceOrder( const itemTitle = matchContext.itemTitle || String(snapshot.goodsName || snapshot.goods_name || item.sku_name || '').trim() - const relSkuId = - matchContext.relSkuId || - String(snapshot.spec || item.sku_code || '').trim() - const skuNick = - matchContext.skuNick || - String(snapshot.spec || item.sku_name || '').trim() + const relSkuId = matchContext.relSkuId || String(snapshot.spec || item.sku_code || '').trim() + const skuNick = matchContext.skuNick || String(snapshot.spec || item.sku_name || '').trim() // Record product match diagnostics for all platform orders (including PDD) if (sellerId || relItemId || itemTitle) { diff --git a/apps/backend/src/services/worker-platform/worker-product-match-config-service.ts b/apps/backend/src/services/worker-platform/worker-product-match-config-service.ts index 0cf5208c..9a5d55b1 100644 --- a/apps/backend/src/services/worker-platform/worker-product-match-config-service.ts +++ b/apps/backend/src/services/worker-platform/worker-product-match-config-service.ts @@ -1,7 +1,7 @@ -import { APP_CONFIG_KEYS } from "../../config/app-config-keys.js" -import type { JsonObject } from "../../types/json.js" -import { readAppConfigEntry, saveAppConfigEntry } from "../config/app-config-store.js" -import { pruneWorkProductMatchLogs } from "../../repositories/worker-platform/product-match-repo.js" +import { APP_CONFIG_KEYS } from '../../config/app-config-keys.js' +import type { JsonObject } from '../../types/json.js' +import { readAppConfigEntry, saveAppConfigEntry } from '../config/app-config-store.js' +import { pruneWorkProductMatchLogs } from '../../repositories/worker-platform/product-match-repo.js' export type WorkerProductMatchConfig = { legacyFallbackEnabled: boolean @@ -50,7 +50,7 @@ export function normalizeWorkerProductMatchConfig(rawValue: unknown): WorkerProd return { // 默认关闭旧规则，避免大标题中的公共词触发错误接单。 legacyFallbackEnabled: - typeof source.legacyFallbackEnabled === "boolean" ? source.legacyFallbackEnabled : false, + typeof source.legacyFallbackEnabled === 'boolean' ? source.legacyFallbackEnabled : false, // 匹配日志保留上限条数，默认 10000 条，0 为不限 maxMatchLogs: Number.isInteger(maxLogs) && maxLogs >= 0 ? maxLogs : 10000, // 匹配日志保留天数，默认 30 天，0 为不限 @@ -60,5 +60,5 @@ export function normalizeWorkerProductMatchConfig(rawValue: unknown): WorkerProd } function isPlainObject(value: unknown): value is JsonObject { - return Object.prototype.toString.call(value) === "[object Object]" + return Object.prototype.toString.call(value) === '[object Object]' } diff --git a/apps/backend/src/utils/random.ts b/apps/backend/src/utils/random.ts index 35ceb06c..152e4c09 100644 --- a/apps/backend/src/utils/random.ts +++ b/apps/backend/src/utils/random.ts @@ -14,10 +14,10 @@ export function randomId(prefix: string, bytes = 6): string { */ export function generateWorkOrderNo(date: Date = new Date()): string { const yy = String(date.getFullYear()).slice(-2) - const mm = String(date.getMonth() + 1).padStart(2, "0") - const dd = String(date.getDate()).padStart(2, "0") - const hh = String(date.getHours()).padStart(2, "0") - const min = String(date.getMinutes()).padStart(2, "0") + const mm = String(date.getMonth() + 1).padStart(2, '0') + const dd = String(date.getDate()).padStart(2, '0') + const hh = String(date.getHours()).padStart(2, '0') + const min = String(date.getMinutes()).padStart(2, '0') const rand = Math.floor(1000 + Math.random() * 9000) return `WO${yy}${mm}${dd}${hh}${min}${rand}` }