避免无日期过滤时展示全库,关键词搜索不受日期限制;SSE 插入裁剪并尊重筛选,新单入库优先使用平台支付时间。 Co-authored-by: Cursor <cursoragent@cursor.com>
409 lines
11 KiB
TypeScript
409 lines
11 KiB
TypeScript
import type { QueryResult, QueryResultRow } from 'pg'
|
|
|
|
import { query } from '../db/client.js'
|
|
import type {
|
|
OrderCreateInput,
|
|
OrderListQueryInput,
|
|
OrderUpdateInput,
|
|
} from '../types/repository/inputs.js'
|
|
import type { OrderListQueryResult, OrderListRow, OrderRow } from '../types/repository/rows.js'
|
|
import { isPlatformOrderIdLookupKeyword } from '../utils/platform-order-id.js'
|
|
|
|
export type OrderQueryExecutor = <T extends QueryResultRow = QueryResultRow>(
|
|
text: string,
|
|
params?: unknown[],
|
|
) => Promise<QueryResult<T>>
|
|
|
|
type OrderPlatformLookupInput = {
|
|
provider?: string
|
|
platform: string
|
|
shopId?: string
|
|
platformOrderId: string
|
|
}
|
|
|
|
export async function findOrderByPlatformOrderId({
|
|
provider = '91kaquan',
|
|
platform,
|
|
shopId = '',
|
|
platformOrderId,
|
|
}: OrderPlatformLookupInput): Promise<OrderRow | null> {
|
|
const result = await query<OrderRow>(
|
|
`
|
|
SELECT *
|
|
FROM orders
|
|
WHERE provider = $1 AND platform = $2 AND shop_id = $3 AND platform_order_id = $4
|
|
LIMIT 1
|
|
`,
|
|
[provider, platform, shopId, platformOrderId],
|
|
)
|
|
|
|
return result.rows[0] || null
|
|
}
|
|
|
|
export async function findLatestOrderByPlatformOrderId({
|
|
provider = '91kaquan',
|
|
platform,
|
|
platformOrderId,
|
|
}: Omit<OrderPlatformLookupInput, 'shopId'>): Promise<OrderRow | null> {
|
|
return findLatestOrderByPlatformOrderIdWithExecutor(query, {
|
|
provider,
|
|
platform,
|
|
platformOrderId,
|
|
})
|
|
}
|
|
|
|
export async function findLatestOrderByPlatformOrderIdWithExecutor(
|
|
executor: OrderQueryExecutor,
|
|
{ provider = '91kaquan', platform, platformOrderId }: Omit<OrderPlatformLookupInput, 'shopId'>,
|
|
): Promise<OrderRow | null> {
|
|
const result = await executor<OrderRow>(
|
|
`
|
|
SELECT *
|
|
FROM orders
|
|
WHERE provider = $1 AND platform = $2 AND platform_order_id = $3
|
|
ORDER BY id DESC
|
|
LIMIT 1
|
|
`,
|
|
[provider, platform, platformOrderId],
|
|
)
|
|
|
|
return result.rows[0] || null
|
|
}
|
|
|
|
export async function findLatestOrderByAnyPlatformOrderId(
|
|
platformOrderId: string,
|
|
): Promise<OrderRow | null> {
|
|
const result = await query<OrderRow>(
|
|
`
|
|
SELECT *
|
|
FROM orders
|
|
WHERE platform_order_id = $1
|
|
ORDER BY id DESC
|
|
LIMIT 1
|
|
`,
|
|
[String(platformOrderId || '').trim()],
|
|
)
|
|
|
|
return result.rows[0] || null
|
|
}
|
|
|
|
export async function findExistingPlatformOrderIds({
|
|
provider = 'pdd',
|
|
platform = 'pdd',
|
|
platformOrderIds,
|
|
}: {
|
|
provider?: string
|
|
platform: string
|
|
platformOrderIds: string[]
|
|
}): Promise<Set<string>> {
|
|
if (!platformOrderIds || platformOrderIds.length === 0) {
|
|
return new Set<string>()
|
|
}
|
|
const result = await query<{ platform_order_id: string }>(
|
|
`
|
|
SELECT platform_order_id
|
|
FROM orders
|
|
WHERE provider = $1 AND platform = $2 AND platform_order_id = ANY($3::text[])
|
|
`,
|
|
[provider, platform, platformOrderIds],
|
|
)
|
|
return new Set(result.rows.map((r) => String(r.platform_order_id)))
|
|
}
|
|
export async function createOrder(input: OrderCreateInput): Promise<OrderRow | null> {
|
|
return createOrderWithExecutor(query, input)
|
|
}
|
|
|
|
export async function createOrderWithExecutor(
|
|
executor: OrderQueryExecutor,
|
|
input: OrderCreateInput,
|
|
): Promise<OrderRow | null> {
|
|
const result = await executor<OrderRow>(
|
|
`
|
|
INSERT INTO orders (
|
|
provider,
|
|
platform,
|
|
shop_id,
|
|
shop_name,
|
|
platform_order_id,
|
|
order_status,
|
|
pay_status,
|
|
buyer_id,
|
|
buyer_name,
|
|
receiver_contact,
|
|
total_amount,
|
|
currency,
|
|
raw_payload_json,
|
|
paid_at,
|
|
created_at,
|
|
updated_at
|
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::jsonb, $14, $15, $16)
|
|
RETURNING *
|
|
`,
|
|
[
|
|
input.provider,
|
|
input.platform,
|
|
input.shopId,
|
|
input.shopName,
|
|
input.platformOrderId,
|
|
input.orderStatus,
|
|
input.payStatus,
|
|
input.buyerId,
|
|
input.buyerName,
|
|
input.receiverContact,
|
|
input.totalAmount,
|
|
input.currency,
|
|
input.rawPayloadJson || '{}',
|
|
input.paidAt || null,
|
|
input.createdAt,
|
|
input.updatedAt,
|
|
],
|
|
)
|
|
|
|
return result.rows[0] || null
|
|
}
|
|
|
|
export async function updateOrder(
|
|
orderId: number | string,
|
|
input: OrderUpdateInput,
|
|
): Promise<OrderRow | null> {
|
|
return updateOrderWithExecutor(query, orderId, input)
|
|
}
|
|
|
|
export async function updateOrderWithExecutor(
|
|
executor: OrderQueryExecutor,
|
|
orderId: number | string,
|
|
input: OrderUpdateInput,
|
|
): Promise<OrderRow | null> {
|
|
const result = await executor<OrderRow>(
|
|
`
|
|
UPDATE orders
|
|
SET
|
|
provider = $1,
|
|
platform = $2,
|
|
shop_id = $3,
|
|
shop_name = $4,
|
|
order_status = $5,
|
|
pay_status = $6,
|
|
buyer_id = $7,
|
|
buyer_name = $8,
|
|
receiver_contact = $9,
|
|
total_amount = $10,
|
|
currency = $11,
|
|
raw_payload_json = $12::jsonb,
|
|
paid_at = $13,
|
|
updated_at = $14
|
|
WHERE id = $15
|
|
RETURNING *
|
|
`,
|
|
[
|
|
input.provider,
|
|
input.platform,
|
|
input.shopId,
|
|
input.shopName,
|
|
input.orderStatus,
|
|
input.payStatus,
|
|
input.buyerId,
|
|
input.buyerName,
|
|
input.receiverContact,
|
|
input.totalAmount,
|
|
input.currency,
|
|
input.rawPayloadJson || '{}',
|
|
input.paidAt || null,
|
|
input.updatedAt,
|
|
Number(orderId),
|
|
],
|
|
)
|
|
|
|
return result.rows[0] || null
|
|
}
|
|
|
|
export async function getOrderById(orderId: number | string): Promise<OrderRow | null> {
|
|
const result = await query<OrderRow>('SELECT * FROM orders WHERE id = $1 LIMIT 1', [
|
|
Number(orderId),
|
|
])
|
|
return result.rows[0] || null
|
|
}
|
|
|
|
export async function listOrders({
|
|
...input
|
|
}: OrderListQueryInput = {}): Promise<OrderListQueryResult> {
|
|
return listOrdersWithExecutor(query, input)
|
|
}
|
|
|
|
export async function listOrdersWithExecutor(
|
|
executor: OrderQueryExecutor,
|
|
{
|
|
page = 1,
|
|
pageSize = 20,
|
|
keyword = '',
|
|
provider = '',
|
|
executorKey = '',
|
|
platformOrderId = '',
|
|
payStatus = '',
|
|
taskStatus = '',
|
|
skuCode = '',
|
|
dateFrom = '',
|
|
dateTo = '',
|
|
}: OrderListQueryInput = {},
|
|
): Promise<OrderListQueryResult> {
|
|
const offset = (page - 1) * pageSize
|
|
const filters: string[] = []
|
|
const params: unknown[] = []
|
|
|
|
if (keyword) {
|
|
const trimmedKeyword = String(keyword).trim()
|
|
const isOrderNoLookup = isPlatformOrderIdLookupKeyword(trimmedKeyword)
|
|
|
|
if (isOrderNoLookup) {
|
|
params.push(trimmedKeyword)
|
|
const paramIndex = `$${params.length}`
|
|
filters.push(
|
|
`(o.platform_order_id = ${paramIndex} OR o.platform_order_id LIKE ${paramIndex} || '%')`,
|
|
)
|
|
} else {
|
|
params.push(`%${keyword}%`)
|
|
const keywordParam = `$${params.length}`
|
|
filters.push(`(
|
|
(
|
|
o.platform_order_id || ' ' || o.shop_id || ' ' || o.shop_name || ' ' ||
|
|
o.buyer_id || ' ' || o.buyer_name || ' ' || o.receiver_contact
|
|
) ILIKE ${keywordParam}
|
|
OR (
|
|
COALESCE(o.raw_payload_json->'body'->>'itemTitle', o.raw_payload_json->>'itemTitle', '') || ' ' ||
|
|
COALESCE(o.raw_payload_json->'body'->>'productNo', o.raw_payload_json->>'productNo', '') || ' ' ||
|
|
COALESCE(o.raw_payload_json->'body'->>'itemId', o.raw_payload_json->>'itemId', '') || ' ' ||
|
|
COALESCE(o.raw_payload_json->'body'->>'skuId', o.raw_payload_json->>'skuId', '')
|
|
) ILIKE ${keywordParam}
|
|
OR EXISTS (
|
|
SELECT 1
|
|
FROM order_items oi
|
|
WHERE oi.order_id = o.id
|
|
AND (
|
|
(
|
|
oi.sku_code || ' ' || oi.sku_name || ' ' ||
|
|
COALESCE(oi.item_snapshot_json->'kuaishouSendCode'->>'itemTitle', '') || ' ' ||
|
|
COALESCE(oi.item_snapshot_json->'kuaishouSendCode'->>'skuNick', '')
|
|
) ILIKE ${keywordParam}
|
|
OR (
|
|
COALESCE(oi.spec_json->>'skuNick', '') || ' ' ||
|
|
COALESCE(oi.spec_json->>'itemTitle', '')
|
|
) ILIKE ${keywordParam}
|
|
)
|
|
)
|
|
)`)
|
|
}
|
|
}
|
|
|
|
if (provider) {
|
|
appendProviderFilter(filters, params, provider)
|
|
}
|
|
|
|
if (platformOrderId) {
|
|
const trimmedPlatformOrderId = String(platformOrderId).trim()
|
|
if (isPlatformOrderIdLookupKeyword(trimmedPlatformOrderId)) {
|
|
params.push(trimmedPlatformOrderId)
|
|
const paramIndex = `$${params.length}`
|
|
filters.push(
|
|
`(o.platform_order_id = ${paramIndex} OR o.platform_order_id LIKE ${paramIndex} || '%')`,
|
|
)
|
|
} else {
|
|
params.push(`%${trimmedPlatformOrderId}%`)
|
|
filters.push(`o.platform_order_id ILIKE $${params.length}`)
|
|
}
|
|
}
|
|
|
|
if (payStatus) {
|
|
params.push(payStatus)
|
|
filters.push(`o.pay_status = $${params.length}`)
|
|
}
|
|
|
|
if (taskStatus) {
|
|
params.push(taskStatus)
|
|
filters.push(
|
|
`EXISTS (SELECT 1 FROM fulfillment_tasks ft WHERE ft.order_id = o.id AND ft.task_status = $${params.length})`,
|
|
)
|
|
}
|
|
|
|
if (executorKey) {
|
|
params.push(executorKey)
|
|
filters.push(
|
|
`EXISTS (SELECT 1 FROM fulfillment_tasks ft WHERE ft.order_id = o.id AND ft.executor_key = $${params.length})`,
|
|
)
|
|
}
|
|
|
|
if (skuCode) {
|
|
params.push(skuCode)
|
|
filters.push(
|
|
`EXISTS (SELECT 1 FROM order_items oi WHERE oi.order_id = o.id AND oi.sku_code = $${params.length})`,
|
|
)
|
|
}
|
|
|
|
// 有关键词时不限日期,避免默认近 N 天挡住搜单号/商品。
|
|
const applyDateFilter = Boolean(dateFrom || dateTo) && !String(keyword || '').trim()
|
|
if (applyDateFilter && dateFrom) {
|
|
params.push(String(dateFrom).trim().slice(0, 10))
|
|
filters.push(
|
|
`COALESCE(o.paid_at, o.created_at) >= ($${params.length}::date)::timestamp AT TIME ZONE 'Asia/Shanghai'`,
|
|
)
|
|
}
|
|
|
|
if (applyDateFilter && dateTo) {
|
|
params.push(String(dateTo).trim().slice(0, 10))
|
|
filters.push(
|
|
`COALESCE(o.paid_at, o.created_at) < (($${params.length}::date + 1)::timestamp AT TIME ZONE 'Asia/Shanghai')`,
|
|
)
|
|
}
|
|
|
|
const whereClause = filters.length > 0 ? `WHERE ${filters.join(' AND ')}` : ''
|
|
const totalResult = await executor<{ [column: string]: unknown; total: number }>(
|
|
`SELECT COUNT(*)::int AS total FROM orders o ${whereClause}`,
|
|
params,
|
|
)
|
|
|
|
params.push(pageSize)
|
|
params.push(offset)
|
|
const itemsResult = await executor<OrderListRow>(
|
|
`
|
|
SELECT o.*
|
|
FROM orders o
|
|
${whereClause}
|
|
ORDER BY COALESCE(o.paid_at, o.created_at) DESC NULLS LAST, o.id DESC
|
|
LIMIT $${params.length - 1} OFFSET $${params.length}
|
|
`,
|
|
params,
|
|
)
|
|
|
|
return {
|
|
items: itemsResult.rows,
|
|
total: Number(totalResult.rows[0]?.total || 0),
|
|
}
|
|
}
|
|
|
|
/** 来源渠道筛选:兼容历史 provider / platform 多种写法。 */
|
|
function appendProviderFilter(filters: string[], params: unknown[], provider: string) {
|
|
const normalized = String(provider || '').trim().toLowerCase()
|
|
if (!normalized) {
|
|
return
|
|
}
|
|
|
|
if (normalized === 'pdd') {
|
|
filters.push(`(o.provider = 'pdd' OR o.platform = 'pdd')`)
|
|
return
|
|
}
|
|
|
|
if (normalized === '91' || normalized === '91kaquan' || normalized === 'open_91') {
|
|
filters.push(
|
|
`(o.provider IN ('91kaquan', 'open_91', '91') OR o.platform IN ('91kaquan', '91'))`,
|
|
)
|
|
return
|
|
}
|
|
|
|
if (normalized === 'kuaishou' || normalized === 'kuaishou-industry') {
|
|
filters.push(`(o.provider LIKE 'kuaishou%' OR o.platform LIKE 'kuaishou%')`)
|
|
return
|
|
}
|
|
|
|
params.push(provider)
|
|
filters.push(`(o.provider = $${params.length} OR o.platform = $${params.length})`)
|
|
}
|