@pisell/private-materials 6.6.62 → 6.6.63

package/es/components/eftposPay/aggregatePayment/utils/payment.js

@@ -1,10 +1,5 @@
-var _excluded = ["pay_param_base64"],
-  _excluded2 = ["pay_param_base64"];
-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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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); }); }; }
@@ -14,6 +9,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); }
+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); }
 /**
  * 聚合支付方法类
  * 核心点：
@@ -21,12 +17,32 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * 2.轮询操作总查询时间2分钟，超时直接失败，单次轮询超时时间5秒，超时直接abort本次请求，间隔两秒后发起新的请求
  * 3.最终成功或者失败都需要把定时器给清理掉，并将未完成的接口abort掉
  */
-
+import { locales } from '@pisell/utils';
 import { PayStatus } from "../../const";
-import paymentLog from "./logs";
+import payLog from "../../utils/payLog";
 import { AGPTPayApi, AGPTQueryApi, AGPTActionApi, AGPTRefundApi, AGPTRefundQueryApi, AGPTRefundActionApi } from "../service";
-import { getUuid } from "../../helper";
+import { cloneDeep, getUuid } from "../../helper";
 import { EPaymentStatus, ActionType, QUERY_START_DELAY, REQUEST_TIMEOUT, QUERY_INTERVAL, GLOBAL_TIMEOUT } from "../types";
+var sanitizePaymentLogContent = function sanitizePaymentLogContent(content) {
+  var _content$params;
+  if (!content || _typeof(content) !== 'object') {
+    return content;
+  }
+  if (!((_content$params = content.params) !== null && _content$params !== void 0 && (_content$params = _content$params.eftpos) !== null && _content$params !== void 0 && _content$params.pay_param_base64)) {
+    return content;
+  }
+  var clonedContent = cloneDeep(content);
+  delete clonedContent.params.eftpos.pay_param_base64;
+  return clonedContent;
+};
+var addPaymentLog = function addPaymentLog(_ref) {
+  var title = _ref.title,
+    content = _ref.content;
+  payLog.log(title, sanitizePaymentLogContent(content));
+};
+var paymentLog = {
+  addLog: addPaymentLog
+};
 var PaymentMethod = /*#__PURE__*/function () {
   function PaymentMethod(options) {
     _classCallCheck(this, PaymentMethod);
@@ -36,8 +52,6 @@ var PaymentMethod = /*#__PURE__*/function () {
     _defineProperty(this, "paymentNum", void 0);
     // 订单ID
     _defineProperty(this, "orderId", void 0);
-    // 设备ID
-    _defineProperty(this, "deviceId", void 0);
     // 统一回调函数
     _defineProperty(this, "callback", void 0);
     // 检查是否应该继续处理结果
@@ -71,18 +85,23 @@ var PaymentMethod = /*#__PURE__*/function () {
     this.initOptions = options;
     this.paymentNum = options.paymentNum;
     this.orderId = options.orderId;
-    this.deviceId = options.deviceId;
     this.callback = options.callback;
     this.shouldContinue = options.shouldContinue || function () {
       return true;
     };
     this.config = options.config || {};
-
-    // 初始化日志（只需要初始化一次）
-    paymentLog.init(this.paymentNum, {
-      orderId: this.orderId,
-      deviceId: this.deviceId,
-      paymentCode: (options === null || options === void 0 ? void 0 : options.paymentCode) || ''
+    payLog.setContext({
+      transactionNumber: this.paymentNum,
+      extra: {
+        paymentCode: (options === null || options === void 0 ? void 0 : options.paymentCode) || ''
+      }
+    });
+    addPaymentLog({
+      title: '聚合支付初始化',
+      content: {
+        paymentNum: this.paymentNum,
+        paymentCode: (options === null || options === void 0 ? void 0 : options.paymentCode) || ''
+      }
     });
   }
 
@@ -92,9 +111,34 @@ var PaymentMethod = /*#__PURE__*/function () {
    * @param code 错误码
    */
   _createClass(PaymentMethod, [{
-    key: "isRequestFailed",
-    value: function isRequestFailed(code) {
-      return code && "".concat(code) !== PayStatus.Timeout && "".concat(code) !== PayStatus.PayTimeout;
+    key: "isBusinessFailed",
+    value: function isBusinessFailed(res) {
+      var _res$data;
+      var _ref2 = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.external_unified_response) || {},
+        external_unified_status = _ref2.external_unified_status,
+        response_code = _ref2.response_code;
+      return "".concat(res === null || res === void 0 ? void 0 : res.code) === '200' && external_unified_status === EPaymentStatus.Failed && response_code !== PayStatus.Timeout && response_code !== PayStatus.PayTimeout;
+    }
+
+    /**
+     * 判断业务是否成功
+     */
+  }, {
+    key: "isBusinessSuccess",
+    value: function isBusinessSuccess(res) {
+      var _res$data2;
+      var _ref3 = (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.external_unified_response) || {},
+        external_unified_status = _ref3.external_unified_status;
+      return "".concat(res === null || res === void 0 ? void 0 : res.code) === '200' && external_unified_status === EPaymentStatus.Success;
+    }
+
+    /**
+     * 判断最外层code是否是超时错误
+     */
+  }, {
+    key: "isOuterCodeTimeout",
+    value: function isOuterCodeTimeout(code) {
+      return code && ("".concat(code) === PayStatus.Timeout || "".concat(code) === PayStatus.PayTimeout);
     }
 
     /**
@@ -297,13 +341,13 @@ var PaymentMethod = /*#__PURE__*/function () {
   }, {
     key: "handleResponse",
     value: function handleResponse(res) {
-      var _res$data;
+      var _res$data3;
       if (!this.currentActionType) {
         return;
       }
       var needContinue = true;
-      var _ref = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.external_unified_response) || {},
-        external_unified_status = _ref.external_unified_status;
+      var _ref4 = (res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.external_unified_response) || {},
+        external_unified_status = _ref4.external_unified_status;
       // 第三方支付结果：success成功 fail失败 processing处理中
       switch (external_unified_status) {
         case EPaymentStatus.Success:
@@ -349,7 +393,7 @@ var PaymentMethod = /*#__PURE__*/function () {
     key: "performQuery",
     value: (function () {
       var _performQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(actionType) {
-        var queryId, signal, _this$initOptions, _res$data2, res, needContinue;
+        var queryId, signal, _this$initOptions, _res$data4, res, needContinue;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -398,7 +442,8 @@ var PaymentMethod = /*#__PURE__*/function () {
                 unique_payment_number: this.paymentNum,
                 payment_code: (_this$initOptions = this.initOptions) === null || _this$initOptions === void 0 ? void 0 : _this$initOptions.paymentCode,
                 request_version: queryId,
-                is_outer_response_info: 1
+                // TODO: MX51审核需要，后续需要删除
+                is_force_request_api: 1
               }, {
                 signal: signal
               }), this.createTimeoutPromise(REQUEST_TIMEOUT)]);
@@ -419,7 +464,7 @@ var PaymentMethod = /*#__PURE__*/function () {
               }
 
               // 检查是否是过期的响应（新查询的 ID 一定大于旧查询）
-              if (!((res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.request_version) !== this.currentQueryId)) {
+              if (!((res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.request_version) !== this.currentQueryId)) {
                 _context.next = 22;
                 break;
               }
@@ -437,8 +482,18 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
               return _context.abrupt("return");
             case 25:
-              if (!(res && "".concat(res.code) === '200')) {
-                _context.next = 30;
+              if (!("".concat(res === null || res === void 0 ? void 0 : res.code) !== '200')) {
+                _context.next = 29;
+                break;
+              }
+              paymentLog.addLog({
+                title: '查询轮询结果：查询返回失败，code非200'
+              });
+              this.handleOperationError(res);
+              return _context.abrupt("return");
+            case 29:
+              if (!this.isBusinessSuccess(res)) {
+                _context.next = 34;
                 break;
               }
               paymentLog.addLog({
@@ -449,9 +504,9 @@ var PaymentMethod = /*#__PURE__*/function () {
                 this.scheduleNextQuery(actionType);
               }
               return _context.abrupt("return");
-            case 30:
+            case 34:
               // 查询返回失败但没有明确code或超时code，继续轮询
-              if (this.isRequestFailed(res === null || res === void 0 ? void 0 : res.code)) {
+              if (this.isBusinessFailed(res)) {
                 // 有明确错误code，停止轮询
                 paymentLog.addLog({
                   title: '查询轮询结果：有明确错误code，停止轮询',
@@ -460,15 +515,16 @@ var PaymentMethod = /*#__PURE__*/function () {
                 this.handleOperationError(res);
               } else {
                 paymentLog.addLog({
-                  title: '查询轮询结果：查询返回失败但没有明确code或超时code，继续轮询',
+                  title: '查询轮询结果：交易进行中，继续轮询',
                   content: res
                 });
+                this.handleOperationProcess(res);
                 this.scheduleNextQuery(actionType);
               }
-              _context.next = 46;
+              _context.next = 57;
               break;
-            case 33:
-              _context.prev = 33;
+            case 37:
+              _context.prev = 37;
               _context.t0 = _context["catch"](13);
               // 清理超时定时器
               if (this.requestTimeoutTimer) {
@@ -478,22 +534,22 @@ var PaymentMethod = /*#__PURE__*/function () {
 
               // 检查是否是过期的响应（新查询的 ID 一定大于旧查询）
               if (!(queryId !== this.currentQueryId)) {
-                _context.next = 39;
+                _context.next = 43;
                 break;
               }
               paymentLog.addLog({
                 title: '查询轮询结果：error-过期的查询异常，忽略'
               });
               return _context.abrupt("return");
-            case 39:
+            case 43:
               if (!(this.isFinished || !this.shouldContinue())) {
-                _context.next = 41;
+                _context.next = 45;
                 break;
               }
               return _context.abrupt("return");
-            case 41:
+            case 45:
               if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.name) === 'AbortError' || (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) === 'REQUEST_TIMEOUT')) {
-                _context.next = 45;
+                _context.next = 49;
                 break;
               }
               paymentLog.addLog({
@@ -501,26 +557,28 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
               this.scheduleNextQuery(actionType);
               return _context.abrupt("return");
-            case 45:
-              // 无明确code或者code是超时或支付超时，继续轮询
-              if (this.isRequestFailed(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code)) {
-                paymentLog.addLog({
-                  title: '查询轮询结果：error-有明确错误code，停止轮询',
-                  content: _context.t0
-                });
-                this.handleOperationError(_context.t0);
-              } else {
-                paymentLog.addLog({
-                  title: '查询轮询结果：error-无明确code或者code不是超时，继续轮询',
-                  content: _context.t0
-                });
-                this.scheduleNextQuery(actionType);
+            case 49:
+              if (!this.isOuterCodeTimeout(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code)) {
+                _context.next = 55;
+                break;
               }
-            case 46:
+              paymentLog.addLog({
+                title: '查询轮询结果：error-code是超时错误，继续轮询',
+                content: _context.t0
+              });
+              this.scheduleNextQuery(actionType);
+              return _context.abrupt("return");
+            case 55:
+              paymentLog.addLog({
+                title: '查询轮询结果：error-有明确错误code，停止轮询',
+                content: _context.t0
+              });
+              this.handleOperationError(_context.t0);
+            case 57:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[13, 33]]);
+        }, _callee, this, [[13, 37]]);
       }));
       function performQuery(_x) {
         return _performQuery.apply(this, arguments);
@@ -569,7 +627,8 @@ var PaymentMethod = /*#__PURE__*/function () {
   }, {
     key: "startQuery",
     value: function startQuery(actionType) {
-      var _this3 = this;
+      var _this$config2,
+        _this3 = this;
       if (this.isFinished || !this.shouldContinue() || this.isQuerying) {
         return;
       }
@@ -580,22 +639,30 @@ var PaymentMethod = /*#__PURE__*/function () {
           actionType: actionType
         }
       });
-      // 设置轮询的全局超时（2分钟，从开始轮询时计算）
+      // 设置轮询的全局超时（从开始轮询时计算）
+      var _globalQueryTimeout = ((_this$config2 = this.config) === null || _this$config2 === void 0 ? void 0 : _this$config2.globalQueryTimeout) || GLOBAL_TIMEOUT;
       this.globalTimeoutTimer = setTimeout(function () {
         if (_this3.isFinished) {
           return;
         }
         paymentLog.addLog({
-          title: '轮询全局超时（2分钟），终止所有请求',
+          title: "\u8F6E\u8BE2\u5168\u5C40\u8D85\u65F6\uFF08".concat(_globalQueryTimeout / 1000, "\u79D2\uFF09\uFF0C\u7EC8\u6B62\u6240\u6709\u8BF7\u6C42"),
           content: {
             actionType: actionType
           }
         });
+        // 构建错误信息
         _this3.handleOperationError({
-          code: PayStatus.Timeout,
-          message: '交易超时'
+          code: '200',
+          data: {
+            external_unified_response: {
+              external_unified_status: EPaymentStatus.Failed,
+              response_code: PayStatus.Timeout,
+              message: (locales === null || locales === void 0 ? void 0 : locales.getText('page.eftpos-pay.text.transaction.fail.timeout')) || 'Transaction timeout.'
+            }
+          }
         });
-      }, GLOBAL_TIMEOUT);
+      }, _globalQueryTimeout);
       this.performQuery(actionType);
     }
 
@@ -691,32 +758,29 @@ var PaymentMethod = /*#__PURE__*/function () {
     value: (function () {
       var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(runOptions) {
         var _this4 = this;
-        var actionType, params, runId, _ref2, pay_param_base64, otherParams, _this$getActionApi2, actionApi, queryApi, error, signal, _res$data3, res, needContinue;
+        var actionType, params, config, runId, _this$getActionApi2, actionApi, queryApi, error, signal, _query, _res$data5, res, needContinue;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              actionType = runOptions.actionType, params = runOptions.params; // 开始新的操作流程
-              runId = this.startNewOperation(actionType); // 记录请求参数（过滤敏感信息）
-              _ref2 = params || {}, pay_param_base64 = _ref2.pay_param_base64, otherParams = _objectWithoutProperties(_ref2, _excluded);
-              if (Object.keys(otherParams).length > 0) {
-                paymentLog.addLog({
-                  title: '请求参数',
-                  content: {
-                    params: otherParams
-                  }
-                });
-              }
+              actionType = runOptions.actionType, params = runOptions.params, config = runOptions.config; // 开始新的操作流程
+              runId = this.startNewOperation(actionType); // 记录请求参数
+              paymentLog.addLog({
+                title: '请求参数',
+                content: {
+                  params: params
+                }
+              });
 
               // 根据操作类型选择对应的API和查询API
               _this$getActionApi2 = this.getActionApi(actionType), actionApi = _this$getActionApi2.actionApi, queryApi = _this$getActionApi2.queryApi;
               if (actionApi) {
-                _context3.next = 9;
+                _context3.next = 8;
                 break;
               }
               error = new Error("".concat(actionType, "\u63A5\u53E3\u4E0D\u5B58\u5728"));
               this.handleOperationError(error);
               return _context3.abrupt("return");
-            case 9:
+            case 8:
               // 设置当前查询API
               this.currentQueryApi = queryApi;
 
@@ -736,6 +800,18 @@ var PaymentMethod = /*#__PURE__*/function () {
               // 创建主请求控制器
               this.controller = new AbortController();
               signal = this.controller.signal;
+              _query = function _query(_status, _title, _content) {
+                paymentLog.addLog({
+                  title: _title,
+                  content: _content
+                });
+                // 清除定时器
+                if (_this4.queryStartTimer) {
+                  clearTimeout(_this4.queryStartTimer);
+                  _this4.queryStartTimer = null;
+                }
+                _this4.startQuery(actionType);
+              };
               _context3.prev = 13;
               paymentLog.addLog({
                 title: "\u53D1\u8D77".concat(actionType, "\u8BF7\u6C42"),
@@ -746,8 +822,7 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
               _context3.next = 17;
               return actionApi(_objectSpread(_objectSpread({}, params), {}, {
-                request_version: runId,
-                is_outer_response_info: 1
+                request_version: runId
               }), {
                 signal: signal
               });
@@ -763,7 +838,7 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
 
               // 检查是否是过期的响应（新执行的 ID 一定大于旧执行）
-              if (!(runId != (res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.request_version))) {
+              if (!(runId != (res === null || res === void 0 || (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.request_version))) {
                 _context3.next = 22;
                 break;
               }
@@ -787,8 +862,18 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
             case 25:
-              if (!(res && "".concat(res.code) === '200')) {
-                _context3.next = 30;
+              if (!("".concat(res === null || res === void 0 ? void 0 : res.code) !== '200')) {
+                _context3.next = 29;
+                break;
+              }
+              paymentLog.addLog({
+                title: "".concat(actionType, "\u63A5\u53E3\u8FD4\u56DE\u5931\u8D25\uFF0Ccode\u975E200")
+              });
+              this.handleOperationError(res);
+              return _context3.abrupt("return");
+            case 29:
+              if (!this.isBusinessSuccess(res)) {
+                _context3.next = 34;
                 break;
               }
               paymentLog.addLog({
@@ -801,20 +886,13 @@ var PaymentMethod = /*#__PURE__*/function () {
               needContinue = this.handleResponse(res);
               if (needContinue) {
                 // 如果状态是processing，则开始轮询
-                paymentLog.addLog({
-                  title: "".concat(actionType, "\u63A5\u53E3\u8FD4\u56DEprocessing\uFF0C\u5F00\u59CB\u8F6E\u8BE2")
-                });
-                if (this.queryStartTimer) {
-                  clearTimeout(this.queryStartTimer);
-                  this.queryStartTimer = null;
-                }
-                this.startQuery(actionType);
+                _query('success', "".concat(actionType, "\u63A5\u53E3\u8FD4\u56DEprocessing\uFF0C\u5F00\u59CB\u8F6E\u8BE2"));
               }
               return _context3.abrupt("return");
-            case 30:
-              // 接口返回失败
+            case 34:
+              // 业务返回失败
               // 如果有明确的错误code且不是超时，则直接失败
-              if (this.isRequestFailed(res === null || res === void 0 ? void 0 : res.code)) {
+              if (this.isBusinessFailed(res)) {
                 paymentLog.addLog({
                   title: "".concat(actionType, "\u63A5\u53E3\u8FD4\u56DE\u5931\u8D25"),
                   content: {
@@ -824,27 +902,20 @@ var PaymentMethod = /*#__PURE__*/function () {
                 });
                 this.handleOperationError(res);
               } else {
-                paymentLog.addLog({
-                  title: "".concat(actionType, "\u8D85\u65F6\u6216\u65E0\u660E\u786E\u9519\u8BEF\uFF0C\u7B49\u5F85\u8F6E\u8BE2\u7ED3\u679C"),
-                  content: {
-                    actionType: actionType,
-                    res: res
-                  }
-                });
+                this.handleOperationProcess(res);
                 // 直接开始轮询，不等待10秒，startQuery内部会处理竞态问题
-                if (this.queryStartTimer) {
-                  clearTimeout(this.queryStartTimer);
-                  this.queryStartTimer = null;
-                }
-                this.startQuery(actionType);
+                _query('failed', "".concat(actionType, "\u8D85\u65F6\u6216\u65E0\u660E\u786E\u9519\u8BEF\uFF0C\u5F00\u59CB\u8F6E\u8BE2"), {
+                  actionType: actionType,
+                  res: res
+                });
               }
-              _context3.next = 42;
+              _context3.next = 46;
               break;
-            case 33:
-              _context3.prev = 33;
+            case 37:
+              _context3.prev = 37;
               _context3.t0 = _context3["catch"](13);
               if (!(runId !== this.currentRunId)) {
-                _context3.next = 38;
+                _context3.next = 42;
                 break;
               }
               paymentLog.addLog({
@@ -854,9 +925,9 @@ var PaymentMethod = /*#__PURE__*/function () {
                 }
               });
               return _context3.abrupt("return");
-            case 38:
+            case 42:
               if (!(this.isFinished || !this.shouldContinue())) {
-                _context3.next = 41;
+                _context3.next = 45;
                 break;
               }
               paymentLog.addLog({
@@ -866,32 +937,17 @@ var PaymentMethod = /*#__PURE__*/function () {
                 }
               });
               return _context3.abrupt("return");
-            case 41:
-              // 接口异常
-              // 如果有明确的错误code且不是超时，则直接失败
-              if (this.isRequestFailed(_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code)) {
-                paymentLog.addLog({
-                  title: "".concat(actionType, "\u63A5\u53E3\u5F02\u5E38"),
-                  content: {
-                    actionType: actionType,
-                    error: _context3.t0
-                  }
-                });
-                this.handleOperationError(_context3.t0);
-              } else {
-                paymentLog.addLog({
-                  title: "".concat(actionType, "\u8D85\u65F6\u6216\u65E0\u660E\u786E\u9519\u8BEF\uFF0C\u7B49\u5F85\u8F6E\u8BE2\u7ED3\u679C"),
-                  content: {
-                    actionType: actionType,
-                    error: _context3.t0
-                  }
-                });
-              }
-            case 42:
+            case 45:
+              // pay/refund接口异常，直接开始轮询，不能以code非200判断是否错误
+              _query('failed', "".concat(actionType, "\u63A5\u53E3\u5F02\u5E38\uFF0C\u5F00\u59CB\u8F6E\u8BE2"), {
+                actionType: actionType,
+                error: _context3.t0
+              });
+            case 46:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[13, 33]]);
+        }, _callee3, this, [[13, 37]]);
       }));
       function run(_x3) {
         return _run.apply(this, arguments);
@@ -906,21 +962,21 @@ var PaymentMethod = /*#__PURE__*/function () {
     key: "runAction",
     value: (function () {
       var _runAction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(actionOptions) {
-        var actionType, params, runActionId, _ref3, pay_param_base64, otherParams, _this$getActionApi3, actionApi, queryApi, error, signal, _res$data4, res;
+        var actionType, params, config, runActionId, _this$getActionApi3, actionApi, queryApi, error, signal, _res$data6, res;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              actionType = actionOptions.actionType, params = actionOptions.params; // 开始新的操作流程
-              runActionId = this.startNewOperation(actionType); // 记录请求参数（过滤敏感信息）
-              _ref3 = params || {}, pay_param_base64 = _ref3.pay_param_base64, otherParams = _objectWithoutProperties(_ref3, _excluded2);
-              if (Object.keys(otherParams).length > 0) {
-                paymentLog.addLog({
-                  title: '请求参数',
-                  content: {
-                    params: otherParams
-                  }
-                });
-              }
+              actionType = actionOptions.actionType, params = actionOptions.params, config = actionOptions.config;
+              console.log('runAction_actionOptions', actionOptions);
+              // 开始新的操作流程
+              runActionId = this.startNewOperation(actionType); // 记录请求参数
+              paymentLog.addLog({
+                title: "".concat(actionType, "\u64CD\u4F5C\u8BF7\u6C42\u53C2\u6570"),
+                content: {
+                  actionType: actionType,
+                  params: params
+                }
+              });
 
               // 根据操作类型选择对应的API和查询API
               _this$getActionApi3 = this.getActionApi(actionType), actionApi = _this$getActionApi3.actionApi, queryApi = _this$getActionApi3.queryApi;
@@ -939,8 +995,7 @@ var PaymentMethod = /*#__PURE__*/function () {
               _context4.prev = 12;
               _context4.next = 15;
               return actionApi(_objectSpread(_objectSpread({}, params || {}), {}, {
-                request_version: runActionId,
-                is_outer_response_info: 1
+                request_version: runActionId
               }), {
                 signal: signal
               });
@@ -958,7 +1013,7 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
               return _context4.abrupt("return");
             case 19:
-              if (!(runActionId !== (res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.request_version))) {
+              if (!(runActionId !== (res === null || res === void 0 || (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.request_version))) {
                 _context4.next = 22;
                 break;
               }
@@ -970,6 +1025,13 @@ var PaymentMethod = /*#__PURE__*/function () {
               });
               return _context4.abrupt("return");
             case 22:
+              if (!(config !== null && config !== void 0 && config.needResponse)) {
+                _context4.next = 25;
+                break;
+              }
+              this.handleResponse(res);
+              return _context4.abrupt("return");
+            case 25:
               paymentLog.addLog({
                 title: 'Action请求返回，开始轮询',
                 content: {
@@ -977,13 +1039,13 @@ var PaymentMethod = /*#__PURE__*/function () {
                 }
               });
               this.startQuery(actionType);
-              _context4.next = 36;
+              _context4.next = 39;
               break;
-            case 26:
-              _context4.prev = 26;
+            case 29:
+              _context4.prev = 29;
               _context4.t0 = _context4["catch"](12);
               if (!(this.isFinished || !this.shouldContinue())) {
-                _context4.next = 31;
+                _context4.next = 34;
                 break;
               }
               paymentLog.addLog({
@@ -993,9 +1055,9 @@ var PaymentMethod = /*#__PURE__*/function () {
                 }
               });
               return _context4.abrupt("return");
-            case 31:
+            case 34:
               if (!(runActionId !== this.currentRunId)) {
-                _context4.next = 34;
+                _context4.next = 37;
                 break;
               }
               paymentLog.addLog({
@@ -1005,7 +1067,7 @@ var PaymentMethod = /*#__PURE__*/function () {
                 }
               });
               return _context4.abrupt("return");
-            case 34:
+            case 37:
               paymentLog.addLog({
                 title: 'Action请求异常，开始轮询',
                 content: {
@@ -1014,11 +1076,11 @@ var PaymentMethod = /*#__PURE__*/function () {
                 }
               });
               this.startQuery(actionType);
-            case 36:
+            case 39:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[12, 26]]);
+        }, _callee4, this, [[12, 29]]);
       }));
       function runAction(_x4) {
         return _runAction.apply(this, arguments);
@@ -1032,10 +1094,11 @@ var PaymentMethod = /*#__PURE__*/function () {
     )
   }, {
     key: "pay",
-    value: function pay(params) {
+    value: function pay(params, config) {
       this.run({
         actionType: ActionType.Pay,
-        params: params
+        params: params,
+        config: config
       });
     }
 
@@ -1045,10 +1108,11 @@ var PaymentMethod = /*#__PURE__*/function () {
      */
   }, {
     key: "payAction",
-    value: function payAction(params) {
+    value: function payAction(params, config) {
       this.runAction({
         actionType: ActionType.PayAction,
-        params: params
+        params: params,
+        config: config
       });
     }
 
@@ -1058,10 +1122,11 @@ var PaymentMethod = /*#__PURE__*/function () {
      */
   }, {
     key: "refund",
-    value: function refund(params) {
+    value: function refund(params, config) {
       this.run({
         actionType: ActionType.Refund,
-        params: params
+        params: params,
+        config: config
       });
     }
 
@@ -1071,10 +1136,11 @@ var PaymentMethod = /*#__PURE__*/function () {
      */
   }, {
     key: "refundAction",
-    value: function refundAction(params) {
+    value: function refundAction(params, config) {
       this.runAction({
         actionType: ActionType.RefundAction,
-        params: params
+        params: params,
+        config: config
       });
     }
 
@@ -1123,14 +1189,11 @@ var PaymentMethod = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       paymentLog.addLog({
-        title: '销毁实例，完成所有流程'
+        title: '支付步骤结束，销毁实例'
       });
 
       // 清理资源并标记为已完成
       this.clean(true);
-
-      // 清理日志（会上传到飞书）
-      paymentLog.clearLogs();
     }
   }]);
   return PaymentMethod;