merge: sync test and stabilize full acceptance

scripts/admin-test-env-modules/inbound-fees.mjs

@@ -39,7 +39,7 @@ export async function ensureInitialCalculated(context, fixture,
   if (!success(initialResponse) && String(initialResponse?.body?.code) === 'A0404') {
     initialResponse = await context.request('POST',
       `/api/platform/v1/inbounds/${encodeURIComponent(inboundId)}/fees/calculate?tenantId=${encodeURIComponent(tenantId)}`,
-      undefined, undefined, requestHeaders(`${context.marker}-inbound-fee-initial-calculate`))
+      undefined, undefined, requestHeaders(`${context.marker}-${inboundId}-inbound-fee-initial-calculate`))
   }
   const initial = context.apiSuccess(MODULE, '读取或补齐审核后初始费用', initialResponse, '', options)
   context.assert(MODULE, '初始费用保持 WAIT_SPLIT 且尚未发布', initialResponse,
@@ -132,8 +132,9 @@ export async function run(context) {
     `status=${sent?.feeStatus || 'missing'}, process=${sent?.nextProcessStatus || 'missing'}, publication=${published?.publicationStatus || 'missing'}`, OPTIONS)
 
   const orderId = id(fixture?.orderId)
+  const merchantFixture = context.context?.merchantQualificationFixture
   const merchantLoginResponse = await context.request('POST', '/api/auth/login', {
-    loginId: context.options.merchantUsername, password: context.options.merchantPassword,
+    loginId: merchantFixture?.username, password: merchantFixture?.password,
   }, '')
   const merchantLogin = context.apiSuccess(MODULE, 'Client 登录并准备确认计费量和费用', merchantLoginResponse,
     `orderId=${orderId || 'missing'}`, OPTIONS)