@alipay/ams-checkout 0.0.1781004142-dev.11 → 0.0.1781004142-dev.13

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

@@ -70,6 +70,10 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
     key: "setOnBeforeConfirm",
     value: function setOnBeforeConfirm(callback) {
       this._onBeforeConfirm = callback;
+      // 展码链路：同步设置 onBeforeConfirm 到 ApplePaySdk，确保 Chrome 展码支付时能调用商户回调
+      if (this.ApplePayService) {
+        this.ApplePayService.setOnBeforeConfirm(callback);
+      }
     }
   }, {
     key: "setMerchantAmountOverride",
@@ -166,6 +170,8 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           merchantAmount: _this2._merchantAmount,
           merchantCurrency: _this2._merchantCurrency
         });
+        // Chrome 展码链路：同步 onBeforeConfirm 到当前 ApplePaySdk 实例
+        applePayService.setOnBeforeConfirm(_this2._onBeforeConfirm);
         applePayService.startPay().then(function (res) {
           _this2.eventCenter.dispatchToApp({
             event: 'getApplePayToken',

package/esm/plugin/component/channel.d.ts

@@ -31,11 +31,16 @@ export declare class ApplePaySdk {
      * @description 支付状态，pending：支付中，normal：正常
      */
     private paymentStatus;
+    /**
+     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
+     */
+    private cancelReason;
     private logger;
     private env;
     private shipping?;
     private merchantAmount;
     private merchantCurrency;
+    private onBeforeConfirm?;
     constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
         paymentSessionData: string;
         parseData: IPaymentSessionMetaData;
@@ -45,6 +50,8 @@ export declare class ApplePaySdk {
         merchantAmount?: string | null;
         merchantCurrency?: string | null;
     });
+    /** 设置商户 onBeforeConfirm 回调（展码链路使用） */
+    setOnBeforeConfirm(callback: (() => Promise<boolean>) | null): void;
     startPay(): Promise<unknown>;
     begin(): Promise<unknown>;
     private submitPay;

package/esm/plugin/component/channel.js

@@ -1,4 +1,6 @@
 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 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -151,11 +153,16 @@ export var ApplePaySdk = /*#__PURE__*/function () {
      * @description 支付状态，pending：支付中，normal：正常
      */
     _defineProperty(this, "paymentStatus", void 0);
+    /**
+     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
+     */
+    _defineProperty(this, "cancelReason", null);
     _defineProperty(this, "logger", void 0);
     _defineProperty(this, "env", void 0);
     _defineProperty(this, "shipping", void 0);
     _defineProperty(this, "merchantAmount", void 0);
     _defineProperty(this, "merchantCurrency", void 0);
+    _defineProperty(this, "onBeforeConfirm", void 0);
     this.paymentSessionData = paymentSessionData;
     this.parseData = parseData;
     this.env = env;
@@ -164,7 +171,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     this.merchantAmount = merchantAmount;
     this.merchantCurrency = merchantCurrency;
   }
+  /** 设置商户 onBeforeConfirm 回调（展码链路使用） */
   _createClass(ApplePaySdk, [{
+    key: "setOnBeforeConfirm",
+    value: function setOnBeforeConfirm(callback) {
+      this.onBeforeConfirm = callback;
+    }
+  }, {
     key: "startPay",
     value: function () {
       var _startPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -199,6 +212,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
         try {
           if (!_this.session) return;
           _this.paymentStatus = PAYMENT_STATUS.PENDING;
+          _this.session.begin();
           _this.session.onvalidatemerchant = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
               var requestParams, res, merchantSession, _this$logger, _this$logger2;
@@ -268,7 +282,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
           }();
           _this.session.onpaymentauthorized = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event) {
-              var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, res, _this$logger3;
+              var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, _this$logger3, _this$logger4, BEFORE_CONFIRM_TIMEOUT_MS, _this$logger6, timerId, timeoutPromise, startTime, shouldContinue, _this$logger5, _this$session2, _this$session2$comple, _this$session3, _this$session3$comple, isTimeout, _this$logger7, _this$logger8, res, _this$logger9;
               return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                 while (1) switch (_context3.prev = _context3.next) {
                   case 0:
@@ -282,7 +296,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     };
                     _event$payment = event === null || event === void 0 ? void 0 : event.payment, token = _event$payment.token, billingContact = _event$payment.billingContact, shippingContact = _event$payment.shippingContact;
                     if (!token) {
-                      _context3.next = 14;
+                      _context3.next = 48;
                       break;
                     }
                     obj = {
@@ -295,24 +309,114 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     if (!isEmpty(requiredShippingContactFields) && shippingContact) {
                       obj['applePayShippingContact'] = JSON.stringify(shippingContact);
                     }
-                    _context3.next = 9;
+                    // Chrome 展码链路：在 submitPay 之前调用商户的 onBeforeConfirm 回调，与 Safari 链路对齐
+                    if (_this.onBeforeConfirm) {
+                      _context3.next = 11;
+                      break;
+                    }
+                    (_this$logger3 = _this.logger) === null || _this$logger3 === void 0 || _this$logger3.logInfo({
+                      title: 'sdk_before_confirm_skip'
+                    }, {
+                      paymentMethodType: 'APPLEPAY',
+                      path: 'applePay_chrome_sdk'
+                    });
+                    _context3.next = 41;
+                    break;
+                  case 11:
+                    // 清空回原始状态
+                    _this.cancelReason = 'USER_CANCEL';
+                    BEFORE_CONFIRM_TIMEOUT_MS = 15000;
+                    (_this$logger4 = _this.logger) === null || _this$logger4 === void 0 || _this$logger4.logInfo({
+                      title: 'sdk_before_confirm_start'
+                    }, {
+                      paymentMethodType: 'APPLEPAY',
+                      path: 'applePay_chrome_sdk'
+                    });
+                    _context3.prev = 14;
+                    timerId = null;
+                    timeoutPromise = new Promise(function (_, reject) {
+                      timerId = setTimeout(function () {
+                        return reject(new Error('onBeforeConfirm timed out'));
+                      }, BEFORE_CONFIRM_TIMEOUT_MS);
+                    });
+                    startTime = Date.now();
+                    _context3.next = 20;
+                    return Promise.race([_this.onBeforeConfirm(), timeoutPromise]);
+                  case 20:
+                    shouldContinue = _context3.sent;
+                    // 正常返回时清除超时定时器，避免 unhandled promise rejection
+                    if (timerId !== null) clearTimeout(timerId);
+                    if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+                      (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logError({
+                        title: 'sdk_before_confirm_timeout'
+                      });
+                      shouldContinue = false;
+                    }
+                    (_this$logger6 = _this.logger) === null || _this$logger6 === void 0 || _this$logger6.logInfo({
+                      title: 'sdk_element_beforeConfirm_callback_result'
+                    }, {
+                      shouldContinue: shouldContinue
+                    });
+                    if (shouldContinue) {
+                      _context3.next = 30;
+                      break;
+                    }
+                    _this.cancelReason = 'MERCHANT_ABORT';
+                    (_this$session2 = _this.session) === null || _this$session2 === void 0 || (_this$session2$comple = _this$session2.completePayment) === null || _this$session2$comple === void 0 || _this$session2$comple.call(_this$session2, window.ApplePaySession.STATUS_FAILURE);
+                    _this.abortSession();
+                    reject({
+                      errorCode: 'MERCHANT_CONFIRM_ABORT'
+                    });
+                    return _context3.abrupt("return");
+                  case 30:
+                    _context3.next = 41;
+                    break;
+                  case 32:
+                    _context3.prev = 32;
+                    _context3.t0 = _context3["catch"](14);
+                    isTimeout = _context3.t0 instanceof Error && _context3.t0.message === 'onBeforeConfirm timed out';
+                    if (isTimeout) {
+                      (_this$logger7 = _this.logger) === null || _this$logger7 === void 0 || _this$logger7.logError({
+                        title: 'sdk_before_confirm_timeout'
+                      }, {
+                        paymentMethodType: 'APPLEPAY',
+                        path: 'applePay_chrome_sdk'
+                      });
+                    } else {
+                      (_this$logger8 = _this.logger) === null || _this$logger8 === void 0 || _this$logger8.logError({
+                        title: 'sdk_before_confirm_error'
+                      }, {
+                        paymentMethodType: 'APPLEPAY',
+                        path: 'applePay_chrome_sdk',
+                        errorMessage: String((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || _context3.t0).slice(0, 200)
+                      });
+                    }
+                    _this.cancelReason = 'MERCHANT_ABORT';
+                    (_this$session3 = _this.session) === null || _this$session3 === void 0 || (_this$session3$comple = _this$session3.completePayment) === null || _this$session3$comple === void 0 || _this$session3$comple.call(_this$session3, window.ApplePaySession.STATUS_FAILURE);
+                    _this.abortSession();
+                    reject({
+                      errorCode: 'MERCHANT_CONFIRM_ABORT'
+                    });
+                    return _context3.abrupt("return");
+                  case 41:
+                    _context3.next = 43;
                     return _this.submitPay(obj);
-                  case 9:
+                  case 43:
                     res = _context3.sent;
                     _this.setPayStatus(res);
                     resolve(res);
-                    _context3.next = 16;
+                    _context3.next = 50;
                     break;
-                  case 14:
-                    (_this$logger3 = _this.logger) === null || _this$logger3 === void 0 || _this$logger3.logError({
+                  case 48:
+                    (_this$logger9 = _this.logger) === null || _this$logger9 === void 0 || _this$logger9.logError({
                       title: 'a3753.b103030.c386485.d507486'
                     });
                     exception();
-                  case 16:
+                  case 50:
                   case "end":
                     return _context3.stop();
                 }
-              }, _callee3);
+              }, _callee3, null, [[14, 32]]);
             }));
             return function (_x2) {
               return _ref3.apply(this, arguments);
@@ -320,18 +424,20 @@ export var ApplePaySdk = /*#__PURE__*/function () {
           }();
           _this.session.oncancel = function () {
             if (_this.paymentStatus === PAYMENT_STATUS.PENDING) {
-              var _this$logger4;
-              (_this$logger4 = _this.logger) === null || _this$logger4 === void 0 || _this$logger4.logError({
+              var _this$logger10;
+              (_this$logger10 = _this.logger) === null || _this$logger10 === void 0 || _this$logger10.logError({
                 title: 'a3753.b103030.c386485.d507497'
               });
             } else {
-              var _this$logger5;
-              (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logInfo({
+              var _this$logger11;
+              (_this$logger11 = _this.logger) === null || _this$logger11 === void 0 || _this$logger11.logInfo({
                 title: 'a3753.b103030.c386485.d507498'
               });
             }
+            // cancelReason === 'MERCHANT_ABORT': onBeforeConfirm 返回 false 或异常，由商户主动中止
+            // 其他：用户主动取消付款界面
             reject({
-              errorCode: APPLEPAYERRORENUM.APPLE_PAY_CANCEL
+              errorCode: _this.cancelReason === 'MERCHANT_ABORT' ? 'MERCHANT_CONFIRM_ABORT' : APPLEPAYERRORENUM.APPLE_PAY_CANCEL
             });
           };
           _this.session.begin();
@@ -345,25 +451,26 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "submitPay",
     value: function () {
       var _submitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _this$parseData2, _this$parseData3, _this$parseData4;
+        var _this$parseData2;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.prev = 0;
               _context4.t0 = submitPayInfo;
-              _context4.t1 = {
+              _context4.t1 = _objectSpread({
                 paymentSessionConfig: (_this$parseData2 = this.parseData) === null || _this$parseData2 === void 0 ? void 0 : _this$parseData2.paymentSessionConfig,
                 paymentSessionData: this.paymentSessionData,
                 paymentFactors: params,
                 paymentMethod: {
                   paymentMethodType: 'APPLEPAY'
                 },
-                shipping: this.shipping,
+                shipping: this.shipping
+              }, this.merchantAmount && this.merchantCurrency ? {
                 paymentAmount: {
-                  value: this.merchantAmount || ((_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 || (_this$parseData3 = _this$parseData3.paymentSessionFactor) === null || _this$parseData3 === void 0 || (_this$parseData3 = _this$parseData3.paymentAmount) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.value),
-                  currency: this.merchantCurrency || ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 || (_this$parseData4 = _this$parseData4.paymentSessionFactor) === null || _this$parseData4 === void 0 || (_this$parseData4 = _this$parseData4.paymentAmount) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.currency)
+                  amount: this.merchantAmount,
+                  currency: this.merchantCurrency
                 }
-              };
+              } : {});
               _context4.t2 = this.env;
               _context4.next = 6;
               return this.getDeviceId();
@@ -399,7 +506,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
   }, {
     key: "setPayStatus",
     value: function setPayStatus(result) {
-      var _this$session2, _this$session2$comple;
+      var _this$session4, _this$session4$comple;
       var payStatus = {
         success: window.ApplePaySession.STATUS_SUCCESS,
         fail: window.ApplePaySession.STATUS_FAILURE
@@ -411,13 +518,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
         status = 'fail';
       }
       this.paymentStatus = PAYMENT_STATUS.NORMAL;
-      (_this$session2 = this.session) === null || _this$session2 === void 0 || (_this$session2$comple = _this$session2.completePayment) === null || _this$session2$comple === void 0 || _this$session2$comple.call(_this$session2, payStatus[status]);
+      (_this$session4 = this.session) === null || _this$session4 === void 0 || (_this$session4$comple = _this$session4.completePayment) === null || _this$session4$comple === void 0 || _this$session4$comple.call(_this$session4, payStatus[status]);
     }
   }, {
     key: "initApplePaySession",
     value: function () {
       var _initApplePaySession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$logger7, _this$parseData5, _this$logger6, _ref4, recurringInfo, version, _this$logger8;
+        var _this$logger13, _this$parseData3, _this$logger12, _ref4, recurringInfo, version, _this$logger14;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -432,7 +539,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 _context5.next = 7;
                 break;
               }
-              (_this$logger6 = this.logger) === null || _this$logger6 === void 0 || _this$logger6.logError({
+              (_this$logger12 = this.logger) === null || _this$logger12 === void 0 || _this$logger12.logError({
                 title: 'a3753.b103030.c386485.d507448'
               });
               this.paymentStatus = PAYMENT_STATUS.NORMAL;
@@ -440,7 +547,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 errorCode: APPLEPAYERRORENUM.APPLE_PAY_MISSING_DATA
               }));
             case 7:
-              (_this$logger7 = this.logger) === null || _this$logger7 === void 0 || _this$logger7.logInfo({
+              (_this$logger13 = this.logger) === null || _this$logger13 === void 0 || _this$logger13.logInfo({
                 title: 'a3753.b103030.c386485.d507459'
               });
               _context5.next = 10;
@@ -452,7 +559,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
               }
               throw new Error('Apple Pay not supported');
             case 12:
-              _ref4 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {}, recurringInfo = _ref4.recurringInfo;
+              _ref4 = ((_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.paymentSessionFactor) || {}, recurringInfo = _ref4.recurringInfo;
               version = recurringInfo ? APPLE_PAY_RECURRING_VERSION : APPLE_PAY_VERSION;
               if (this.isCanMakePayments(version)) {
                 _context5.next = 16;
@@ -466,7 +573,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
             case 19:
               _context5.prev = 19;
               _context5.t0 = _context5["catch"](0);
-              (_this$logger8 = this.logger) === null || _this$logger8 === void 0 || _this$logger8.logError({
+              (_this$logger14 = this.logger) === null || _this$logger14 === void 0 || _this$logger14.logError({
                 title: 'a3753.b103030.c386485.d507471'
               });
               return _context5.abrupt("return", Promise.reject({
@@ -487,9 +594,9 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "abortSession",
     value: function abortSession() {
       try {
-        var _this$session$abort, _this$session3;
+        var _this$session$abort, _this$session5;
         this.paymentStatus = PAYMENT_STATUS.NORMAL;
-        this.session && ((_this$session$abort = (_this$session3 = this.session).abort) === null || _this$session$abort === void 0 ? void 0 : _this$session$abort.call(_this$session3));
+        this.session && ((_this$session$abort = (_this$session5 = this.session).abort) === null || _this$session$abort === void 0 ? void 0 : _this$session$abort.call(_this$session5));
       } catch (e) {
         console.error('abortPaySession error', e);
       } finally {
@@ -499,8 +606,8 @@ export var ApplePaySdk = /*#__PURE__*/function () {
   }, {
     key: "initSessionParams",
     get: function get() {
-      var _this$parseData6;
-      var _ref5 = ((_this$parseData6 = this.parseData) === null || _this$parseData6 === void 0 ? void 0 : _this$parseData6.paymentSessionFactor) || {},
+      var _this$parseData4;
+      var _ref5 = ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.paymentSessionFactor) || {},
         merchantInfo = _ref5.merchantInfo,
         order = _ref5.order,
         paymentAmount = _ref5.paymentAmount,
@@ -550,8 +657,8 @@ export var ApplePaySdk = /*#__PURE__*/function () {
   }, {
     key: "isRequiredParameters",
     get: function get() {
-      var _this$parseData7;
-      var _ref6 = ((_this$parseData7 = this.parseData) === null || _this$parseData7 === void 0 ? void 0 : _this$parseData7.paymentSessionFactor) || {},
+      var _this$parseData5;
+      var _ref6 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {},
         merchantInfo = _ref6.merchantInfo,
         extendInfo = _ref6.extendInfo,
         paymentAmount = _ref6.paymentAmount;
@@ -624,14 +731,14 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "getDeviceId",
     value: function () {
       var _getDeviceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _yield$BusManager$pub, _this$parseData8;
+        var _yield$BusManager$pub, _this$parseData6;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
               return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId, JSON.stringify({
                 deviceIdParameter: {
-                  productScene: (_this$parseData8 = this.parseData) === null || _this$parseData8 === void 0 || (_this$parseData8 = _this$parseData8.paymentSessionConfig) === null || _this$parseData8 === void 0 ? void 0 : _this$parseData8.productScene
+                  productScene: (_this$parseData6 = this.parseData) === null || _this$parseData6 === void 0 || (_this$parseData6 = _this$parseData6.paymentSessionConfig) === null || _this$parseData6 === void 0 ? void 0 : _this$parseData6.productScene
                 }
               })), {
                 fallback: ''

package/esm/types/index.d.ts

@@ -575,7 +575,7 @@ export interface CashierSubmitPayRequest {
     shipping?: import('../core/component/element/type').CKPShipping;
     extParams?: any;
     /** 支付金额 */
-    paymentAmount?: Pick<IAmount, 'value' | 'currency'>;
+    paymentAmount?: Pick<IAmount, 'amount' | 'currency'>;
 }
 export interface CashierSdkActionQueryResult {
     supportedLanguages?: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1781004142-dev.11",
+  "version": "0.0.1781004142-dev.13",
   "description": "",
   "author": "",
   "exports": {