新增财务申请时间类型筛选

This commit is contained in:
yml2213
2026-09-02 14:32:26 +08:00
parent bf167d98ed
commit 625df52992
8 changed files with 162 additions and 33 deletions
@@ -513,6 +513,9 @@ export type FinanceRequestListInput = {
/** 申请时间区间(YYYY-MM-DD 含全天,或 YYYY-MM-DD HH:mm:ss 精确到秒;上海时区);后台列表筛选使用。 */
createdFrom?: string
createdTo?: string
/** 后台审核通过时间区间(上海时区);仅匹配已审核通过的申请。 */
reviewedFrom?: string
reviewedTo?: string
/** 收款渠道筛选:alipay / wechat */
accountChannel?: string
}
@@ -290,6 +290,8 @@ export async function listWorkerFinanceRequests({
keyword = '',
createdFrom = '',
createdTo = '',
reviewedFrom = '',
reviewedTo = '',
accountChannel = '',
}: FinanceRequestListInput = {}): Promise<{ items: WorkerFinanceRequestRow[]; total: number }> {
const { whereClause, params } = buildWorkerFinanceRequestWhere({
@@ -300,6 +302,8 @@ export async function listWorkerFinanceRequests({
keyword,
createdFrom,
createdTo,
reviewedFrom,
reviewedTo,
accountChannel,
})
const totalResult = await query<{ total: number }>(
@@ -335,6 +339,8 @@ export async function summarizeWorkerFinanceRequests(
keyword: input.keyword || '',
createdFrom: input.createdFrom || '',
createdTo: input.createdTo || '',
reviewedFrom: input.reviewedFrom || '',
reviewedTo: input.reviewedTo || '',
accountChannel: input.accountChannel || '',
})
const result = await query<{ channel: string; total: number; amount: string | number }>(
@@ -612,7 +618,7 @@ async function getWorkerFinanceRequestByIdWithClient(
return result.rows[0] || null
}
function buildWorkerFinanceRequestWhere({
export function buildWorkerFinanceRequestWhere({
requestId = 0,
workerId = 0,
status = '',
@@ -620,6 +626,8 @@ function buildWorkerFinanceRequestWhere({
keyword = '',
createdFrom = '',
createdTo = '',
reviewedFrom = '',
reviewedTo = '',
accountChannel = '',
}: FinanceRequestListInput) {
const filters: string[] = []
@@ -642,6 +650,22 @@ function buildWorkerFinanceRequestWhere({
: `wfr.created_at < (($${params.length}::date + 1)::timestamp) AT TIME ZONE 'Asia/Shanghai'`,
)
}
if (reviewedFrom || reviewedTo) {
// “审核通过时间”只适用于已通过的申请;待处理、拒绝和取消记录不参与该时间筛选。
filters.push(`wfr.status = 'approved'`)
}
if (reviewedFrom) {
params.push(reviewedFrom)
filters.push(`wfr.reviewed_at >= ($${params.length}::timestamp) AT TIME ZONE 'Asia/Shanghai'`)
}
if (reviewedTo) {
params.push(reviewedTo)
filters.push(
reviewedTo.length > 10
? `wfr.reviewed_at <= ($${params.length}::timestamp) AT TIME ZONE 'Asia/Shanghai'`
: `wfr.reviewed_at < (($${params.length}::date + 1)::timestamp) AT TIME ZONE 'Asia/Shanghai'`,
)
}
if (requestId) {
params.push(requestId)
filters.push(`wfr.id = $${params.length}`)
@@ -1,7 +1,32 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { resolveWithdrawApprovalPlan, resolveWithdrawRejectionPlan } from './worker-finance-repo.js'
import {
buildWorkerFinanceRequestWhere,
resolveWithdrawApprovalPlan,
resolveWithdrawRejectionPlan,
} from './worker-finance-repo.js'
test('资金申请列表支持按打手申请时间和后台审核通过时间筛选', () => {
const result = buildWorkerFinanceRequestWhere({
createdFrom: '2026-09-01 10:00:00',
createdTo: '2026-09-01 18:30:59',
reviewedFrom: '2026-09-02',
reviewedTo: '2026-09-03',
})
assert.deepEqual(result.params, [
'2026-09-01 10:00:00',
'2026-09-01 18:30:59',
'2026-09-02',
'2026-09-03',
])
assert.match(result.whereClause, /wfr\.created_at >= \(\$1::timestamp\)/)
assert.match(result.whereClause, /wfr\.created_at <= \(\$2::timestamp\)/)
assert.match(result.whereClause, /wfr\.status = 'approved'/)
assert.match(result.whereClause, /wfr\.reviewed_at >= \(\$3::timestamp\)/)
assert.match(result.whereClause, /wfr\.reviewed_at < \(\(\$4::date \+ 1\)::timestamp\)/)
})
test('提现通过(新口径):申请时已冻结,确认打款只解冻不动可用余额', () => {
const plan = resolveWithdrawApprovalPlan({