@alipay/ams-checkout 0.0.1781167787-dev.0 → 0.0.1782095417-dev.0

package/esm/constant/index.d.ts

@@ -283,6 +283,9 @@ export declare const EVENT: {
     submitPromiseCallback: {
         name: string;
     };
+    beforeConfirm: {
+        name: string;
+    };
     validateFieldsResult: {
         name: string;
         forwardName: string;

package/esm/constant/index.js

@@ -289,6 +289,10 @@ export var EVENT = {
   submitPromiseCallback: {
     name: 'onSubmitPayCallback'
   },
+  // After Apple Pay authorization, before charge: notify SDK layer to execute merchant's onBeforeConfirm callback
+  beforeConfirm: {
+    name: 'onBeforeConfirm'
+  },
   validateFieldsResult: {
     name: 'validateFieldsResult',
     forwardName: 'validateFieldsResultForward',

package/esm/core/component/element/elementController/index.d.ts

@@ -10,6 +10,8 @@ declare class ElementController {
     private onStatusChangeCallback;
     private submitPayPromise;
     private elementEventCenter;
+    /** Current selected payment method type (e.g. 'APPLEPAY', 'CARD'), updated via paymentMethodChanged event */
+    private currentPaymentMethodType;
     constructor(options: IElementOptions);
     private initService;
     private initElementProcessors;

package/esm/core/component/element/elementController/index.js

@@ -37,11 +37,12 @@ import { ServiceProvider } from "../../../../foundation/service";
 import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
 import { ProductSceneEnum } from "../../../../types";
 import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
-import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
+import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EVENTNAME, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
 import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
 var TIMEOUT_DURATION = 16000;
 var ElementController = /*#__PURE__*/function () {
@@ -59,6 +60,8 @@ var ElementController = /*#__PURE__*/function () {
     // 新增变量
     _defineProperty(this, "submitPayPromise", void 0);
     _defineProperty(this, "elementEventCenter", void 0);
+    /** Current selected payment method type (e.g. 'APPLEPAY', 'CARD'), updated via paymentMethodChanged event */
+    _defineProperty(this, "currentPaymentMethodType", '');
     _defineProperty(this, "onValidateFunc", function (event, target) {
       return new Promise(function (resolve) {
         event.emitAndListen({
@@ -372,7 +375,7 @@ var ElementController = /*#__PURE__*/function () {
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
-        var startEventId, res, logParams, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, startTime, _yield$executeWithTim, shouldContinue, timedOut, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -397,12 +400,113 @@ var ElementController = /*#__PURE__*/function () {
               return _context4.abrupt("return", Promise.resolve(res));
             case 6:
               this.changeLoading(true);
+
+              // Non-Apple Pay: execute onBeforeConfirm at SDK layer directly, abort on failure
+              isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
+              paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
+              if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
+                _context4.next = 34;
+                break;
+              }
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_start'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _context4.prev = 11;
+              startTime = Date.now();
+              _context4.next = 15;
+              return executeWithTimeout(function () {
+                return submitParams.onBeforeConfirm();
+              });
+            case 15:
+              _yield$executeWithTim = _context4.sent;
+              shouldContinue = _yield$executeWithTim.result;
+              timedOut = _yield$executeWithTim.timedOut;
+              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
+                _context4.next = 23;
+                break;
+              }
+              if (timedOut) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              } else {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_abort'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              }
+              this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: 'MERCHANT_CONFIRM_ABORT'
+              });
+              return _context4.abrupt("return", {
+                status: PaymentStatus.FAIL,
+                error: {
+                  code: 'MERCHANT_CONFIRM_ABORT',
+                  message: 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
+                }
+              });
+            case 23:
+              this.serviceMap.Log.logInfo({
+                title: 'sdk_before_confirm_success'
+              }, {
+                paymentMethodType: paymentMethodType,
+                path: 'nonApplePay_sync'
+              });
+              _context4.next = 32;
+              break;
+            case 26:
+              _context4.prev = 26;
+              _context4.t0 = _context4["catch"](11);
+              this.serviceMap.Log.logError({
+                title: 'sdk_before_confirm_error'
+              }, {
+                paymentMethodType: paymentMethodType,
+                errorMessage: String((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || _context4.t0).slice(0, 200),
+                path: 'nonApplePay_sync'
+              });
+              this.changeLoading(false);
+              this.elementEventCenter.endEvent(startEventId, {
+                eventCode: PaymentStatus.FAIL,
+                errorName: 'MERCHANT_CONFIRM_ABORT'
+              });
+              return _context4.abrupt("return", {
+                status: PaymentStatus.FAIL,
+                error: {
+                  code: 'MERCHANT_CONFIRM_ABORT',
+                  message: 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
+                }
+              });
+            case 32:
+              _context4.next = 35;
+              break;
+            case 34:
+              if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_skip'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
+                });
+              }
+            case 35:
               recordResult = null;
-              _context4.prev = 8;
-              _context4.next = 11;
+              _context4.prev = 36;
+              _context4.next = 39;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, _submitParams$handleA, _yield$_this3$onValid2, _data, errorString, errorResult;
+                  var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _yield$_this3$onValid2, _data, errorString, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -478,26 +582,58 @@ var ElementController = /*#__PURE__*/function () {
                         return _context3.abrupt("return");
                       case 14:
                         if (!_this3.elementProcessors[ElementType.payment]) {
-                          _context3.next = 21;
+                          _context3.next = 28;
                           break;
                         }
-                        _context3.next = 17;
-                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, _objectSpread(_objectSpread({}, params), {}, {
-                          handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true,
-                          shipping: submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo
-                        }));
-                      case 17:
+                        // Apple Pay: set onBeforeConfirm on paymentProcessor for event bridge callback after iframe authorization
+                        hasBeforeConfirmForApplePay = isApplePay && !!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm);
+                        _this3.serviceMap.Log.logInfo({
+                          title: 'sdk_element_submitPayment_setBeforeConfirm'
+                        }, {
+                          msg: safeStringify({
+                            hasBeforeConfirmForApplePay: hasBeforeConfirmForApplePay,
+                            isApplePay: isApplePay
+                          })
+                        });
+                        _this3.elementProcessors[ElementType.payment].setOnBeforeConfirm(hasBeforeConfirmForApplePay ? submitParams.onBeforeConfirm : null);
+                        hasAmount = !!(submitParams !== null && submitParams !== void 0 && submitParams.amount);
+                        hasCurrency = !!(submitParams !== null && submitParams !== void 0 && submitParams.currency);
+                        if ((hasAmount || hasCurrency) && !(hasAmount && hasCurrency)) {
+                          _this3.serviceMap.Log.logError({
+                            title: 'sdk_element_submitPayment_amountCurrencyMismatch'
+                          }, {
+                            msg: safeStringify({
+                              amount: submitParams === null || submitParams === void 0 ? void 0 : submitParams.amount,
+                              currency: submitParams === null || submitParams === void 0 ? void 0 : submitParams.currency,
+                              reason: 'amount and currency must be provided together, both ignored'
+                            })
+                          });
+                        }
+                        _this3.elementProcessors[ElementType.payment].setMerchantAmountOverride(hasAmount && hasCurrency ? submitParams.amount : null, hasAmount && hasCurrency ? submitParams.currency : null);
+                        _context3.next = 24;
+                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, function (_submitParams$handleA) {
+                          return _objectSpread(_objectSpread(_objectSpread({}, params), {}, {
+                            handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true,
+                            shipping: submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo
+                          }, hasAmount && hasCurrency ? {
+                            amount: submitParams.amount,
+                            currency: submitParams.currency
+                          } : {}), {}, {
+                            hasBeforeConfirm: hasBeforeConfirmForApplePay
+                          });
+                        }());
+                      case 24:
                         _yield$_this3$onValid2 = _context3.sent;
                         _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
                         recordResult = _data;
                         recordResultCallback(recordResult);
-                      case 21:
-                        _context3.next = 30;
+                      case 28:
+                        _context3.next = 37;
                         break;
-                      case 23:
-                        _context3.prev = 23;
+                      case 30:
+                        _context3.prev = 30;
                         _context3.t0 = _context3["catch"](2);
                         // 修复error为{}空对象的问题，上报stack&message
                         errorString = JSON.stringify(_context3.t0, Object.getOwnPropertyNames(_context3.t0));
@@ -514,20 +650,20 @@ var ElementController = /*#__PURE__*/function () {
                         });
                         recordResult = errorResult;
                         recordResultCallback(errorResult);
-                      case 30:
+                      case 37:
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[2, 23]]);
+                  }, _callee3, null, [[2, 30]]);
                 }));
                 return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 11:
+            case 39:
               return _context4.abrupt("return", _context4.sent);
-            case 12:
-              _context4.prev = 12;
+            case 40:
+              _context4.prev = 40;
               _logParams = {
                 eventCode: (_recordResult = recordResult) === null || _recordResult === void 0 ? void 0 : _recordResult.status,
                 errorName: (_recordResult2 = recordResult) === null || _recordResult2 === void 0 || (_recordResult2 = _recordResult2.error) === null || _recordResult2 === void 0 ? void 0 : _recordResult2.code,
@@ -538,12 +674,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(12);
-            case 17:
+              return _context4.finish(40);
+            case 45:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[8,, 12, 17]]);
+        }, _callee4, this, [[11, 26], [36,, 40, 45]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);
@@ -628,6 +764,9 @@ var ElementController = /*#__PURE__*/function () {
         var _this4$submitPayPromi;
         (_this4$submitPayPromi = _this4.submitPayPromise) === null || _this4$submitPayPromi === void 0 || _this4$submitPayPromi.call(_this4, data);
       });
+      this.serviceMap.EventCenter.listen(EVENTNAME.PAYMENTMETHODCHANGED, function (data) {
+        _this4.currentPaymentMethodType = (data === null || data === void 0 ? void 0 : data.type) || '';
+      }, true);
     }
   }, {
     key: "sendRequestAndWaitWebLaunch",
@@ -892,7 +1031,7 @@ var ElementController = /*#__PURE__*/function () {
       }
       this.serviceMap.EventCenter.listen(event, function (data) {
         callback === null || callback === void 0 || callback(data);
-      });
+      }, true);
     }
   }, {
     key: "isEventAllowed",

package/esm/core/component/element/elementProcessor/baseElementProcessor.d.ts

@@ -8,6 +8,7 @@ interface ElementProcessorOptions {
     mode: string;
     analytics?: Ianalytics;
     product: string;
+    preview?: boolean | 'web' | 'mobile';
 }
 declare abstract class BaseElementProcessor {
     elementContainer: AntomSDKCore;

package/esm/core/component/element/elementProcessor/baseElementProcessor.js

@@ -57,6 +57,7 @@ var BaseElementProcessor = /*#__PURE__*/function () {
       _setEnv();
       this.options.locale = (options === null || options === void 0 ? void 0 : options.locale) || '';
       this.options.product = options === null || options === void 0 ? void 0 : options.product;
+      this.options.preview = options === null || options === void 0 ? void 0 : options.preview;
     }
   }, {
     key: "registerElementContainer",

package/esm/core/component/element/elementProcessor/convertPaymentMethods.d.ts

@@ -0,0 +1,22 @@
+import { IPaymentMethod } from "../../../../types";
+interface PaymentMethodsConfig {
+    expressCheckout?: {
+        enabled: boolean;
+        methods?: {
+            paymentMethodName: string;
+            paymentMethodType: string;
+        }[];
+    };
+    supportedMethods?: {
+        paymentMethodName: string;
+        paymentMethodType: string;
+        logoUrl?: string;
+    }[];
+    topping?: string;
+}
+/**
+ * 将 paymentMethods 配置转换为内部格式
+ * 与 CKP 的 convertPaymentMethods 逻辑保持一致
+ */
+export declare function convertPaymentMethods(paymentMethodsConf?: PaymentMethodsConfig): IPaymentMethod[];
+export {};

package/esm/core/component/element/elementProcessor/convertPaymentMethods.js

@@ -0,0 +1,159 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * 为 GOOGLEPAY 支付方式补充 mock 的 paymentMethodDetail 数据
+ * 预览模式下 GooglePay 需要完整的 googlePayProps 才能正常渲染
+ */
+function handleGooglePayMethodDetail(method) {
+  if (method.paymentMethodType === 'GOOGLEPAY') {
+    method.paymentMethodDetail = _objectSpread(_objectSpread({}, method.paymentMethodDetail), {}, {
+      googlePayProps: {
+        environment: 'TEST',
+        existingPaymentMethodRequired: true,
+        paymentRequest: {
+          allowedPaymentMethods: [{
+            parameters: {
+              allowedAuthMethods: ['PAN_ONLY', 'CRYPTOGRAM_3DS'],
+              allowedCardNetworks: ['VISA', 'JCB']
+            },
+            tokenizationSpecification: {
+              parameters: {
+                protocolVersion: 'ECv2',
+                publicKey: 'BDM6GVTLZmxSmTQzm04QKI2av54kFpkqjhbkejtdDUx+VMvUtJ6vc+ZlDp8TygNTf+QeihxpD869sCVWaa0KMJc='
+              },
+              type: 'DIRECT'
+            },
+            type: 'CARD'
+          }],
+          apiVersion: 2,
+          apiVersionMinor: 0,
+          callbackIntents: ['PAYMENT_AUTHORIZATION'],
+          merchantInfo: {
+            merchantId: '123',
+            merchantName: 'merchantName'
+          },
+          shippingAddressRequired: true,
+          transactionInfo: {
+            countryCode: 'US',
+            currencyCode: 'EUR',
+            totalPrice: '10',
+            totalPriceStatus: 'FINAL'
+          }
+        }
+      }
+    });
+  }
+}
+
+/**
+ * 为 ONLINEBANKING_YAPILY 支付方式处理 mock 数据
+ * Yapily 在预览模式下需要清空 paymentElements
+ */
+function handleYapilyMethodDetail(method) {
+  if (method.paymentMethodType === 'ONLINEBANKING_YAPILY') {
+    method.paymentElements = [];
+  }
+}
+
+/**
+ * 合并所有的 Card 类支付方式
+ * 与 CKP handleAllCardsData 逻辑一致
+ */
+function handleAllCardsData() {
+  var supportedMethods = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var firstCardIndex = -1;
+  var logoList = [];
+  supportedMethods.forEach(function (item, index) {
+    if (item.paymentMethodName === 'CARD') {
+      logoList.push({
+        cardBrand: item.paymentMethodType,
+        logoUrl: item.logoUrl || ''
+      });
+      if (firstCardIndex === -1) {
+        firstCardIndex = index;
+      }
+    }
+  });
+  if (logoList.length) {
+    return {
+      firstCardIndex: firstCardIndex,
+      cardPaymentMethod: {
+        antomPage: 'paymentMetaPage',
+        category: 'CARD',
+        expressCheckout: false,
+        logoList: logoList,
+        paymentMethod: 'CARD',
+        paymentMethodName: 'Card',
+        paymentMethodType: 'CARD',
+        recommend: false,
+        webRedirectType: 'PAGE_REFRESH'
+      }
+    };
+  }
+  return null;
+}
+
+/**
+ * 将 paymentMethods 配置转换为内部格式
+ * 与 CKP 的 convertPaymentMethods 逻辑保持一致
+ */
+export function convertPaymentMethods(paymentMethodsConf) {
+  if (!paymentMethodsConf) {
+    return [];
+  }
+  var expressCheckout = paymentMethodsConf.expressCheckout,
+    supportedMethods = paymentMethodsConf.supportedMethods,
+    topping = paymentMethodsConf.topping;
+
+  // 1. 处理极速支付（排在最前面）
+  var supportedExpressCheckoutMethods = ((expressCheckout === null || expressCheckout === void 0 ? void 0 : expressCheckout.methods) || []).map(function (item) {
+    var method = {
+      paymentMethodName: item.paymentMethodName,
+      paymentMethodType: item.paymentMethodType,
+      category: item.paymentMethodType,
+      expressCheckout: true
+    };
+    handleGooglePayMethodDetail(method);
+    return method;
+  });
+
+  // 2. 处理普通支付方式（跳过 CARD，CARD 统一合并处理）
+  var supportedPaymentMethods = [];
+  (supportedMethods || []).forEach(function (item) {
+    if (item.paymentMethodName === 'CARD') {
+      return;
+    }
+    var method = {
+      paymentMethodName: item.paymentMethodName,
+      paymentMethodType: item.paymentMethodType,
+      category: item.paymentMethodType,
+      icon: item.logoUrl,
+      recommend: false
+    };
+    if (method.paymentMethodType === topping) {
+      method.recommend = true;
+    }
+    handleGooglePayMethodDetail(method);
+    handleYapilyMethodDetail(method);
+    supportedPaymentMethods.push(method);
+  });
+
+  // 3. 合并所有的 Card 类支付方式
+  var cardPaymentMethods = handleAllCardsData(supportedMethods);
+
+  // 4. 插入 Card 类支付方式 (card 第一次出现的位置)
+  if (cardPaymentMethods) {
+    supportedPaymentMethods.splice(cardPaymentMethods.firstCardIndex, 0, cardPaymentMethods.cardPaymentMethod);
+  }
+  return [].concat(_toConsumableArray(supportedExpressCheckoutMethods), supportedPaymentMethods);
+}

package/esm/core/component/element/elementProcessor/paymentProcessor.d.ts

@@ -2,6 +2,16 @@ import { LogService } from '../../../../foundation/service/log';
 import BaseElementProcessor from './baseElementProcessor';
 declare class PaymentProcessor extends BaseElementProcessor {
     private ApplePayService;
+    /**
+     * Merchant's onBeforeConfirm callback reference, used in Apple Pay scenario only.
+     * Set by elementController.submitPayment before payment,
+     * triggered via beforeConfirm event after Apple Pay authorization in iframe.
+     */
+    private _onBeforeConfirm;
+    private _merchantAmount;
+    private _merchantCurrency;
+    setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
+    setMerchantAmountOverride(amount: string | null, currency: string | null): void;
     onReady(extraParam: any): void;
     getLogger(): LogService;
     private addEventListener;
@@ -13,6 +23,11 @@ declare class PaymentProcessor extends BaseElementProcessor {
         instanceId: any;
     }): string;
     obtainData(): Promise<any>;
+    /**
+     * 构建预览模式的 mock 数据
+     * 合并 mock.ts 的硬编码数据和 mount 传入的 paymentMethods 配置
+     */
+    private buildPreviewMockData;
     getValue(): any;
     update({ data, paymentSessionData }: {
         data: any;