优化

scripts/admin-test-env-modules/ocean-bookings.mjs

@@ -16,13 +16,17 @@ async function request(context, method, path, body, headers = {}) {
   } catch (error) { return { method, path, http: 0, body: null, raw: String(error), requestId: null, traceId: null } }
 }
 function data(r) { return String(r?.body?.code) === '200' ? r.body.data : null }
-async function createBooking(context, suffix, key, master) {
+async function createBooking(context, suffix, key, master, bookingAgent) {
   const containers = [
     { containerNo: `TST-${suffix}-01`.slice(0, 64), containerType: '40HC', containerKind: 'FCL', capacityCbm: 76, maxWeightKg: 28000 },
     { containerNo: `TST-${suffix}-02`.slice(0, 64), containerType: '20GP', containerKind: 'FCL', capacityCbm: 33, maxWeightKg: 28000 },
   ]
   return request(context, 'POST', BASE,
-    { expectedVersion: 0, data: oceanBookingDraft(context, suffix, master, { containers }) },
+    { expectedVersion: 0, data: oceanBookingDraft(context, suffix, master, {
+      containers,
+      bookingAgentId: bookingAgent.supplierId,
+      bookingAgentName: bookingAgent.name,
+    }) },
     { 'Idempotency-Key': key })
 }
 function step(context, name, r, pass, evidence, options = OPTIONS) { context.addStep(MODULE, name, r, pass, evidence, { ...options, deploymentBlocker: options.deploymentBlocker && !pass }) }
@@ -116,6 +120,15 @@ export async function run(context) {
   }
   const master = await resolveOceanBookingMaster(context, MODULE)
   if (!master) return
+  const bookingAgentResponse = await request(context, 'GET',
+    '/api/platform/v1/suppliers?tenantId=0&category=BOOKING&status=ACTIVE&page=1&size=20')
+  const bookingAgentPage = context.apiSuccess(MODULE, '查询启用的订舱供应商', bookingAgentResponse, '', OPTIONS)
+  const bookingAgent = bookingAgentPage?.records?.find?.((item) => item?.category === 'BOOKING' && item?.status === 'ACTIVE')
+  context.assert(MODULE, '订舱供应商不区分国内或国外', bookingAgentResponse,
+    Boolean(bookingAgent?.id && bookingAgent?.name) && !Object.hasOwn(bookingAgent || {}, 'scope'),
+    `supplierId=${id(bookingAgent?.id) || 'missing'}, scopeExposed=${Object.hasOwn(bookingAgent || {}, 'scope')}`, OPTIONS)
+  if (!bookingAgent?.id || !bookingAgent?.name || Object.hasOwn(bookingAgent, 'scope')) return
+  const bookingAgentSnapshot = { supplierId: id(bookingAgent.id), name: bookingAgent.name }
   const list = await request(context, 'GET', `${BASE}?page=1&size=5`)
   if (missing(list) || list.http === 0) {
     step(context, '海运订舱服务契约已部署', list, false, `入口 ${BASE} 不可用：HTTP=${list.http}, code=${codeOf(list)}`)
@@ -148,7 +161,7 @@ export async function run(context) {
   await createConfirmedUnassignedBooking(context, suffix, master)
 
   const key = `${context.marker}-ocean-create`
-  const createResponse = await createBooking(context, suffix, key, master)
+  const createResponse = await createBooking(context, suffix, key, master, bookingAgentSnapshot)
   const detail = data(createResponse); const bookingId = id(detail?.oceanBooking?.id)
   context.apiSuccess(MODULE, '创建隔离海运订舱', createResponse, `key=${key}`, OPTIONS)
   context.assert(MODULE, '线下已确认订舱 DTO、运输快照和关联字段完整', createResponse,
@@ -160,6 +173,10 @@ export async function run(context) {
   context.assert(MODULE, '指定客户订舱持久化本轮客户范围快照', createResponse,
     id(detail?.oceanBooking?.customerId) === id(master.customerId) && detail?.oceanBooking?.customerName === master.customerName,
     `expectedCustomerId=${id(master.customerId)}, actualCustomerId=${id(detail?.oceanBooking?.customerId) || 'missing'}`, OPTIONS)
+  context.assert(MODULE, '订舱持久化启用订舱供应商快照', createResponse,
+    id(detail?.oceanBooking?.bookingAgentId) === bookingAgentSnapshot.supplierId
+      && detail?.oceanBooking?.bookingAgentName === bookingAgentSnapshot.name,
+    `expected=${bookingAgentSnapshot.supplierId}/${bookingAgentSnapshot.name}, actual=${id(detail?.oceanBooking?.bookingAgentId) || 'missing'}/${detail?.oceanBooking?.bookingAgentName || 'missing'}`, OPTIONS)
   const expectedContainerNos = [`TST-${suffix}-01`.slice(0, 64), `TST-${suffix}-02`.slice(0, 64)]
   context.assert(MODULE, '一单两柜逐柜原子生成独立需求分配和 ACTIVE 操作身份', createResponse,
     detail?.containers?.length === 2 && expectedContainerNos.every((containerNo) => {
@@ -172,7 +189,7 @@ export async function run(context) {
   if (!bookingId) return
   context.createdResources.oceanBooking = { id: bookingId, customerId: master.customerId, marker: context.marker,
     containerBookingId: null, loadingPlanId: null, finalStatus: 'CONFIRMED' }
-  const replay = await createBooking(context, suffix, key, master)
+  const replay = await createBooking(context, suffix, key, master, bookingAgentSnapshot)
   context.assert(MODULE, '创建 Idempotency-Key 重放返回同一订舱', replay, String(data(replay)?.oceanBooking?.id) === bookingId, `first=${bookingId}, replay=${id(data(replay)?.oceanBooking?.id)}`, OPTIONS)
   const existingContainerNo = detail?.containers?.[0]?.containerNo
   const globalDuplicateDraft = oceanBookingDraft(context, `${suffix}G`, master, { containers: [{