恢复付款入口与常开基线（08-01-reimbursement-notification-progress-clarity）

scripts/qa/run-p2-fin-live-window.sh

@@ -6,7 +6,9 @@ CLIENT_DIR="$ROOT_DIR/client"
 PUBLIC_BASE_URL="${LIVE_SMOKE_BASE_URL:-https://oa.hyinda.com}"
 REPORT_DIR="${P2_FIN_LIVE_REPORT_DIR:-$ROOT_DIR/artifacts/qa-flow/p2-fin-live-$(date +%Y%m%d-%H%M%S)}"
 SUMMARY_TXT="$REPORT_DIR/summary.txt"
+FLAG_SNAPSHOT_FILE="$REPORT_DIR/payment-batch-flag-before.json"
 STATUS=0
+ALREADY_ON_MODE=0
 
 mkdir -p "$REPORT_DIR"
 : >"$SUMMARY_TXT"
@@ -46,93 +48,10 @@ run_shell_step() {
   run_step "$name" bash -lc "$command"
 }
 
-force_payment_batch_flag_off() {
-  node <<'NODE'
-const baseUrl = (process.env.LIVE_SMOKE_BASE_URL || "https://oa.hyinda.com").replace(/\/$/, "");
-const identifier = process.env.LIVE_SMOKE_ADMIN_IDENTIFIER?.trim();
-const password = process.env.LIVE_SMOKE_ADMIN_PASSWORD?.trim();
-const issueId = process.env.QA_ISSUE_ID?.trim() || "P2FLIVE";
-
-if (!identifier || !password) {
-  console.error("[p2-fin-live][rollback] missing admin credentials");
-  process.exit(1);
-}
-
-async function fetchJson(url, init = {}) {
-  const response = await fetch(url, {
-    ...init,
-    signal: AbortSignal.timeout(20_000),
-  });
-  const text = await response.text();
-  let json = null;
-  try {
-    json = text ? JSON.parse(text) : null;
-  } catch {
-    json = null;
-  }
-  return { response, json };
-}
-
-function errorSummary(json, status) {
-  const error = json?.error ?? {};
-  return `${status} ${error.code ?? ""} ${error.message ?? ""}`.trim();
-}
-
-const login = await fetchJson(`${baseUrl}/api/auth/login`, {
-  method: "POST",
-  headers: {
-    "content-type": "application/json",
-    "x-device-fingerprint": "p2-fin-live-runner-rollback",
-  },
-  body: JSON.stringify({ identifier, password }),
-});
-if (!login.response.ok || !login.json?.data?.accessToken) {
-  console.error(`[p2-fin-live][rollback] login failed: ${errorSummary(login.json, login.response.status)}`);
-  process.exit(1);
-}
-
-const token = login.json.data.accessToken;
-const list = await fetchJson(`${baseUrl}/api/system/feature-flags`, {
-  headers: { authorization: `Bearer ${token}`, accept: "application/json" },
-});
-if (!list.response.ok) {
-  console.error(`[p2-fin-live][rollback] list flags failed: ${errorSummary(list.json, list.response.status)}`);
-  process.exit(1);
-}
-
-const flag = list.json?.data?.items?.find((item) => item.flagKey === "payment_batch_v1");
-if (!flag) {
-  console.error("[p2-fin-live][rollback] missing payment_batch_v1");
-  process.exit(1);
-}
-
-if (flag.overrideMode === "force_off" && flag.effectiveEnabled === false) {
-  console.log("[p2-fin-live][rollback] payment_batch_v1 already force_off");
-  process.exit(0);
-}
-
-const updated = await fetchJson(`${baseUrl}/api/system/feature-flags/payment_batch_v1`, {
-  method: "PUT",
-  headers: {
-    authorization: `Bearer ${token}`,
-    "content-type": "application/json",
-    accept: "application/json",
-  },
-  body: JSON.stringify({
-    overrideMode: "force_off",
-    rolloutType: "global",
-    departmentIds: [],
-    note: `${issueId} runner final rollback`,
-    expectedVersion: flag.version,
-  }),
-});
-if (!updated.response.ok) {
-  console.error(`[p2-fin-live][rollback] update failed: ${errorSummary(updated.json, updated.response.status)}`);
-  process.exit(1);
-}
-const item = updated.json?.data?.item;
-console.log(`[p2-fin-live][rollback] payment_batch_v1 override=${item?.overrideMode ?? "unknown"} effective=${item?.effectiveEnabled ?? "unknown"}`);
-NODE
+restore_payment_batch_flag_snapshot() {
+  P2_FIN_LIVE_APPROVED=1 LIVE_SMOKE_BASE_URL="$PUBLIC_BASE_URL" \
+    node "$ROOT_DIR/scripts/qa/payment-batch-flag-snapshot.mjs" restore \
+      --snapshot-file "$FLAG_SNAPSHOT_FILE"
 }
 
 write_summary_json() {
@@ -146,27 +65,18 @@ write_summary_json() {
     QA_BASE_URL="$PUBLIC_BASE_URL" \
     QA_MODE="p2-fin-live-window" \
     QA_STATUS="$qa_status" \
-    QA_SUMMARY_NOTES="${QA_ISSUE_ID:-P2FLIVE} 公网短窗口：临时启用 payment_batch_v1，完成测试付款闭环后强制回滚到 flag_force_off；不部署、不接真实支付、不开放图片 OCR。" \
+    QA_SUMMARY_NOTES="${QA_ISSUE_ID:-P2FLIVE} 公网短窗口：临时启用 payment_batch_v1，结束后恢复调用前完整快照；不部署、不接真实支付、不开放图片 OCR。" \
     node "$ROOT_DIR/scripts/qa/write-qa-summary.mjs" >/dev/null 2>&1 || true
 }
 
 finish() {
-  if [[ "${P2_FIN_LIVE_APPROVED:-0}" == "1" ]]; then
-    echo ">>> [p2-fin-live] final-force-flag-off" | tee -a "$SUMMARY_TXT"
-    if force_payment_batch_flag_off > >(tee "$REPORT_DIR/final-force-flag-off.log") 2>&1; then
-      echo "[p2-fin-live][PASS] final-force-flag-off" | tee -a "$SUMMARY_TXT"
+  if [[ "${P2_FIN_LIVE_APPROVED:-0}" == "1" && -f "$FLAG_SNAPSHOT_FILE" ]]; then
+    echo ">>> [p2-fin-live] restore-caller-flag-snapshot" | tee -a "$SUMMARY_TXT"
+    if restore_payment_batch_flag_snapshot > >(tee "$REPORT_DIR/restore-caller-flag-snapshot.log") 2>&1; then
+      echo "[p2-fin-live][PASS] restore-caller-flag-snapshot" | tee -a "$SUMMARY_TXT"
     else
       local code="$?"
-      echo "[p2-fin-live][FAIL] final-force-flag-off exit=$code" | tee -a "$SUMMARY_TXT"
-      STATUS=1
-    fi
-
-    echo ">>> [p2-fin-live] final-flag-off-check" | tee -a "$SUMMARY_TXT"
-    if LIVE_SMOKE_BASE_URL="$PUBLIC_BASE_URL" node "$ROOT_DIR/scripts/qa/check-payment-batch-flag-off.mjs" --json > >(tee "$REPORT_DIR/final-flag-off-check.log") 2>&1; then
-      echo "[p2-fin-live][PASS] final-flag-off-check" | tee -a "$SUMMARY_TXT"
-    else
-      local code="$?"
-      echo "[p2-fin-live][FAIL] final-flag-off-check exit=$code" | tee -a "$SUMMARY_TXT"
+      echo "[p2-fin-live][FAIL] restore-caller-flag-snapshot exit=$code" | tee -a "$SUMMARY_TXT"
       STATUS=1
     fi
   fi
@@ -187,8 +97,13 @@ if [[ "${P2_FIN_LIVE_APPROVED:-0}" != "1" ]]; then
 fi
 
 run_shell_step "live-env-strict" "LIVE_SMOKE_BASE_URL='$PUBLIC_BASE_URL' node '$ROOT_DIR/scripts/qa/check-live-smoke-env.mjs' --strict"
-run_shell_step "pre-flag-off-check" "LIVE_SMOKE_BASE_URL='$PUBLIC_BASE_URL' node '$ROOT_DIR/scripts/qa/check-payment-batch-flag-off.mjs' --json"
-run_shell_step "p2-fin-live-spec" "cd '$CLIENT_DIR' && PLAYWRIGHT_MANUAL=1 E2E_MODE=live P2_FIN_LIVE_APPROVED=1 QA_ISSUE_ID='${QA_ISSUE_ID:-P2FLIVE}' P2_FIN_LIVE_MARKER_PREFIX='${P2_FIN_LIVE_MARKER_PREFIX:-${QA_ISSUE_ID:-P2FLIVE}}' P2_FIN_LIVE_REPORT_DIR='$REPORT_DIR' LIVE_SMOKE_BASE_URL='$PUBLIC_BASE_URL' npx playwright test tests/e2e/manual/p2-fin-live-payment-batch.spec.ts --workers=1 --reporter=list"
+[[ "$STATUS" -eq 0 ]] || exit "$STATUS"
+
+run_shell_step "capture-caller-flag-snapshot" "P2_FIN_LIVE_APPROVED=1 LIVE_SMOKE_BASE_URL='$PUBLIC_BASE_URL' node '$ROOT_DIR/scripts/qa/payment-batch-flag-snapshot.mjs' capture --snapshot-file '$FLAG_SNAPSHOT_FILE'"
+[[ "$STATUS" -eq 0 ]] || exit "$STATUS"
+
+ALREADY_ON_MODE="$(node -e 'const snapshot = require(process.argv[1]); process.stdout.write(snapshot.effectiveEnabled === true ? "1" : "0")' "$FLAG_SNAPSHOT_FILE")"
+run_shell_step "p2-fin-live-spec" "cd '$CLIENT_DIR' && PLAYWRIGHT_MANUAL=1 E2E_MODE=live P2_FIN_LIVE_APPROVED=1 P2_FIN_LIVE_FINAL_STATE=restore P2_FIN_LIVE_ALREADY_ON='$ALREADY_ON_MODE' QA_ISSUE_ID='${QA_ISSUE_ID:-P2FLIVE}' P2_FIN_LIVE_MARKER_PREFIX='${P2_FIN_LIVE_MARKER_PREFIX:-${QA_ISSUE_ID:-P2FLIVE}}' P2_FIN_LIVE_REPORT_DIR='$REPORT_DIR' LIVE_SMOKE_BASE_URL='$PUBLIC_BASE_URL' npx playwright test tests/e2e/manual/p2-fin-live-payment-batch.spec.ts --workers=1 --reporter=list"
 
 if [[ "${P2_FIN_LIVE_SKIP_MOBILE:-0}" == "1" ]]; then
   echo "[p2-fin-live][SKIP] mobile-wecom P2_FIN_LIVE_SKIP_MOBILE=1" | tee -a "$SUMMARY_TXT"