From 137f8173ab42283df261e083e42928ce0bb37625 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 11 Sep 2026 12:36:12 +0800
Subject: [PATCH] fix: keep full-chain acceptance aligned with current APIs

---
 scripts/admin-test-env-modules/phase3-pda-convergence.mjs | 2 +-
 scripts/admin-test-env-modules/phase4-overseas-pda.mjs    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/admin-test-env-modules/phase3-pda-convergence.mjs b/scripts/admin-test-env-modules/phase3-pda-convergence.mjs
index 2c42f2d0d..63970322b 100644
--- a/scripts/admin-test-env-modules/phase3-pda-convergence.mjs
+++ b/scripts/admin-test-env-modules/phase3-pda-convergence.mjs
@@ -53,7 +53,7 @@ export async function run(context) {
     `${taskPath}?warehouseId=${encodeURIComponent(warehouseId)}`)
   const taskDetail = context.apiSuccess(MODULE, '按稳定 taskId 读取 PDA 任务详情', taskDetailResponse, '', OPTIONS)
   const pendingResponse = await request(context, 'GET',
-    `/api/platform/v1/first-leg/pda-loading/tasks/pending?keyword=${encodeURIComponent(containerNo)}`)
+    `/api/platform/v1/first-leg/pda-loading/tasks/pending?warehouseId=${encodeURIComponent(warehouseId)}&keyword=${encodeURIComponent(containerNo)}`)
   const pendingTasks = context.apiSuccess(MODULE, '读取当前操作员 PDA pending 列表', pendingResponse, '', OPTIONS)
   const pendingTask = Array.isArray(pendingTasks)
     ? pendingTasks.find((item) => id(item?.taskId) === taskId)
diff --git a/scripts/admin-test-env-modules/phase4-overseas-pda.mjs b/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
index aa26e51a1..b6268b4af 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
@@ -93,8 +93,10 @@ async function captureCompletedOrder(context, containerNo, expectedCustomerId) {
 
 async function loginMerchantForNegativeProbe(context) {
   const fixture = context.context?.merchantQualificationFixture
-  if (!fixture?.username || !fixture?.password) return null
-  const response = await context.request('POST', '/api/auth/login', { loginId: fixture.username, password: fixture.password }, '')
+  const username = fixture?.username || context.options?.merchantUsername
+  const password = fixture?.password || context.options?.merchantPassword
+  if (!username || !password) return null
+  const response = await context.request('POST', '/api/auth/login', { loginId: username, password }, '')
   const data = success(response) ? response.body?.data : null
   context.addStep(MODULE, '本轮客户登录取得海外令牌用于PDA越权反证', response,
     success(response) && nonBlank(data?.overseasAccessToken),