@alipay/ams-checkout 0.0.1730107332-dev.4 → 0.0.1730107332-dev.6

package/esm/component/channel.d.ts

@@ -1,7 +1,7 @@
 import type { IPaymentSessionMetaData } from "../types";
 export type IChannelBehavior = {
     usePaymentSessionAsQueryResult: boolean;
-    submitPayInSdk: boolean;
+    allowSubmitPayCallAhead: boolean;
     createIframeNode: boolean;
     loadApp: boolean;
     buildSubmitPayExtParams?: (params: GetDoubleFaParams) => any;

package/esm/component/channel.js

@@ -1,36 +1,68 @@
 export function getChannelBehavior(paymentSessionMetaData) {
-  var _paymentSessionMetaDa, _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4, _paymentSessionMetaDa5, _paymentSessionMetaDa6, _paymentSessionMetaDa7, _paymentSessionMetaDa8;
-  // TOSS EASYPAY 2.0
-  if ('BANKTRANSFER_QUICKPAY' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa2 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa2 === void 0 ? void 0 : _paymentSessionMetaDa2.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa3 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa3 === void 0 ? void 0 : _paymentSessionMetaDa3.paymentMethodCategoryType) === 'APM' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa4 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa4 === void 0 ? void 0 : _paymentSessionMetaDa4.productSceneVersion) === '2.0') {
-    return {
-      usePaymentSessionAsQueryResult: true,
-      submitPayInSdk: true,
-      createIframeNode: true,
-      loadApp: true,
-      allowClickOutsideClose: true,
-      buildSubmitPayExtParams: function buildSubmitPayExtParams(params) {
-        var callBackUrl = getDoubleFaUrl(params);
-        return {
-          callBackUrl: callBackUrl
+  var _paymentSessionMetaDa;
+  var usePaymentSessionAsQueryResult = false;
+  var allowSubmitPayCallAhead = false;
+  var allowClickOutsideClose = false;
+  var buildSubmitPayExtParams = undefined;
+
+  // EASYPAY
+  if ((paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.productScene) === 'EASY_PAY') {
+    var _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4, _paymentSessionMetaDa5;
+    var amountConfirmRequired = (_paymentSessionMetaDa2 = paymentSessionMetaData.action) === null || _paymentSessionMetaDa2 === void 0 ? void 0 : _paymentSessionMetaDa2.amountConfirmRequired;
+    var isFirstTimeToPay = !((_paymentSessionMetaDa3 = paymentSessionMetaData.action) !== null && _paymentSessionMetaDa3 !== void 0 && _paymentSessionMetaDa3.autoDebitWithToken);
+    // EASYPAY 1.0
+    if ((paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa4 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa4 === void 0 ? void 0 : _paymentSessionMetaDa4.productSceneVersion) === '1.0') {
+      if (amountConfirmRequired) {
+        usePaymentSessionAsQueryResult = true;
+      }
+      if (!isFirstTimeToPay && amountConfirmRequired) {
+        allowSubmitPayCallAhead = false;
+      } else {
+        allowSubmitPayCallAhead = true;
+      }
+    } else if ((paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa5 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa5 === void 0 ? void 0 : _paymentSessionMetaDa5.productSceneVersion) === '2.0') {
+      if (isFirstTimeToPay) {
+        var _paymentSessionMetaDa6;
+        if ('TNG' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa6 = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa6 === void 0 ? void 0 : _paymentSessionMetaDa6.paymentMethodType) || isEasyPayTossWallet(paymentSessionMetaData)) {
+          allowSubmitPayCallAhead = true;
+        } else {
+          allowSubmitPayCallAhead = false;
+        }
+      } else {
+        if (amountConfirmRequired) {
+          if (isEasyPayTossWallet(paymentSessionMetaData)) {
+            allowSubmitPayCallAhead = true;
+          } else {
+            allowSubmitPayCallAhead = false;
+          }
+        } else {
+          allowSubmitPayCallAhead = true;
+        }
+      }
+      if (isEasyPayTossWallet(paymentSessionMetaData)) {
+        usePaymentSessionAsQueryResult = true;
+        allowClickOutsideClose = true;
+        buildSubmitPayExtParams = function buildSubmitPayExtParams(params) {
+          var callBackUrl = getDoubleFaUrl(params);
+          return {
+            callBackUrl: callBackUrl
+          };
         };
       }
-    };
-  }
-  // TNG EASYPAY 2.0
-  if ('TNG' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa5 = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa5 === void 0 ? void 0 : _paymentSessionMetaDa5.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa6 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa6 === void 0 ? void 0 : _paymentSessionMetaDa6.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa7 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa7 === void 0 ? void 0 : _paymentSessionMetaDa7.paymentMethodCategoryType) === 'WALLET' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa8 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa8 === void 0 ? void 0 : _paymentSessionMetaDa8.productSceneVersion) === '2.0') {
-    return {
-      usePaymentSessionAsQueryResult: false,
-      submitPayInSdk: false,
-      createIframeNode: true,
-      loadApp: true,
-      allowClickOutsideClose: false,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      buildSubmitPayExtParams: function buildSubmitPayExtParams(params) {
-        return {};
+      if (isEasyPayTngWallet(paymentSessionMetaData)) {
+        buildSubmitPayExtParams = function buildSubmitPayExtParams(params) {
+          return {};
+        };
       }
-    };
+    }
   }
-  return undefined;
+  return {
+    usePaymentSessionAsQueryResult: usePaymentSessionAsQueryResult,
+    allowSubmitPayCallAhead: allowSubmitPayCallAhead,
+    buildSubmitPayExtParams: buildSubmitPayExtParams,
+    createIframeNode: true,
+    loadApp: true
+  };
 }
 export function getDoubleFaUrl(params) {
   var instanceId = params.instanceId,
@@ -50,4 +82,18 @@ export function getDoubleFaUrl(params) {
   };
   var doubleFaBaseUrl = DOUBLE_FA_URL_MAPPING[env] || DOUBLE_FA_URL_MAPPING.prod;
   return "".concat(doubleFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);
+}
+function isEasyPayTossWallet(paymentSessionMetaData) {
+  var _paymentSessionMetaDa7, _paymentSessionMetaDa8, _paymentSessionMetaDa9;
+  if ((paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa7 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa7 === void 0 ? void 0 : _paymentSessionMetaDa7.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa8 = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa8 === void 0 ? void 0 : _paymentSessionMetaDa8.paymentMethodType) === 'BANKTRANSFER_QUICKPAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa9 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa9 === void 0 ? void 0 : _paymentSessionMetaDa9.paymentMethodCategoryType) === 'APM') {
+    return true;
+  }
+  return false;
+}
+function isEasyPayTngWallet(paymentSessionMetaData) {
+  var _paymentSessionMetaDa10, _paymentSessionMetaDa11, _paymentSessionMetaDa12;
+  if ((paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa10 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa10 === void 0 ? void 0 : _paymentSessionMetaDa10.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa11 = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa11 === void 0 ? void 0 : _paymentSessionMetaDa11.paymentMethodType) === 'TNG' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa12 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa12 === void 0 ? void 0 : _paymentSessionMetaDa12.paymentMethodCategoryType) === 'WALLET') {
+    return true;
+  }
+  return false;
 }

package/esm/foundation/product-processor/easysafepay/index.d.ts

@@ -20,7 +20,6 @@ export declare class EasySafePayProcessor implements ProductProcessor {
      *  start waiting web launch, then send renderComponent event
      * */
     private sendRequestAndWaitWebLaunch;
-    private processPaymentQuery;
     private processSubmitPay;
     private acquireApdidToken;
     private initSecuritySDK;

package/esm/foundation/product-processor/easysafepay/index.js

@@ -16,7 +16,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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); }
-import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isLocalMock, isPC, ProductInfoCacheUtil, ProductSceneEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
+import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, ProductInfoCacheUtil, ProductSceneEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
@@ -88,7 +88,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 hostSign: this.hostSign,
                 productSceneVersion: productSceneVersion
               });
-              // 返回结果之前，发送actionquery，并且等待Web应用启动的事件，内部是异步处理，不阻塞。
+              // 返回结果之前，发送 sessionData，并且等待Web应用启动的事件，内部是异步处理，不阻塞。
               this.sendRequestAndWaitWebLaunch();
               // 返回结果，RENDER，让外层去处理iframe加载等逻辑
               return _context.abrupt("return", {
@@ -209,15 +209,6 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     value: function sendRequestAndWaitWebLaunch() {
       var _this2 = this;
       var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
-      var requestPromise = Promise.all([this.processPaymentQuery(), this.processSubmitPay()]).then(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          queryRes = _ref2[0],
-          submitRes = _ref2[1];
-        return {
-          queryRes: queryRes,
-          submitRes: submitRes
-        };
-      });
       var webLaunchPromise = new Promise(function (resolve) {
         eventCenter.listen('onLaunch', function (res) {
           resolve(res);
@@ -225,25 +216,27 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      Promise.all([requestPromise, webLaunchPromise]).then(function (_ref3) {
-        var _this2$paymentContext, _this2$paymentContext2, _this2$paymentContext3, _this2$paymentContext4, _this2$paymentContext5, _this2$paymentContext6;
-        var _ref4 = _slicedToArray(_ref3, 2),
-          requestResult = _ref4[0],
-          launchRes = _ref4[1];
+      Promise.all([this.processSubmitPay, webLaunchPromise]).then(function (_ref) {
+        var _this2$paymentContext, _this2$paymentContext2, _this2$paymentContext3, _this2$paymentContext4, _this2$paymentContext5, _this2$paymentContext6, _this2$paymentContext7, _this2$paymentContext8;
+        var _ref2 = _slicedToArray(_ref, 2),
+          submitRes = _ref2[0],
+          launchRes = _ref2[1];
         var logMetaData = _this2.logger.getLogConfig().mdata;
         eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
-            queryResult: requestResult.queryRes,
-            submitResult: requestResult.submitRes,
-            sessionResult: (_this2$paymentContext = _this2.paymentContext) === null || _this2$paymentContext === void 0 ? void 0 : _this2$paymentContext.paymentSessionObj,
-            paymentSessionData: (_this2$paymentContext2 = _this2.paymentContext) === null || _this2$paymentContext2 === void 0 ? void 0 : _this2$paymentContext2.paymentSession,
+            queryResult: _objectSpread(_objectSpread({}, (_this2$paymentContext = _this2.paymentContext) === null || _this2$paymentContext === void 0 ? void 0 : _this2$paymentContext.paymentSessionObj), {}, {
+              orderAmount: (_this2$paymentContext2 = _this2.paymentContext) === null || _this2$paymentContext2 === void 0 || (_this2$paymentContext2 = _this2$paymentContext2.paymentSessionObj) === null || _this2$paymentContext2 === void 0 ? void 0 : _this2$paymentContext2.paymentView // For ESP 1.0
+            }),
+            sessionResult: (_this2$paymentContext3 = _this2.paymentContext) === null || _this2$paymentContext3 === void 0 ? void 0 : _this2$paymentContext3.paymentSessionObj,
+            submitResult: submitRes,
+            paymentSessionData: (_this2$paymentContext4 = _this2.paymentContext) === null || _this2$paymentContext4 === void 0 ? void 0 : _this2$paymentContext4.paymentSession,
             heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
             renderDisplayType: _this2.paymentContext.displayInfo.type,
-            appearance: (_this2$paymentContext3 = _this2.paymentContext.displayInfo) === null || _this2$paymentContext3 === void 0 ? void 0 : _this2$paymentContext3.appearance,
-            notRedirectAfterComplete: ((_this2$paymentContext4 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext4 === void 0 ? void 0 : _this2$paymentContext4.notRedirectAfterComplete) === true,
+            appearance: (_this2$paymentContext5 = _this2.paymentContext.displayInfo) === null || _this2$paymentContext5 === void 0 ? void 0 : _this2$paymentContext5.appearance,
+            notRedirectAfterComplete: ((_this2$paymentContext6 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext6 === void 0 ? void 0 : _this2$paymentContext6.notRedirectAfterComplete) === true,
             isAppWebview: _this2.paymentContext.startBizFlowOptions.isAppWebview,
-            merchantAppointParam: (_this2$paymentContext5 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext5 === void 0 ? void 0 : _this2$paymentContext5.merchantAppointParam,
+            merchantAppointParam: (_this2$paymentContext7 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext7 === void 0 ? void 0 : _this2$paymentContext7.merchantAppointParam,
             allowSubmitPayCallAhead: _this2.allowSubmitPayCallAhead,
             envInfo: {
               screenHeight: screen.height,
@@ -253,7 +246,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               trackId: logMetaData.requestSeq,
               platform: logMetaData.platform,
               firstLogTime: logMetaData.firstLogTime
-            }, ((_this2$paymentContext6 = _this2.paymentContext.paymentSessionObj) === null || _this2$paymentContext6 === void 0 ? void 0 : _this2$paymentContext6.paymentSessionConfig) || {}), {}, {
+            }, ((_this2$paymentContext8 = _this2.paymentContext.paymentSessionObj) === null || _this2$paymentContext8 === void 0 ? void 0 : _this2$paymentContext8.paymentSessionConfig) || {}), {}, {
               renderDisplayType: logMetaData.renderDisplayType,
               sdkVersion: logMetaData.sdkVersion,
               merchantId: logMetaData.merchantId,
@@ -265,149 +258,20 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "processPaymentQuery",
+    key: "processSubmitPay",
     value: function () {
-      var _processPaymentQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$paymentContext, _this$paymentContext2, _this$paymentContext3, _this$paymentContext4, _this$paymentContext5, _this$channelBehavior2;
-        var envInfo, requestData, extendInfo, actionData, enableEasypayApiOptimize, extendInfoData, productSceneVersion, requestBizId, requester, res;
+      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this$paymentContext, _this$paymentContext2, _this$paymentContext3, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$2;
+        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              envInfo = {
-                locale: this.initConfig.locale
-              }; //
-              requestData = {
-                paymentSessionData: ((_this$paymentContext = this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSession) || '',
-                paymentSessionConfig: (_this$paymentContext2 = this.paymentContext) === null || _this$paymentContext2 === void 0 || (_this$paymentContext2 = _this$paymentContext2.paymentSessionObj) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionConfig,
-                notRedirectAfterComplete: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.startBizFlowOptions.submitPayRequestExtra.notRedirectAfterComplete) === true
-                // merchantAppointParam: this._merchantAppointParam,
-              };
-              extendInfo = ((_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 || (_this$paymentContext4 = _this$paymentContext4.paymentSessionObj) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.extendInfo) || '';
-              actionData = (_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 || (_this$paymentContext5 = _this$paymentContext5.paymentSessionObj) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.action;
-              enableEasypayApiOptimize = false;
-              try {
-                extendInfoData = JSON.parse(extendInfo);
-                enableEasypayApiOptimize = extendInfoData.enableEasypayApiOptimize || false;
-              } catch (error) {
-                console.log(error);
-              }
-              if (!isLocalMock()) {
-                _context2.next = 8;
-                break;
-              }
-              return _context2.abrupt("return", {
-                message: 'sdk no need to make query request',
-                success: true
-              });
-            case 8:
-              if (!((_this$channelBehavior2 = this.channelBehavior) !== null && _this$channelBehavior2 !== void 0 && _this$channelBehavior2.usePaymentSessionAsQueryResult)) {
-                _context2.next = 10;
-                break;
-              }
-              return _context2.abrupt("return", {
-                autoDebitWithToken: actionData === null || actionData === void 0 ? void 0 : actionData.autoDebitWithToken,
-                amountConfirmRequired: actionData === null || actionData === void 0 ? void 0 : actionData.amountConfirmRequired,
-                success: true
-              });
-            case 10:
-              if (!(actionData.skipSdkQuery && enableEasypayApiOptimize)) {
-                _context2.next = 12;
-                break;
-              }
-              return _context2.abrupt("return", {
-                message: 'sdk no need to make query request',
-                success: true
-              });
-            case 12:
-              productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion; // ESP 2.0 无需Query
-              if (!(productSceneVersion === '2.0')) {
-                _context2.next = 15;
-                break;
-              }
-              return _context2.abrupt("return", {
-                message: 'sdk no need to make query request',
-                success: true
-              });
-            case 15:
-              _context2.next = 17;
-              return this.acquireApdidToken();
-            case 17:
-              envInfo.deviceId = _context2.sent;
-              requestBizId = uuid(); // 打日志
-              this.logger.logInfo({
-                title: 'sdk_event_sdkQuery'
-              }, {
-                paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                requestBizId: requestBizId
-              });
-
-              // 真正发请求
-              requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 21;
-              _context2.next = 24;
-              return requester.request(requestData, {
-                env: this.initConfig.environment,
-                envInfo: envInfo,
-                hostSign: this.hostSign,
-                'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
-              });
-            case 24:
-              res = _context2.sent;
-              this.logger.logInfo({
-                title: 'sdk_event_sdkQueryEnd'
-              }, {
-                paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                requestBizId: requestBizId,
-                traceId: res.traceId
-              });
-              return _context2.abrupt("return", res);
-            case 29:
-              _context2.prev = 29;
-              _context2.t0 = _context2["catch"](21);
-              this.logger.logError({
-                title: 'sdk_event_sdkQuery_failed'
-              }, {
-                paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                errorReason: _context2.t0,
-                requestBizId: requestBizId,
-                traceId: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.traceId
-              });
-              throw _context2.t0;
-            case 33:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this, [[21, 29]]);
-      }));
-      function processPaymentQuery() {
-        return _processPaymentQuery.apply(this, arguments);
-      }
-      return processPaymentQuery;
-    }()
-  }, {
-    key: "processSubmitPay",
-    value: function () {
-      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$paymentContext6, _this$paymentContext7, _this$paymentContext9, _this$channelBehavior3, _this$channelBehavior4, _this$paymentContext$2;
-        var submitParams, shouldSkipSubmitPayInSDK, _this$paymentContext8, _ref5, _ref5$productSceneVer, productSceneVersion, _ref6, _ref6$action, _ref6$action2, _ref6$action2$enableS, enableSignAgreement, _ref6$action2$autoDeb, autoDebitWithToken, _this$paymentContext$, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, res;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               submitParams = {
-                paymentSessionData: ((_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.paymentSession) || '',
-                paymentSessionConfig: (_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 || (_this$paymentContext7 = _this$paymentContext7.paymentSessionObj) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.paymentSessionConfig
+                paymentSessionData: ((_this$paymentContext = this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSession) || '',
+                paymentSessionConfig: (_this$paymentContext2 = this.paymentContext) === null || _this$paymentContext2 === void 0 || (_this$paymentContext2 = _this$paymentContext2.paymentSessionObj) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionConfig
               };
-              shouldSkipSubmitPayInSDK = false;
-              if (this.channelBehavior) {
-                // 新逻辑走 channelBehavior判断
-                shouldSkipSubmitPayInSDK = !this.channelBehavior.submitPayInSdk;
-              } else {
-                // TODO: 拉会找栎昂、甘颜一起对下
-                // 老逻辑，只要服务端标记不跳过sdkquery，就需要跳过submitpay
-                shouldSkipSubmitPayInSDK = !((_this$paymentContext8 = this.paymentContext) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.paymentSessionObj) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.action) !== null && _this$paymentContext8 !== void 0 && _this$paymentContext8.skipSdkQuery);
-              }
-              _ref5 = submitParams.paymentSessionConfig || {}, _ref5$productSceneVer = _ref5.productSceneVersion, productSceneVersion = _ref5$productSceneVer === void 0 ? '' : _ref5$productSceneVer;
-              _ref6 = ((_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionObj) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$enableS = _ref6$action2.enableSignAgreement, enableSignAgreement = _ref6$action2$enableS === void 0 ? false : _ref6$action2$enableS, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
+              _ref3 = submitParams.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer;
+              _ref4 = ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionObj) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$enableS = _ref4$action2.enableSignAgreement, enableSignAgreement = _ref4$action2$enableS === void 0 ? false : _ref4$action2$enableS, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
               if (productSceneVersion === '2.0' && !autoDebitWithToken) {
                 ///EasyPay 2.0 首次传signAgreement字段
                 submitParams['signAgreement'] = enableSignAgreement;
@@ -420,17 +284,16 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                   }
                 }
               }
-              // 带上标记告知WebCheckOut SDK已发送submitpay请求
-              this.allowSubmitPayCallAhead = !shouldSkipSubmitPayInSDK;
-              if (!shouldSkipSubmitPayInSDK) {
-                _context3.next = 9;
+              this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
+              if (this.allowSubmitPayCallAhead) {
+                _context2.next = 7;
                 break;
               }
-              return _context3.abrupt("return", {
+              return _context2.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
-            case 9:
+            case 7:
               requestBizId = uuid(); // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
@@ -439,7 +302,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestBizId: requestBizId
               });
               // 由渠道定制点来构建额外参数
-              extParams = ((_this$channelBehavior3 = this.channelBehavior) === null || _this$channelBehavior3 === void 0 || (_this$channelBehavior4 = _this$channelBehavior3.buildSubmitPayExtParams) === null || _this$channelBehavior4 === void 0 ? void 0 : _this$channelBehavior4.call(_this$channelBehavior3, {
+              extParams = ((_this$channelBehavior2 = this.channelBehavior) === null || _this$channelBehavior2 === void 0 || (_this$channelBehavior3 = _this$channelBehavior2.buildSubmitPayExtParams) === null || _this$channelBehavior3 === void 0 ? void 0 : _this$channelBehavior3.call(_this$channelBehavior2, {
                 instanceId: this.instanceId,
                 locale: this.initConfig.locale,
                 paymentMethodType: (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentMethodInfoView) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.paymentMethodType,
@@ -447,32 +310,33 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 env: this.initConfig.environment,
                 sdkVersion: this.paymentContext.sdkMetaData.sdkVersion
               })) || {};
+              extParams.complianceSDK = true;
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context3.prev = 14;
-              _context3.t0 = requester;
-              _context3.t1 = submitParams;
-              _context3.t2 = this.initConfig.environment;
-              _context3.next = 20;
+              _context2.prev = 13;
+              _context2.t0 = requester;
+              _context2.t1 = submitParams;
+              _context2.t2 = this.initConfig.environment;
+              _context2.next = 19;
               return this.acquireApdidToken();
-            case 20:
-              _context3.t3 = _context3.sent;
-              _context3.t4 = {
-                deviceId: _context3.t3
+            case 19:
+              _context2.t3 = _context2.sent;
+              _context2.t4 = {
+                deviceId: _context2.t3
               };
-              _context3.t5 = this.hostSign;
-              _context3.t6 = {
-                env: _context3.t2,
+              _context2.t5 = this.hostSign;
+              _context2.t6 = {
+                env: _context2.t2,
                 timeout: 15000,
-                envInfo: _context3.t4,
-                hostSign: _context3.t5,
+                envInfo: _context2.t4,
+                hostSign: _context2.t5,
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context3.next = 26;
-              return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t6);
-            case 26:
-              res = _context3.sent;
+              _context2.next = 25;
+              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t6);
+            case 25:
+              res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
@@ -480,50 +344,50 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestBizId: requestBizId,
                 traceId: res.traceId
               });
-              return _context3.abrupt("return", res);
-            case 31:
-              _context3.prev = 31;
-              _context3.t7 = _context3["catch"](14);
+              return _context2.abrupt("return", res);
+            case 30:
+              _context2.prev = 30;
+              _context2.t7 = _context2["catch"](13);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
                 paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                errorReason: _context3.t7,
+                errorReason: _context2.t7,
                 requestBizId: requestBizId,
-                traceId: _context3.t7 === null || _context3.t7 === void 0 ? void 0 : _context3.t7.traceId
+                traceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
               });
-              throw _context3.t7;
-            case 35:
+              throw _context2.t7;
+            case 34:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this, [[14, 31]]);
+        }, _callee2, this, [[13, 30]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
       }
       return processSubmitPay;
-    }() // TOOD: 讨论下是否放到 requester里面
+    }()
   }, {
     key: "acquireApdidToken",
     value: function () {
-      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _this$paymentContext$3;
         var securityService, productScene, deviceId;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
               productScene = (_this$paymentContext$3 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$3 === void 0 || (_this$paymentContext$3 = _this$paymentContext$3.paymentSessionConfig) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.productScene;
               deviceId = securityService.getDeviceId({
                 productScene: productScene
               });
-              return _context4.abrupt("return", deviceId);
+              return _context3.abrupt("return", deviceId);
             case 4:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
       function acquireApdidToken() {
         return _acquireApdidToken.apply(this, arguments);
@@ -533,58 +397,71 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "initSecuritySDK",
     value: function () {
-      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$paymentContext$4, productSceneVersion, nonCompliant, isFirstTimeToPay;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$paymentContext$4, _this$paymentContext$5, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context5.prev = 0;
+              _context4.prev = 0;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
               nonCompliant = (_this$paymentContext$4 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.nonCompliant;
+              nonInitSecuritySDK = (_this$paymentContext$5 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$5 === void 0 ? void 0 : _this$paymentContext$5.nonCompliant;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
+              if (!nonInitSecuritySDK) {
+                _context4.next = 8;
+                break;
+              }
+              // 钱包不依赖风控
+              console.log('[web-sdk][security-sdk] DO NOT init security sdk when nonInitSecuritySDK is true');
+              return _context4.abrupt("return");
+            case 8:
               if (!(productSceneVersion === '1.0')) {
-                _context5.next = 9;
+                _context4.next = 13;
                 break;
               }
-              console.log('[web-sdk][security-sdk] skip init security sdk for easypay 1.0');
               // 1.0 不初始化 SecuritySDK
-              return _context5.abrupt("return");
-            case 9:
+              console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 1.0');
+              return _context4.abrupt("return");
+            case 13:
               if (!(productSceneVersion === '2.0')) {
-                _context5.next = 20;
+                _context4.next = 27;
                 break;
               }
               if (!(nonCompliant === true)) {
-                _context5.next = 16;
+                _context4.next = 20;
                 break;
               }
               // 未切流「隐私合规」
-              console.log('[web-sdk][security-sdk] init security sdk for easypay 2.0 and nonCompliant is true');
-              _context5.next = 14;
+              console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and nonCompliant is true');
+              _context4.next = 18;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 14:
-              _context5.next = 20;
+            case 18:
+              _context4.next = 27;
               break;
-            case 16:
-              if (isFirstTimeToPay) {
-                _context5.next = 20;
+            case 20:
+              if (!isFirstTimeToPay) {
+                _context4.next = 24;
                 break;
               }
+              console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 2.0 and when first time to pay');
+              _context4.next = 27;
+              break;
+            case 24:
               // 切流「隐私合规」且非首次支付
-              console.log('[web-sdk][security-sdk] init security sdk for easypay 2.0 and when not first time to pay');
-              _context5.next = 20;
+              console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
+              _context4.next = 27;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 20:
-              _context5.next = 24;
+            case 27:
+              _context4.next = 31;
               break;
-            case 22:
-              _context5.prev = 22;
-              _context5.t0 = _context5["catch"](0);
-            case 24:
+            case 29:
+              _context4.prev = 29;
+              _context4.t0 = _context4["catch"](0);
+            case 31:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this, [[0, 22]]);
+        }, _callee4, this, [[0, 29]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);