chore: 订单模块微调

This commit is contained in:
liufumingren 2026-08-06 04:05:27 +08:00
parent a40e1d56b7
commit c69d332b1b
2 changed files with 10 additions and 4 deletions

View File

@ -1210,6 +1210,7 @@ export const placeOrderTimeRangeScanField = scanBasicField({ label: '下单时
export const isUrgencyScanField = scanBasicField({ label: '是否紧急', value: 'is_urgency', type: 'select', options: isUrgencyFilterOptions })
export const buyerMessageHasScanField = scanBasicField({ label: '有无留言', value: 'buyer_message_has', type: 'select', options: buyerMessageHasFilterOptions })
export const buyerMessageScanField = scanBasicField({ label: '留言', value: 'buyer_message', type: 'text', defaultOperator: 'like' })
export const stockQueryScanField = scanBasicField({ label: '包含商品', value: 'stock_query', type: 'text', operators: ['like'], defaultOperator: 'like' })
/** 可复用 ScanBox 字段片段(工作流程) */
export const orderStatusScanField = (options: Array<{ label: string; value: string }>) =>
@ -1348,6 +1349,7 @@ export const deliveryAvailableFields = [
{ ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
// 流程状态
{ ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP },
{ ...outboundStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
@ -1528,6 +1530,7 @@ export const reviewAvailableFields = [
{ ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sysPlatformCodeScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
// 流程状态
{ ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
@ -1685,6 +1688,7 @@ export const pendingAvailableFields = [
{ ...sysPlatformNameScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
// 流程状态
{ ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
@ -1952,6 +1956,7 @@ export const workbenchAvailableFields = [
{ ...orderIdScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...waveNoScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...buyerNickScanField, group: SCAN_ORDER_INFO_GROUP },
// 流程状态
{ ...orderStatusScanField(workbenchStatusOptions), group: SCAN_PROCESS_STATUS_GROUP },
@ -2020,6 +2025,7 @@ export const expectionOrderAvailableFields = [
{ ...orderFlagScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...logisticsNameScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
// 流程状态
{ ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
{ ...storageStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },
@ -2133,6 +2139,7 @@ export const archiveAvailableFields = [
{ ...sourceOrderCodesScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...shopNickScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...expressCompanyScanField, group: SCAN_ORDER_INFO_GROUP },
{ ...stockQueryScanField, group: SCAN_ORDER_INFO_GROUP },
// 流程状态
{ ...orderStatusScanField(archiveOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP },
{ ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP },

View File

@ -370,7 +370,8 @@ export function buildOrderWhereConditions(rawConditions: Record<string, any>) {
if (condition && typeof condition === 'object' && 'operator' in condition) {
const normalized = normalizeWhereConditionEntry(condition)
if (normalized) {
where[normalizedKey] = normalized
const { type: _type, ...rest } = normalized
where[normalizedKey] = rest
}
return
}
@ -382,7 +383,6 @@ export function buildOrderWhereConditions(rawConditions: Record<string, any>) {
if (rangeValue) {
where[normalizedKey] = {
operator: 'between',
type: 'daterange',
value: rangeValue
}
}
@ -390,8 +390,7 @@ export function buildOrderWhereConditions(rawConditions: Record<string, any>) {
}
where[normalizedKey] = {
operator: 'eq',
value: condition,
type: 'text'
value: condition
}
})
return where