java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

align finance fixture waybill and pool response

Browse Source
This commit is contained in:
ouyangxq
2026-08-12 14:46:52 +08:00
parent c4e6c28da0
commit 0d2093054f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/admin-test-env-modules/finance-full-fixtures.mjs
+2 -1
View File
@@ -399,7 +399,8 @@ export async function run(context) {
context.createdResources.financeFullFixtures = {
marker: context.marker, customerId,
orders: measured.map((item) => ({ orderId: id(item.orderId), orderNo: item.orderNo || null,
waybillId: item.waybillId ? id(item.waybillId) : null, inboundId: id(item.inboundId),
shipmentId: item.shipmentId ? id(item.shipmentId) : null,
waybillId: item.waybillId ? id(item.waybillId) : (item.shipmentId ? id(item.shipmentId) : null), inboundId: id(item.inboundId),
actualWeightKg: item.actualWeightKg, totalVolumeCbm: item.totalVolumeCbm,
businessDate: fixtures.find((fee) => fee.orderId === id(item.orderId))?.businessDate || null })),
feeSources: fixtures,
scripts/admin-test-env-modules/finance-reconciliation-full.mjs
+3 -2
View File
@@ -19,7 +19,7 @@ function statementId(value) { return id(value?.statementId ?? value?.id ?? value
function settlementId(value) { return id(value?.settlementId ?? value?.id) }
function sourceId(value) { return id(value?.feeSourceId ?? value?.financeFeeSourceId ?? value?.id) }
function sourceDate(value) { return value?.businessDate ?? value?.billingDate ?? value?.feeDate ?? '' }
function sourceWaybill(value) { return id(value?.waybillId ?? value?.shipmentId ?? value?.orderId ?? value?.inboundId ?? value?.sourceNo) }
function sourceWaybill(value) { return id(value?.waybillId ?? value?.shipmentId ?? value?.orderNo ?? value?.sourceNo) }
function financePoolId(value) {
const poolItemId = id(value?.poolItemId)
if (poolItemId) return poolItemId.includes(':') ? poolItemId.slice(poolItemId.indexOf(':') + 1) : poolItemId
@@ -81,7 +81,8 @@ async function normalizeFixture(context) {
const orders = new Map(root.orders.map((order) => [id(order.orderId ?? order.id), order]))
const poolResponse = await context.request('GET',
`${BASE}/fee-pool?customerId=${encodeURIComponent(customerId)}&direction=ALL`)
const pool = rows(poolResponse?.body?.data).filter((item) => String(item?.sourceType ?? '') !== 'MANUAL_COST')
const poolData = poolResponse?.body?.data
const pool = rows(poolData).concat(rows(poolData?.items)).filter((item) => String(item?.sourceType ?? '') !== 'MANUAL_COST')
const poolBySource = new Map(pool.map((item) => [id(item?.sourceId), item]))
const attemptedSources = root.feeSources.map((raw) => {
const order = orders.get(id(raw.orderId))