diff --git a/apps/daxpay-admin/src/api/payment/develop/developAuth.api.ts b/apps/daxpay-admin/src/api/payment/develop/developAuth.api.ts index d8cf5e18a..bcc2d3ecb 100644 --- a/apps/daxpay-admin/src/api/payment/develop/developAuth.api.ts +++ b/apps/daxpay-admin/src/api/payment/develop/developAuth.api.ts @@ -85,5 +85,5 @@ export interface ChannelAuthUrlParam { /** 支付能力 */ capability?: string; /** 指定认证应用 AppId */ - opAppId?: string; + channelAppId?: string; } diff --git a/apps/daxpay-admin/src/api/payment/order/normal-order.api.ts b/apps/daxpay-admin/src/api/payment/order/normal-order.api.ts index 7cf2bf7dd..3aef907e1 100644 --- a/apps/daxpay-admin/src/api/payment/order/normal-order.api.ts +++ b/apps/daxpay-admin/src/api/payment/order/normal-order.api.ts @@ -103,6 +103,8 @@ export interface NormalOrderResult extends MchEntity { channelMchNo?: string; /** 支付能力编码 */ capability?: string; + /** 通道应用 AppId */ + channelAppId?: string; /** 客户端IP */ clientIp?: string; /** 终端设备编码 */ diff --git a/apps/daxpay-admin/src/api/payment/order/pay-trade.api.ts b/apps/daxpay-admin/src/api/payment/order/pay-trade.api.ts index 6d06db6b7..69fe86c84 100644 --- a/apps/daxpay-admin/src/api/payment/order/pay-trade.api.ts +++ b/apps/daxpay-admin/src/api/payment/order/pay-trade.api.ts @@ -85,8 +85,6 @@ export interface PayTradeResult extends MchEntity { channel?: string; /** 支付方式 */ method?: string; - /** 其他支付方式 */ - otherMethod?: string; /** 限制支付类型 */ limitPay?: string; /** 支付渠道 */ @@ -95,6 +93,8 @@ export interface PayTradeResult extends MchEntity { amount?: number; /** 币种 */ currency?: string; + /** 入账金额(分); 结算类成功=amount, 预授权冻结等=0 */ + postedAmount?: number; /** 可退金额(分) */ refundableBalance?: number; /** 资金状态 */ diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json index 953de026d..c713c42c2 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "Aggregate QR Code", - "aggregate_pay_barcode": "Aggregate Barcode", "wechat_cashier": "WeChat Mini Cashier", "wechat_jsapi": "WeChat JSAPI", "wechat_app": "WeChat App", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/order.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/order.json index 9374c034c..fc201a6cc 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "Channel Order No.", "transOrderNo": "Trans Order No.", "relationOrderNo": "Relation Order No.", + "postedAmount": "Posted(Yuan)", "refundableBalance": "Refundable(Yuan)", "payBody": "Pay Body", "payBodyType": "Pay Body Type", @@ -61,12 +62,12 @@ "closeTime": "Close Time", "channelMchNo": "Channel Merchant No.", "capability": "Capability", + "channelAppId": "Channel App ID", "clientIp": "Client IP", "terminalNo": "Terminal No.", "containerId": "Container ID", "containerStatus": "Container Status", "source": "Source", - "otherMethod": "Other Method", "limitPay": "Limit Pay", "mchNo": "Merchant No.", "appId": "App ID", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/en-US/system/mobileApp.json index 9a928baab..d35aa8713 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "No platform config yet, fill in and save to create", "platformComingSoon": "This platform is not available yet; will be handled when the APP is ready", "cashierLimitTitle": "Single platform cashier mini program", - "cashierLimitDesc": "The whole platform shares one WeChat and one Alipay cashier mini program. openId and opAppId must use the same AppId at pay time. Register or bind this AppId with each payment channel as the pay AppId (often the service-provider mini program for official WeChat ISV, or sub_appid for third-party channels). Not every channel works out of the box." + "cashierLimitDesc": "The whole platform shares one WeChat and one Alipay cashier mini program. openId and channelAppId must use the same AppId at pay time. Register or bind this AppId with each payment channel as the pay AppId (often the service-provider mini program for official WeChat ISV, or sub_appid for third-party channels). Not every channel works out of the box." } } diff --git a/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/cashier.json index b0af64f5c..d9d01a80f 100644 --- a/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "Kode QR Agregat", - "aggregate_pay_barcode": "Barcode Agregat", "wechat_cashier": "Kasir Mini WeChat", "wechat_jsapi": "WeChat JSAPI", "wechat_app": "Aplikasi WeChat", diff --git a/apps/daxpay-admin/src/locales/langs/id-ID/payment/order.json b/apps/daxpay-admin/src/locales/langs/id-ID/payment/order.json index 6ba50251e..34176e248 100644 --- a/apps/daxpay-admin/src/locales/langs/id-ID/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/id-ID/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "Nomor Pesanan Saluran.", "transOrderNo": "Nomor Pesanan Trans.", "relationOrderNo": "Nomor Pesanan Relasi.", + "postedAmount": "Jumlah dibukukan (Yuan)", "refundableBalance": "Dapat dikembalikan (Yuan)", "payBody": "Badan Bayar", "payBodyType": "Tipe Tubuh Bayar", @@ -61,12 +62,12 @@ "closeTime": "Waktu Tutup", "channelMchNo": "Nomor Pedagang Saluran.", "capability": "Kemampuan", + "channelAppId": "Aplikasi Saluran", "clientIp": "IP klien", "terminalNo": "Nomor Terminal.", "containerId": "ID Kontainer", "containerStatus": "Status Kontainer", "source": "Sumber", - "otherMethod": "Metode Lainnya", "limitPay": "Batasi Pembayaran", "mchNo": "Nomor Pedagang.", "appId": "ID Aplikasi", diff --git a/apps/daxpay-admin/src/locales/langs/id-ID/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/id-ID/system/mobileApp.json index 41b9b9680..a569d7f98 100644 --- a/apps/daxpay-admin/src/locales/langs/id-ID/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/id-ID/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "Belum ada konfigurasi platform, isi dan simpan untuk membuat", "platformComingSoon": "Platform ini belum tersedia; akan ditangani ketika APP siap", "cashierLimitTitle": "Program mini kasir platform tunggal", - "cashierLimitDesc": "Seluruh platform berbagi satu program mini kasir WeChat dan satu Alipay. openId dan opAppId harus menggunakan AppId yang sama pada waktu pembayaran. Daftarkan atau ikat AppId ini dengan setiap saluran pembayaran sebagai AppId berbayar (seringkali merupakan program mini penyedia layanan untuk WeChat ISV resmi, atau sub_appid untuk saluran pihak ketiga). Tidak semua saluran berfungsi dengan baik." + "cashierLimitDesc": "Seluruh platform berbagi satu program mini kasir WeChat dan satu Alipay. openId dan channelAppId harus menggunakan AppId yang sama pada waktu pembayaran. Daftarkan atau ikat AppId ini dengan setiap saluran pembayaran sebagai AppId berbayar (seringkali merupakan program mini penyedia layanan untuk WeChat ISV resmi, atau sub_appid untuk saluran pihak ketiga). Tidak semua saluran berfungsi dengan baik." } } diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/cashier.json index 799505600..63efbce84 100644 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "集合QRコード", - "aggregate_pay_barcode": "集約バーコード", "wechat_cashier": "WeChat ミニ レジ係", "wechat_jsapi": "WeChat JSAPI", "wechat_app": "WeChatアプリ", diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/order.json b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/order.json index 9be5744a9..35e764270 100644 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "チャンネル注文番号", "transOrderNo": "トランスオーダー番号", "relationOrderNo": "関係注文番号", + "postedAmount": "計上金額(元)", "refundableBalance": "返金可能(元)", "payBody": "本体を支払う", "payBodyType": "給与体型", @@ -61,12 +62,12 @@ "closeTime": "閉店時間", "channelMchNo": "チャネル加盟店番号", "capability": "能力", + "channelAppId": "チャネルアプリ", "clientIp": "クライアントIP", "terminalNo": "端子番号", "containerId": "コンテナID", "containerStatus": "コンテナのステータス", "source": "ソース", - "otherMethod": "その他の方法", "limitPay": "限度額支払い", "mchNo": "販売者番号", "appId": "アプリID", diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/ja-JP/system/mobileApp.json index 1543f9f7f..c1327b85e 100644 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/ja-JP/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "プラットフォーム設定がまだありません。入力して保存して作成します", "platformComingSoon": "このプラットフォームはまだ利用できません。 APPの準備ができたら処理されます", "cashierLimitTitle": "単一プラットフォームのレジミニ プログラム", - "cashierLimitDesc": "プラットフォーム全体で 1 つの WeChat と 1 つの Alipay キャッシャー ミニ プログラムを共有します。 openId と opAppId は、支払い時に同じ AppId を使用する必要があります。この AppId を各支払いチャネルに有料 AppId (多くの場合、公式 WeChat ISV のサービス プロバイダー ミニ プログラム、またはサードパーティ チャネルの sub_appid) として登録またはバインドします。すべてのチャンネルがそのまま使えるわけではありません。" + "cashierLimitDesc": "プラットフォーム全体で 1 つの WeChat と 1 つの Alipay キャッシャー ミニ プログラムを共有します。 openId と channelAppId は、支払い時に同じ AppId を使用する必要があります。この AppId を各支払いチャネルに有料 AppId (多くの場合、公式 WeChat ISV のサービス プロバイダー ミニ プログラム、またはサードパーティ チャネルの sub_appid) として登録またはバインドします。すべてのチャンネルがそのまま使えるわけではありません。" } } diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/cashier.json index 9cad7eb67..7149da1a2 100644 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "QR 코드 집계", - "aggregate_pay_barcode": "집계 바코드", "wechat_cashier": "위챗 미니 캐셔", "wechat_jsapi": "위챗 JSAPI", "wechat_app": "위챗 앱", diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/order.json b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/order.json index 1d59c41f2..0e9a44898 100644 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "채널 주문번호", "transOrderNo": "트랜스 주문번호", "relationOrderNo": "관계 주문번호", + "postedAmount": "입금금액(위안)", "refundableBalance": "환불가능(위안)", "payBody": "페이 바디", "payBodyType": "급여 신체 유형", @@ -61,12 +62,12 @@ "closeTime": "마감 시간", "channelMchNo": "채널 판매자 번호", "capability": "능력", + "channelAppId": "채널 앱", "clientIp": "클라이언트 IP", "terminalNo": "터미널 번호", "containerId": "컨테이너 ID", "containerStatus": "컨테이너 상태", "source": "원천", - "otherMethod": "다른 방법", "limitPay": "급여 한도", "mchNo": "판매자 번호", "appId": "앱 ID", diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/ko-KR/system/mobileApp.json index aa55800dc..44e3da852 100644 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/ko-KR/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "아직 플랫폼 구성이 없습니다. 작성하고 저장하여 만드세요.", "platformComingSoon": "이 플랫폼은 아직 사용할 수 없습니다. 앱이 준비되면 처리됩니다.", "cashierLimitTitle": "단일 플랫폼 출납원 미니 프로그램", - "cashierLimitDesc": "전체 플랫폼은 하나의 WeChat과 하나의 Alipay 출납원 미니 프로그램을 공유합니다. openId와 opAppId는 결제 시 동일한 AppId를 사용해야 합니다. 이 AppId를 각 결제 채널에 유료 AppId(종종 공식 WeChat ISV의 경우 서비스 제공업체 미니 프로그램 또는 제3자 채널의 경우 sub_appid)로 등록하거나 바인딩합니다. 모든 채널이 기본적으로 작동하는 것은 아닙니다." + "cashierLimitDesc": "전체 플랫폼은 하나의 WeChat과 하나의 Alipay 출납원 미니 프로그램을 공유합니다. openId와 channelAppId는 결제 시 동일한 AppId를 사용해야 합니다. 이 AppId를 각 결제 채널에 유료 AppId(종종 공식 WeChat ISV의 경우 서비스 제공업체 미니 프로그램 또는 제3자 채널의 경우 sub_appid)로 등록하거나 바인딩합니다. 모든 채널이 기본적으로 작동하는 것은 아닙니다." } } diff --git a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/cashier.json index 281861b19..662cf3de0 100644 --- a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "Kod QR Agregat", - "aggregate_pay_barcode": "Kod Bar Agregat", "wechat_cashier": "Juruwang Mini WeChat", "wechat_jsapi": "WeChat JSAPI", "wechat_app": "Apl WeChat", diff --git a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/order.json b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/order.json index e2ccbac0f..995412bbc 100644 --- a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "Pesanan Saluran No.", "transOrderNo": "Pesanan Trans", "relationOrderNo": "Perintah Perhubungan No.", + "postedAmount": "Amaun diakaun(Yuan)", "refundableBalance": "Boleh dipulangkan(Yuan)", "payBody": "Badan Bayar", "payBodyType": "Jenis Badan Bayar", @@ -61,12 +62,12 @@ "closeTime": "Masa Tutup", "channelMchNo": "Saluran Peniaga No.", "capability": "Keupayaan", + "channelAppId": "Aplikasi Saluran", "clientIp": "IP pelanggan", "terminalNo": "Terminal No.", "containerId": "ID kontena", "containerStatus": "Status Kontena", "source": "Sumber", - "otherMethod": "Kaedah Lain", "limitPay": "Had Gaji", "mchNo": "Peniaga No.", "appId": "ID apl", diff --git a/apps/daxpay-admin/src/locales/langs/ms-MY/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/ms-MY/system/mobileApp.json index 52d86ca05..221839d45 100644 --- a/apps/daxpay-admin/src/locales/langs/ms-MY/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/ms-MY/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "Belum ada konfigurasi platform, isi dan simpan untuk mencipta", "platformComingSoon": "Platform ini belum tersedia lagi; akan dikendalikan apabila APP sedia", "cashierLimitTitle": "Program mini juruwang platform tunggal", - "cashierLimitDesc": "Seluruh platform berkongsi satu WeChat dan satu program mini juruwang Alipay. openId dan opAppId mesti menggunakan AppId yang sama pada masa pembayaran. Daftar atau ikat AppId ini dengan setiap saluran pembayaran sebagai AppId berbayar (selalunya program mini penyedia perkhidmatan untuk WeChat ISV rasmi, atau sub_appid untuk saluran pihak ketiga). Tidak semua saluran berfungsi di luar kotak." + "cashierLimitDesc": "Seluruh platform berkongsi satu WeChat dan satu program mini juruwang Alipay. openId dan channelAppId mesti menggunakan AppId yang sama pada masa pembayaran. Daftar atau ikat AppId ini dengan setiap saluran pembayaran sebagai AppId berbayar (selalunya program mini penyedia perkhidmatan untuk WeChat ISV rasmi, atau sub_appid untuk saluran pihak ketiga). Tidak semua saluran berfungsi di luar kotak." } } diff --git a/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/cashier.json index 375cd1677..937a42a38 100644 --- a/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "รวมรหัส QR", - "aggregate_pay_barcode": "บาร์โค้ดรวม", "wechat_cashier": "WeChat มินิแคชเชียร์", "wechat_jsapi": "วีแชต JSAPI", "wechat_app": "แอพวีแชต", diff --git a/apps/daxpay-admin/src/locales/langs/th-TH/payment/order.json b/apps/daxpay-admin/src/locales/langs/th-TH/payment/order.json index bdbf2d760..60df66867 100644 --- a/apps/daxpay-admin/src/locales/langs/th-TH/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/th-TH/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "ช่องทางการสั่งซื้อเลขที่", "transOrderNo": "หมายเลขคำสั่งทรานส์", "relationOrderNo": "ความสัมพันธ์เลขที่คำสั่ง", + "postedAmount": "ยอดเข้าบัญชี (หยวน)", "refundableBalance": "สามารถขอคืนเงินได้ (หยวน)", "payBody": "จ่ายร่างกาย", "payBodyType": "จ่ายประเภทร่างกาย", @@ -61,12 +62,12 @@ "closeTime": "ปิดเวลา", "channelMchNo": "ช่องทางร้านค้าหมายเลข", "capability": "ความสามารถ", + "channelAppId": "แอปช่องทาง", "clientIp": "ไอพีไคลเอ็นต์", "terminalNo": "เทอร์มินัลหมายเลข", "containerId": "รหัสคอนเทนเนอร์", "containerStatus": "สถานะคอนเทนเนอร์", "source": "แหล่งที่มา", - "otherMethod": "วิธีอื่น", "limitPay": "จำกัดการจ่าย", "mchNo": "หมายเลขผู้ขาย", "appId": "รหัสแอป", diff --git a/apps/daxpay-admin/src/locales/langs/th-TH/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/th-TH/system/mobileApp.json index ab5efc38f..91d530bca 100644 --- a/apps/daxpay-admin/src/locales/langs/th-TH/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/th-TH/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "ยังไม่มีการกำหนดค่าแพลตฟอร์ม กรอกและบันทึกเพื่อสร้าง", "platformComingSoon": "แพลตฟอร์มนี้ยังไม่พร้อมใช้งาน จะได้รับการจัดการเมื่อแอปพร้อม", "cashierLimitTitle": "มินิโปรแกรมแคชเชียร์แพลตฟอร์มเดียว", - "cashierLimitDesc": "แพลตฟอร์มทั้งหมดแชร์ WeChat หนึ่งรายการและมินิโปรแกรมแคชเชียร์ Alipay หนึ่งรายการ openId และ opAppId ต้องใช้ AppId เดียวกันในเวลาชำระเงิน ลงทะเบียนหรือผูก AppId นี้กับช่องทางการชำระเงินแต่ละช่องทางเป็น Pay AppId (มักจะเป็นโปรแกรมขนาดเล็กของผู้ให้บริการสำหรับ WeChat ISV อย่างเป็นทางการ หรือ sub_appid สำหรับช่องทางบุคคลที่สาม) ไม่ใช่ทุกช่องจะทำงานนอกกรอบ" + "cashierLimitDesc": "แพลตฟอร์มทั้งหมดแชร์ WeChat หนึ่งรายการและมินิโปรแกรมแคชเชียร์ Alipay หนึ่งรายการ openId และ channelAppId ต้องใช้ AppId เดียวกันในเวลาชำระเงิน ลงทะเบียนหรือผูก AppId นี้กับช่องทางการชำระเงินแต่ละช่องทางเป็น Pay AppId (มักจะเป็นโปรแกรมขนาดเล็กของผู้ให้บริการสำหรับ WeChat ISV อย่างเป็นทางการ หรือ sub_appid สำหรับช่องทางบุคคลที่สาม) ไม่ใช่ทุกช่องจะทำงานนอกกรอบ" } } diff --git a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/cashier.json index 6fa421e2b..ea7118144 100644 --- a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "Mã QR tổng hợp", - "aggregate_pay_barcode": "Mã vạch tổng hợp", "wechat_cashier": "Nhân viên thu ngân mini WeChat", "wechat_jsapi": "WeChat JSAPI", "wechat_app": "Ứng dụng WeChat", diff --git a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/order.json b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/order.json index 0aa597d3b..064580945 100644 --- a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "Số thứ tự kênh", "transOrderNo": "Số đơn hàng chuyển khoản", "relationOrderNo": "Số thứ tự quan hệ", + "postedAmount": "Số đã ghi sổ(Nhân dân tệ)", "refundableBalance": "Có thể hoàn lại(Nhân dân tệ)", "payBody": "Cơ quan thanh toán", "payBodyType": "Loại nội dung thanh toán", @@ -61,12 +62,12 @@ "closeTime": "Đóng thời gian", "channelMchNo": "Số người bán kênh", "capability": "Khả năng", + "channelAppId": "Ứng dụng kênh", "clientIp": "IP khách hàng", "terminalNo": "Số thiết bị đầu cuối", "containerId": "ID vùng chứa", "containerStatus": "Trạng thái vùng chứa", "source": "Nguồn", - "otherMethod": "Phương pháp khác", "limitPay": "Giới hạn thanh toán", "mchNo": "Số thương gia", "appId": "ID ứng dụng", diff --git a/apps/daxpay-admin/src/locales/langs/vi-VN/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/vi-VN/system/mobileApp.json index a7ec3c039..16d155ca1 100644 --- a/apps/daxpay-admin/src/locales/langs/vi-VN/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/vi-VN/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "Chưa có cấu hình nền tảng nào, hãy điền và lưu để tạo", "platformComingSoon": "Nền tảng này chưa có sẵn; sẽ được xử lý khi APP sẵn sàng", "cashierLimitTitle": "Chương trình thu ngân mini nền tảng đơn", - "cashierLimitDesc": "Toàn bộ nền tảng chia sẻ một chương trình nhỏ thu ngân WeChat và một chương trình thu ngân Alipay. openId và opAppId phải sử dụng cùng một AppId tại thời điểm trả lương. Đăng ký hoặc liên kết AppId này với mỗi kênh thanh toán dưới dạng AppId trả phí (thường là chương trình nhỏ của nhà cung cấp dịch vụ cho ISV WeChat chính thức hoặc sub_appid cho các kênh của bên thứ ba). Không phải mọi kênh đều hoạt động tốt." + "cashierLimitDesc": "Toàn bộ nền tảng chia sẻ một chương trình nhỏ thu ngân WeChat và một chương trình thu ngân Alipay. openId và channelAppId phải sử dụng cùng một AppId tại thời điểm trả lương. Đăng ký hoặc liên kết AppId này với mỗi kênh thanh toán dưới dạng AppId trả phí (thường là chương trình nhỏ của nhà cung cấp dịch vụ cho ISV WeChat chính thức hoặc sub_appid cho các kênh của bên thứ ba). Không phải mọi kênh đều hoạt động tốt." } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json index 230e3bafd..1ad3ea704 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "聚合扫码", - "aggregate_pay_barcode": "聚合付款码", "wechat_cashier": "微信小程序收银台", "wechat_jsapi": "微信 JSAPI", "wechat_app": "微信 APP", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/order.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/order.json index 75112cbeb..8d91da715 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "通道订单号", "transOrderNo": "透传订单号", "relationOrderNo": "关联订单号", + "postedAmount": "入账金额(元)", "refundableBalance": "可退金额(元)", "payBody": "支付参数体", "payBodyType": "参数体类型", @@ -61,12 +62,12 @@ "closeTime": "关闭时间", "channelMchNo": "通道商户号", "capability": "支付能力", + "channelAppId": "通道应用", "clientIp": "客户端IP", "terminalNo": "终端编码", "containerId": "关联容器ID", "containerStatus": "容器业务状态", "source": "订单来源", - "otherMethod": "其他支付方式", "limitPay": "限制支付类型", "mchNo": "商户号", "appId": "应用号", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/zh-CN/system/mobileApp.json index aa5a97bb8..0ae6992d5 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "暂无平台配置，填写后保存即可创建", "platformComingSoon": "该平台配置暂未开放，后续 APP 完善时再处理", "cashierLimitTitle": "平台唯一收银台小程序", - "cashierLimitDesc": "全平台共用一套微信/支付宝收银台小程序凭证。支付时 openId 与 opAppId 须同源；平台小程序 AppId 需在所用支付通道侧绑定或报备为收款 AppId（官方服务商常见为服务商小程序，第三方通道一般为 sub_appid）。并非所有通道开箱即用。" + "cashierLimitDesc": "全平台共用一套微信/支付宝收银台小程序凭证。支付时 openId 与 channelAppId 须同源；平台小程序 AppId 需在所用支付通道侧绑定或报备为收款 AppId（官方服务商常见为服务商小程序，第三方通道一般为 sub_appid）。并非所有通道开箱即用。" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/cashier.json index 7cd18a052..face67a5d 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "聚合掃碼", - "aggregate_pay_barcode": "聚合付款碼", "wechat_cashier": "微信小程序收銀台", "wechat_jsapi": "微信 JSAPI", "wechat_app": "微信 APP", diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/order.json b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/order.json index 6a1e7283a..e2c7db1ec 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "通道訂單號", "transOrderNo": "透傳訂單號", "relationOrderNo": "關聯訂單號", + "postedAmount": "入帳金額(元)", "refundableBalance": "可退金額(元)", "payBody": "支付參數體", "payBodyType": "參數體類型", @@ -61,12 +62,12 @@ "closeTime": "關閉時間", "channelMchNo": "通道商户號", "capability": "支付能力", + "channelAppId": "通道應用", "clientIp": "客户端IP", "terminalNo": "終端編碼", "containerId": "關聯容器ID", "containerStatus": "容器業務狀態", "source": "訂單來源", - "otherMethod": "其他支付方式", "limitPay": "限制支付類型", "mchNo": "商户號", "appId": "應用號", diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/zh-HK/system/mobileApp.json index 11a168e40..b330d38dd 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/zh-HK/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "暫無平台配置，填寫後保存即可創建", "platformComingSoon": "該平台配置暫未開放，後續 APP 完善時再處理", "cashierLimitTitle": "平台唯一收銀台小程序", - "cashierLimitDesc": "全平台共用一套微信/支付寶收銀台小程序憑證。支付時 openId 與 opAppId 須同源；平台小程序 AppId 需在所用支付通道側綁定或報備為收款 AppId（官方服務商常見為服務商小程序，第三方通道一般為 sub_appid）。並非所有通道開箱即用。" + "cashierLimitDesc": "全平台共用一套微信/支付寶收銀台小程序憑證。支付時 openId 與 channelAppId 須同源；平台小程序 AppId 需在所用支付通道側綁定或報備為收款 AppId（官方服務商常見為服務商小程序，第三方通道一般為 sub_appid）。並非所有通道開箱即用。" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/cashier.json index ed2ebb2c6..5a4cba37a 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/cashier.json @@ -50,7 +50,6 @@ }, "capabilities": { "aggregate_pay_qrcode": "聚合掃碼", - "aggregate_pay_barcode": "聚合付款碼", "wechat_cashier": "微信小程式收銀臺", "wechat_jsapi": "微信 JSAPI", "wechat_app": "微信 APP", diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/order.json b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/order.json index 09f625de1..f20844243 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/order.json +++ b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/order.json @@ -42,6 +42,7 @@ "outOrderNo": "通道訂單號", "transOrderNo": "透傳訂單號", "relationOrderNo": "關聯訂單號", + "postedAmount": "入帳金額(元)", "refundableBalance": "可退金額(元)", "payBody": "支付引數體", "payBodyType": "引數體型別", @@ -61,12 +62,12 @@ "closeTime": "關閉時間", "channelMchNo": "通道商戶號", "capability": "支付能力", + "channelAppId": "通道應用", "clientIp": "客戶端IP", "terminalNo": "終端編碼", "containerId": "關聯容器ID", "containerStatus": "容器業務狀態", "source": "訂單來源", - "otherMethod": "其他支付方式", "limitPay": "限制支付型別", "mchNo": "商戶號", "appId": "應用號", diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/system/mobileApp.json b/apps/daxpay-admin/src/locales/langs/zh-TW/system/mobileApp.json index 1724522b7..14452b5e8 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/system/mobileApp.json +++ b/apps/daxpay-admin/src/locales/langs/zh-TW/system/mobileApp.json @@ -79,6 +79,6 @@ "emptyPlatformConfig": "暫無平臺配置，填寫後儲存即可建立", "platformComingSoon": "該平臺配置暫未開放，後續 APP 完善時再處理", "cashierLimitTitle": "平臺唯一收銀臺小程式", - "cashierLimitDesc": "全平臺共用一套微信/支付寶收銀臺小程式憑證。支付時 openId 與 opAppId 須同源；平臺小程式 AppId 需在所用支付通道側繫結或報備為收款 AppId（官方服務商常見為服務商小程式，第三方通道一般為 sub_appid）。並非所有通道開箱即用。" + "cashierLimitDesc": "全平臺共用一套微信/支付寶收銀臺小程式憑證。支付時 openId 與 channelAppId 須同源；平臺小程式 AppId 需在所用支付通道側繫結或報備為收款 AppId（官方服務商常見為服務商小程式，第三方通道一般為 sub_appid）。並非所有通道開箱即用。" } } diff --git a/apps/daxpay-admin/src/views/payment/merchant/route/shared/payRoute.constants.ts b/apps/daxpay-admin/src/views/payment/merchant/route/shared/payRoute.constants.ts index 96460caec..93ee7d234 100644 --- a/apps/daxpay-admin/src/views/payment/merchant/route/shared/payRoute.constants.ts +++ b/apps/daxpay-admin/src/views/payment/merchant/route/shared/payRoute.constants.ts @@ -8,8 +8,8 @@ export type PayRouteMode = (typeof PAY_ROUTE_MODE)[keyof typeof PAY_ROUTE_MODE]; import { PAY_PROVIDER_DISPLAY } from '#/views/payment/shared/payProviderDisplay'; -/** 通道路由配置页展示的支付渠道（非平台全量，仅微信/支付宝/银联/抖音） */ -const ROUTE_PAY_PROVIDER_CODES = ['wechat', 'alipay', 'union_pay', 'douyin'] as const; +/** 通道路由配置页展示的支付渠道（非平台全量：聚合扫码/微信/支付宝/银联/抖音） */ +const ROUTE_PAY_PROVIDER_CODES = ['aggregate_pay', 'wechat', 'alipay', 'union_pay', 'douyin'] as const; export const ROUTE_PAY_PROVIDERS = PAY_PROVIDER_DISPLAY.filter((p) => (ROUTE_PAY_PROVIDER_CODES as readonly string[]).includes(p.code), diff --git a/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue b/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue index 516c70595..c6e49da3b 100644 --- a/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue +++ b/apps/daxpay-admin/src/views/payment/order/NormalOrderList.vue @@ -522,6 +522,9 @@ {{ detail.channelMchNo || '-' }} + + {{ detail.channelAppId || '-' }} + {{ detail.outOrderNo || '-' }} diff --git a/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue b/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue index 5b7f034ba..8ae7be015 100644 --- a/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue +++ b/apps/daxpay-admin/src/views/payment/order/PayTradeList.vue @@ -358,6 +358,9 @@ {{ formatAmount(detail.amount) }} + + {{ formatAmount(detail.postedAmount) }} + {{ formatAmount(detail.refundableBalance) }} @@ -367,6 +370,9 @@ {{ methodLabel(detail.method) }} + + {{ detail.channelAppId || '-' }} + {{ detail.product || '-' }}