From f8e6c6cb5bf75ebfc426aee1e42af8c1ec599b4b Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Sun, 19 Jul 2026 23:02:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E9=80=9A=E9=81=93?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8=E7=8E=AF=E5=A2=83=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E8=AF=BB=E5=9B=BA=E5=8C=96=20sandbox=EF=BC=8C?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=87=E6=8D=A2=E7=A1=AE=E8=AE=A4=E6=96=87?= =?UTF-8?q?=E6=A1=88=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 通道商户列表 (商户视图/全局视图) 环境标签从读 row.activeEnv 改为读 row.sandbox (activeEnv 现在表示产品当前路由目标环境，sandbox 才是商户固化的创建时快照) - ChannelMerchantResult 类型注释更新，明确 sandbox 为固化字段、activeEnv 为路由目标 - ProductConfig 切换确认文案 (switchToSandboxConfirm / switchToProdConfirm) 改为说明 「仅影响新建商户默认环境与路由目标，已存在商户保持原环境不变」 - 六语种 i18n 同步：zh-CN / en-US / zh-TW / zh-HK / ja-JP / ko-KR --- .../src/api/payment/channel/channel-merchant.api.ts | 4 ++-- .../src/locales/langs/en-US/payment/constant/product.json | 4 ++-- .../src/locales/langs/ja-JP/payment/constant/product.json | 4 ++-- .../src/locales/langs/ko-KR/payment/constant/product.json | 4 ++-- .../src/locales/langs/zh-CN/payment/constant/product.json | 4 ++-- .../src/locales/langs/zh-HK/payment/constant/product.json | 4 ++-- .../src/locales/langs/zh-TW/payment/constant/product.json | 4 ++-- .../channel-merchant-global/ChannelMerchantGlobalList.vue | 7 ++++--- .../merchant/channel-merchant/ChannelMerchantList.vue | 7 ++++--- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/apps/daxpay-admin/src/api/payment/channel/channel-merchant.api.ts b/apps/daxpay-admin/src/api/payment/channel/channel-merchant.api.ts index e5f912162..fb7b79b6a 100644 --- a/apps/daxpay-admin/src/api/payment/channel/channel-merchant.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/channel-merchant.api.ts @@ -54,11 +54,11 @@ export interface ChannelMerchantResult extends BaseEntity { channel?: string; /** 是否启用 */ enable?: boolean; - /** 当前生效环境(来自支付产品配置, 商户只读): prod/sandbox */ + /** 当前产品生效环境(决定路由目标, 来自支付产品配置): prod/sandbox */ activeEnv?: string; /** 是否支持沙箱环境 */ sandboxSupport?: boolean; - /** 是否为沙箱环境通道商户 */ + /** 是否为沙箱环境通道商户(创建时按当时产品 activeEnv 固化写入, 之后不随产品切换改变) */ sandbox?: boolean; /** 通道商户创建来源 */ source?: string; diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json index 6f073687a..2f92474af 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json @@ -32,8 +32,8 @@ "prodConfigBtn": "Production", "sandboxConfigBtn": "Sandbox", "switchEnv": "Switch Environment", - "switchToSandboxConfirm": "Switch to sandbox environment? All transactions will use sandbox API endpoints, suitable for integration and functional testing.", - "switchToProdConfirm": "Switch to production environment? All transactions will use production API endpoints and involve real fund flows.", + "switchToSandboxConfirm": "Switch to sandbox environment? This only affects the default environment for newly created channel merchants and the payment routing target. Existing channel merchants retain their original environment.", + "switchToProdConfirm": "Switch to production environment? This only affects the default environment for newly created channel merchants and the payment routing target. Existing channel merchants retain their original environment.", "nonIsvDisabledTip": "Non-ISV payment products cannot be edited" }, "placeholder": { diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/constant/product.json index 918fbaa72..7ac5e3522 100644 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/constant/product.json @@ -32,8 +32,8 @@ "prodConfigBtn": "生産", "sandboxConfigBtn": "サンドボックス", "switchEnv": "スイッチ環境", - "switchToSandboxConfirm": "サンドボックス環境に切り替えますか?すべてのトランザクションは、統合および機能テストに適したサンドボックス API エンドポイントを使用します。", - "switchToProdConfirm": "実稼働環境に切り替えますか?すべてのトランザクションは本番 API エンドポイントを使用し、実際の資金の流れが関与します。", + "switchToSandboxConfirm": "サンドボックス環境に切り替えますか?切り替え後、新規作成するチャネル加盟店のデフォルト環境と支払いルーティング先にのみ影響します。既存のチャネル加盟店はそれぞれ元の環境を維持します。", + "switchToProdConfirm": "実稼働環境に切り替えますか?切り替え後、新規作成するチャネル加盟店のデフォルト環境と支払いルーティング先にのみ影響します。既存のチャネル加盟店はそれぞれ元の環境を維持します。", "nonIsvDisabledTip": "非 ISV 支払い商品は編集できません" }, "placeholder": { diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/constant/product.json index 479a965cf..b8e2f1aaa 100644 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/constant/product.json @@ -32,8 +32,8 @@ "prodConfigBtn": "생산", "sandboxConfigBtn": "모래 상자", "switchEnv": "스위치 환경", - "switchToSandboxConfirm": "샌드박스 환경으로 전환하시겠습니까? 모든 트랜잭션은 통합 및 기능 테스트에 적합한 샌드박스 API 엔드포인트를 사용합니다.", - "switchToProdConfirm": "프로덕션 환경으로 전환하시겠습니까? 모든 거래는 생산 API 엔드포인트를 사용하며 실제 자금 흐름을 포함합니다.", + "switchToSandboxConfirm": "샌드박스 환경으로 전환하시겠습니까? 전환 후 새로 생성되는 채널 가맹점의 기본 환경과 결제 라우팅 대상에만 영향을 미치며, 기존 채널 가맹점은 각자의 원래 환경을 유지합니다.", + "switchToProdConfirm": "프로덕션 환경으로 전환하시겠습니까? 전환 후 새로 생성되는 채널 가맹점의 기본 환경과 결제 라우팅 대상에만 영향을 미치며, 기존 채널 가맹점은 각자의 원래 환경을 유지합니다.", "nonIsvDisabledTip": "ISV 이외의 결제 상품은 편집할 수 없습니다." }, "placeholder": { diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json index 638fc769a..ee7810c62 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json @@ -32,8 +32,8 @@ "prodConfigBtn": "生产配置", "sandboxConfigBtn": "沙箱配置", "switchEnv": "切换环境", - "switchToSandboxConfirm": "确定要切换到沙箱环境吗？所有交易将会使用调用沙箱接口，适用于接口联调与功能测试。", - "switchToProdConfirm": "确定要切换到生产环境吗？所有交易将使用生产接口进行真实请求，并产生真实资金往来。", + "switchToSandboxConfirm": "确定要切换到沙箱环境吗？切换后仅影响「新建通道商户的默认环境」与「支付路由目标」，已创建的通道商户保持各自原环境不变。", + "switchToProdConfirm": "确定要切换到生产环境吗？切换后仅影响「新建通道商户的默认环境」与「支付路由目标」，已创建的通道商户保持各自原环境不变。", "nonIsvDisabledTip": "非服务商类型的支付产品无法编辑" }, "placeholder": { diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/constant/product.json index c30d068a8..e2fc70dd4 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/constant/product.json @@ -32,8 +32,8 @@ "prodConfigBtn": "生產配置", "sandboxConfigBtn": "沙箱配置", "switchEnv": "切換環境", - "switchToSandboxConfirm": "確定要切換到沙箱環境嗎？所有交易將會使用調用沙箱接口，適用於接口聯調與功能測試。", - "switchToProdConfirm": "確定要切換到生產環境嗎？所有交易將使用生產接口進行真實請求，併產生真實資金往來。", + "switchToSandboxConfirm": "確定要切換到沙箱環境嗎？切換後僅影響「新建通道商戶的預設環境」與「支付路由目標」，已建立的通道商戶保持各自原環境不變。", + "switchToProdConfirm": "確定要切換到生產環境嗎？切換後僅影響「新建通道商戶的預設環境」與「支付路由目標」，已建立的通道商戶保持各自原環境不變。", "nonIsvDisabledTip": "非服務商類型的支付產品無法編輯" }, "placeholder": { diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/constant/product.json index 8ee2b459a..2650f7971 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/constant/product.json @@ -32,8 +32,8 @@ "prodConfigBtn": "生產配置", "sandboxConfigBtn": "沙箱配置", "switchEnv": "切換環境", - "switchToSandboxConfirm": "確定要切換到沙箱環境嗎？所有交易將會使用呼叫沙箱介面，適用於介面聯調與功能測試。", - "switchToProdConfirm": "確定要切換到生產環境嗎？所有交易將使用生產介面進行真實請求，併產生真實資金往來。", + "switchToSandboxConfirm": "確定要切換到沙箱環境嗎？切換後僅影響「新建通道商戶的預設環境」與「支付路由目標」，已建立的通道商戶保持各自原環境不變。", + "switchToProdConfirm": "確定要切換到生產環境嗎？切換後僅影響「新建通道商戶的預設環境」與「支付路由目標」，已建立的通道商戶保持各自原環境不變。", "nonIsvDisabledTip": "非服務商型別的支付產品無法編輯" }, "placeholder": { diff --git a/apps/daxpay-admin/src/views/payment/merchant/channel-merchant-global/ChannelMerchantGlobalList.vue b/apps/daxpay-admin/src/views/payment/merchant/channel-merchant-global/ChannelMerchantGlobalList.vue index 42dba3bb8..2cf412445 100644 --- a/apps/daxpay-admin/src/views/payment/merchant/channel-merchant-global/ChannelMerchantGlobalList.vue +++ b/apps/daxpay-admin/src/views/payment/merchant/channel-merchant-global/ChannelMerchantGlobalList.vue @@ -217,15 +217,16 @@