@pisell/private-materials 6.6.61 → 6.6.63

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

@@ -32,11 +32,30 @@ __export(payment_exports, {
   default: () => payment_default
 });
 module.exports = __toCommonJS(payment_exports);
+var import_utils = require("@pisell/utils");
 var import_const = require("../../const");
-var import_logs = __toESM(require("./logs"));
+var import_payLog = __toESM(require("../../utils/payLog"));
 var import_service = require("../service");
 var import_helper = require("../../helper");
 var import_types = require("../types");
+var sanitizePaymentLogContent = (content) => {
+  var _a, _b;
+  if (!content || typeof content !== "object") {
+    return content;
+  }
+  if (!((_b = (_a = content.params) == null ? void 0 : _a.eftpos) == null ? void 0 : _b.pay_param_base64)) {
+    return content;
+  }
+  const clonedContent = (0, import_helper.cloneDeep)(content);
+  delete clonedContent.params.eftpos.pay_param_base64;
+  return clonedContent;
+};
+var addPaymentLog = ({ title, content }) => {
+  import_payLog.default.log(title, sanitizePaymentLogContent(content));
+};
+var paymentLog = {
+  addLog: addPaymentLog
+};
 var PaymentMethod = class {
   /** 初始化参数 */
   initOptions;
@@ -44,8 +63,6 @@ var PaymentMethod = class {
   paymentNum;
   // 订单ID
   orderId;
-  // 设备ID
-  deviceId;
   // 统一回调函数
   callback;
   // 检查是否应该继续处理结果
@@ -80,14 +97,19 @@ var PaymentMethod = class {
     this.initOptions = options;
     this.paymentNum = options.paymentNum;
     this.orderId = options.orderId;
-    this.deviceId = options.deviceId;
     this.callback = options.callback;
     this.shouldContinue = options.shouldContinue || (() => true);
     this.config = options.config || {};
-    import_logs.default.init(this.paymentNum, {
-      orderId: this.orderId,
-      deviceId: this.deviceId,
-      paymentCode: (options == null ? void 0 : options.paymentCode) || ""
+    import_payLog.default.setContext({
+      transactionNumber: this.paymentNum,
+      extra: { paymentCode: (options == null ? void 0 : options.paymentCode) || "" }
+    });
+    addPaymentLog({
+      title: "聚合支付初始化",
+      content: {
+        paymentNum: this.paymentNum,
+        paymentCode: (options == null ? void 0 : options.paymentCode) || ""
+      }
     });
   }
   /**
@@ -95,8 +117,24 @@ var PaymentMethod = class {
    * 1. 有明确错误code且不是超时和支付超时，则直接失败
    * @param code 错误码
    */
-  isRequestFailed(code) {
-    return code && `${code}` !== import_const.PayStatus.Timeout && `${code}` !== import_const.PayStatus.PayTimeout;
+  isBusinessFailed(res) {
+    var _a;
+    const { external_unified_status, response_code } = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.external_unified_response) || {};
+    return `${res == null ? void 0 : res.code}` === "200" && external_unified_status === import_types.EPaymentStatus.Failed && response_code !== import_const.PayStatus.Timeout && response_code !== import_const.PayStatus.PayTimeout;
+  }
+  /**
+   * 判断业务是否成功
+   */
+  isBusinessSuccess(res) {
+    var _a;
+    const { external_unified_status } = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.external_unified_response) || {};
+    return `${res == null ? void 0 : res.code}` === "200" && external_unified_status === import_types.EPaymentStatus.Success;
+  }
+  /**
+   * 判断最外层code是否是超时错误
+   */
+  isOuterCodeTimeout(code) {
+    return code && (`${code}` === import_const.PayStatus.Timeout || `${code}` === import_const.PayStatus.PayTimeout);
   }
   /**
    * 清理定时器和请求控制器
@@ -147,7 +185,7 @@ var PaymentMethod = class {
   startNewOperation(actionType) {
     const runId = (0, import_helper.getUuid)();
     this.currentRunId = runId;
-    import_logs.default.addLog({
+    paymentLog.addLog({
       title: `触发新的操作：${actionType}`,
       content: { actionType, runId }
     });
@@ -171,7 +209,7 @@ var PaymentMethod = class {
       });
     } catch (error) {
       console.error("⚠️ 回调执行出错:", error);
-      import_logs.default.addLog({ title: "回调执行出错", content: error });
+      paymentLog.addLog({ title: "回调执行出错", content: error });
     }
   }
   /**
@@ -179,14 +217,14 @@ var PaymentMethod = class {
    */
   handleOperationSuccess(res) {
     if (this.isFinished || !this.shouldContinue() || !this.currentActionType) {
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: "操作结果：已完成或不应继续处理，忽略操作成功结果",
         content: { actionType: this.currentActionType, res }
       });
       return;
     }
     const actionType = this.currentActionType;
-    import_logs.default.addLog({
+    paymentLog.addLog({
       title: "操作结果：成功",
       content: { actionType, res }
     });
@@ -199,7 +237,7 @@ var PaymentMethod = class {
       });
     } catch (error) {
       console.error("⚠️ 回调执行出错:", error);
-      import_logs.default.addLog({ title: "回调执行出错", content: error });
+      paymentLog.addLog({ title: "回调执行出错", content: error });
     }
   }
   /**
@@ -212,7 +250,7 @@ var PaymentMethod = class {
       return;
     }
     const actionType = this.currentActionType;
-    import_logs.default.addLog({
+    paymentLog.addLog({
       title: "操作结果：失败",
       content: { actionType, error }
     });
@@ -225,7 +263,7 @@ var PaymentMethod = class {
       });
     } catch (err) {
       console.error("⚠️ 回调执行出错:", err);
-      import_logs.default.addLog({ title: "回调执行出错", content: err });
+      paymentLog.addLog({ title: "回调执行出错", content: err });
     }
   }
   /**
@@ -275,13 +313,13 @@ var PaymentMethod = class {
   async performQuery(actionType) {
     var _a, _b;
     if (this.isFinished || !this.shouldContinue()) {
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: "查询前置校验：已完成或不应继续处理，取消查询"
       });
       return;
     }
     if (!this.currentQueryApi) {
-      import_logs.default.addLog({ title: "查询API未设置，取消查询" });
+      paymentLog.addLog({ title: "查询API未设置，取消查询" });
       return;
     }
     if (this.queryController) {
@@ -296,7 +334,7 @@ var PaymentMethod = class {
     this.currentQueryId = queryId;
     this.queryController = new AbortController();
     const { signal } = this.queryController;
-    import_logs.default.addLog({ title: "查询轮询：开始单次查询" });
+    paymentLog.addLog({ title: "查询轮询：开始单次查询" });
     try {
       const res = await Promise.race([
         this.currentQueryApi(
@@ -305,13 +343,14 @@ var PaymentMethod = class {
             unique_payment_number: this.paymentNum,
             payment_code: (_a = this.initOptions) == null ? void 0 : _a.paymentCode,
             request_version: queryId,
-            is_outer_response_info: 1
+            // TODO: MX51审核需要，后续需要删除
+            is_force_request_api: 1
           },
           { signal }
         ),
         this.createTimeoutPromise(import_types.REQUEST_TIMEOUT)
       ]);
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: "查询轮询：单次查询返回",
         content: { actionType, res }
       });
@@ -320,32 +359,38 @@ var PaymentMethod = class {
         this.requestTimeoutTimer = null;
       }
       if (((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.request_version) !== this.currentQueryId) {
-        import_logs.default.addLog({ title: "查询轮询结果：过期的查询响应，忽略" });
+        paymentLog.addLog({ title: "查询轮询结果：过期的查询响应，忽略" });
         return;
       }
       if (this.isFinished || !this.shouldContinue()) {
-        import_logs.default.addLog({ title: "查询轮询结果：已完成或不应继续处理" });
+        paymentLog.addLog({ title: "查询轮询结果：已完成或不应继续处理" });
         return;
       }
-      if (res && `${res.code}` === "200") {
-        import_logs.default.addLog({ title: "查询轮询结果：查询成功" });
+      if (`${res == null ? void 0 : res.code}` !== "200") {
+        paymentLog.addLog({ title: "查询轮询结果：查询返回失败，code非200" });
+        this.handleOperationError(res);
+        return;
+      }
+      if (this.isBusinessSuccess(res)) {
+        paymentLog.addLog({ title: "查询轮询结果：查询成功" });
         const needContinue = this.handleResponse(res);
         if (needContinue) {
           this.scheduleNextQuery(actionType);
         }
         return;
       }
-      if (this.isRequestFailed(res == null ? void 0 : res.code)) {
-        import_logs.default.addLog({
+      if (this.isBusinessFailed(res)) {
+        paymentLog.addLog({
           title: "查询轮询结果：有明确错误code，停止轮询",
           content: res
         });
         this.handleOperationError(res);
       } else {
-        import_logs.default.addLog({
-          title: "查询轮询结果：查询返回失败但没有明确code或超时code，继续轮询",
+        paymentLog.addLog({
+          title: "查询轮询结果：交易进行中，继续轮询",
           content: res
         });
+        this.handleOperationProcess(res);
         this.scheduleNextQuery(actionType);
       }
     } catch (error) {
@@ -354,7 +399,7 @@ var PaymentMethod = class {
         this.requestTimeoutTimer = null;
       }
       if (queryId !== this.currentQueryId) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "查询轮询结果：error-过期的查询异常，忽略"
         });
         return;
@@ -363,24 +408,25 @@ var PaymentMethod = class {
         return;
       }
       if ((error == null ? void 0 : error.name) === "AbortError" || (error == null ? void 0 : error.message) === "REQUEST_TIMEOUT") {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "查询轮询结果：error-请求被取消或超时，继续轮询"
         });
         this.scheduleNextQuery(actionType);
         return;
       }
-      if (this.isRequestFailed(error == null ? void 0 : error.code)) {
-        import_logs.default.addLog({
-          title: "查询轮询结果：error-有明确错误code，停止轮询",
+      if (this.isOuterCodeTimeout(error == null ? void 0 : error.code)) {
+        paymentLog.addLog({
+          title: "查询轮询结果：error-code是超时错误，继续轮询",
           content: error
         });
-        this.handleOperationError(error);
+        this.scheduleNextQuery(actionType);
+        return;
       } else {
-        import_logs.default.addLog({
-          title: "查询轮询结果：error-无明确code或者code不是超时，继续轮询",
+        paymentLog.addLog({
+          title: "查询轮询结果：error-有明确错误code，停止轮询",
           content: error
         });
-        this.scheduleNextQuery(actionType);
+        this.handleOperationError(error);
       }
     }
   }
@@ -396,14 +442,14 @@ var PaymentMethod = class {
       clearTimeout(this.queryIntervalTimer);
     }
     if (((_a = this.config) == null ? void 0 : _a.hasQueryInterval) === false) {
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: "查询轮询：立即安排下一次查询",
         content: { actionType }
       });
       this.performQuery(actionType);
     } else {
       this.queryIntervalTimer = setTimeout(() => {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "查询轮询：安排下一次查询",
           content: { actionType }
         });
@@ -415,24 +461,33 @@ var PaymentMethod = class {
    * 开始轮询
    */
   startQuery(actionType) {
+    var _a;
     if (this.isFinished || !this.shouldContinue() || this.isQuerying) {
       return;
     }
     this.isQuerying = true;
-    import_logs.default.addLog({ title: "开始轮询", content: { actionType } });
+    paymentLog.addLog({ title: "开始轮询", content: { actionType } });
+    const _globalQueryTimeout = ((_a = this.config) == null ? void 0 : _a.globalQueryTimeout) || import_types.GLOBAL_TIMEOUT;
     this.globalTimeoutTimer = setTimeout(() => {
+      var _a2;
       if (this.isFinished) {
         return;
       }
-      import_logs.default.addLog({
-        title: "轮询全局超时（2分钟），终止所有请求",
+      paymentLog.addLog({
+        title: `轮询全局超时（${_globalQueryTimeout / 1e3}秒），终止所有请求`,
         content: { actionType }
       });
       this.handleOperationError({
-        code: import_const.PayStatus.Timeout,
-        message: "交易超时"
+        code: "200",
+        data: {
+          external_unified_response: {
+            external_unified_status: import_types.EPaymentStatus.Failed,
+            response_code: import_const.PayStatus.Timeout,
+            message: ((_a2 = import_utils.locales) == null ? void 0 : _a2.getText("page.eftpos-pay.text.transaction.fail.timeout")) || "Transaction timeout."
+          }
+        }
       });
-    }, import_types.GLOBAL_TIMEOUT);
+    }, _globalQueryTimeout);
     this.performQuery(actionType);
   }
   /**
@@ -480,7 +535,7 @@ var PaymentMethod = class {
       return;
     }
     this.currentQueryApi = queryApi;
-    import_logs.default.addLog({ title: `开始${actionType}查询轮询` });
+    paymentLog.addLog({ title: `开始${actionType}查询轮询` });
     this.startQuery(actionType);
   }
   /**
@@ -488,15 +543,12 @@ var PaymentMethod = class {
    */
   async run(runOptions) {
     var _a;
-    const { actionType, params } = runOptions;
+    const { actionType, params, config } = runOptions;
     const runId = this.startNewOperation(actionType);
-    const { pay_param_base64, ...otherParams } = params || {};
-    if (Object.keys(otherParams).length > 0) {
-      import_logs.default.addLog({
-        title: "请求参数",
-        content: { params: otherParams }
-      });
-    }
+    paymentLog.addLog({
+      title: "请求参数",
+      content: { params }
+    });
     const { actionApi, queryApi } = this.getActionApi(actionType);
     if (!actionApi) {
       const error = new Error(`${actionType}接口不存在`);
@@ -506,7 +558,7 @@ var PaymentMethod = class {
     this.currentQueryApi = queryApi;
     if (queryApi !== null) {
       this.queryStartTimer = setTimeout(() => {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "操作后10秒开始轮询",
           content: { actionType }
         });
@@ -515,89 +567,83 @@ var PaymentMethod = class {
     }
     this.controller = new AbortController();
     const { signal } = this.controller;
+    const _query = (_status, _title, _content) => {
+      paymentLog.addLog({ title: _title, content: _content });
+      if (this.queryStartTimer) {
+        clearTimeout(this.queryStartTimer);
+        this.queryStartTimer = null;
+      }
+      this.startQuery(actionType);
+    };
     try {
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: `发起${actionType}请求`,
         content: { actionType, params }
       });
       const res = await actionApi(
-        { ...params, request_version: runId, is_outer_response_info: 1 },
+        { ...params, request_version: runId },
         { signal }
       );
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: "请求返回",
         content: { params, actionType, res }
       });
       if (runId != ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.request_version)) {
-        import_logs.default.addLog({ title: "响应过期，忽略", content: { actionType } });
+        paymentLog.addLog({ title: "响应过期，忽略", content: { actionType } });
         return;
       }
       if (this.isFinished || !this.shouldContinue()) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "返回时已完成或不应继续处理",
           content: { actionType }
         });
         return;
       }
-      if (res && `${res.code}` === "200") {
-        import_logs.default.addLog({
+      if (`${res == null ? void 0 : res.code}` !== "200") {
+        paymentLog.addLog({ title: `${actionType}接口返回失败，code非200` });
+        this.handleOperationError(res);
+        return;
+      }
+      if (this.isBusinessSuccess(res)) {
+        paymentLog.addLog({
           title: `${actionType}接口成功`,
           content: { actionType, res }
         });
         const needContinue = this.handleResponse(res);
         if (needContinue) {
-          import_logs.default.addLog({
-            title: `${actionType}接口返回processing，开始轮询`
-          });
-          if (this.queryStartTimer) {
-            clearTimeout(this.queryStartTimer);
-            this.queryStartTimer = null;
-          }
-          this.startQuery(actionType);
+          _query("success", `${actionType}接口返回processing，开始轮询`);
         }
         return;
       }
-      if (this.isRequestFailed(res == null ? void 0 : res.code)) {
-        import_logs.default.addLog({
+      if (this.isBusinessFailed(res)) {
+        paymentLog.addLog({
           title: `${actionType}接口返回失败`,
           content: { actionType, res }
         });
         this.handleOperationError(res);
       } else {
-        import_logs.default.addLog({
-          title: `${actionType}超时或无明确错误，等待轮询结果`,
-          content: { actionType, res }
+        this.handleOperationProcess(res);
+        _query("failed", `${actionType}超时或无明确错误，开始轮询`, {
+          actionType,
+          res
         });
-        if (this.queryStartTimer) {
-          clearTimeout(this.queryStartTimer);
-          this.queryStartTimer = null;
-        }
-        this.startQuery(actionType);
       }
     } catch (error) {
       if (runId !== this.currentRunId) {
-        import_logs.default.addLog({ title: "响应过期，忽略", content: { actionType } });
+        paymentLog.addLog({ title: "响应过期，忽略", content: { actionType } });
         return;
       }
       if (this.isFinished || !this.shouldContinue()) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "异常时已完成或不应继续处理",
           content: { actionType }
         });
         return;
       }
-      if (this.isRequestFailed(error == null ? void 0 : error.code)) {
-        import_logs.default.addLog({
-          title: `${actionType}接口异常`,
-          content: { actionType, error }
-        });
-        this.handleOperationError(error);
-      } else {
-        import_logs.default.addLog({
-          title: `${actionType}超时或无明确错误，等待轮询结果`,
-          content: { actionType, error }
-        });
-      }
+      _query("failed", `${actionType}接口异常，开始轮询`, {
+        actionType,
+        error
+      });
     }
   }
   /**
@@ -605,15 +651,13 @@ var PaymentMethod = class {
    */
   async runAction(actionOptions) {
     var _a;
-    const { actionType, params } = actionOptions;
+    const { actionType, params, config } = actionOptions;
+    console.log("runAction_actionOptions", actionOptions);
     const runActionId = this.startNewOperation(actionType);
-    const { pay_param_base64, ...otherParams } = params || {};
-    if (Object.keys(otherParams).length > 0) {
-      import_logs.default.addLog({
-        title: "请求参数",
-        content: { params: otherParams }
-      });
-    }
+    paymentLog.addLog({
+      title: `${actionType}操作请求参数`,
+      content: { actionType, params }
+    });
     const { actionApi, queryApi } = this.getActionApi(actionType);
     if (!actionApi) {
       const error = new Error(`${actionType}操作接口不存在`);
@@ -627,46 +671,49 @@ var PaymentMethod = class {
       const res = await actionApi(
         {
           ...params || {},
-          request_version: runActionId,
-          is_outer_response_info: 1
+          request_version: runActionId
         },
         { signal }
       );
       if (this.isFinished || !this.shouldContinue()) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "Action返回时已完成或不应继续处理，忽略",
           content: { actionType }
         });
         return;
       }
       if (runActionId !== ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.request_version)) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "Action响应过期，忽略",
           content: { actionType }
         });
         return;
       }
-      import_logs.default.addLog({
+      if (config == null ? void 0 : config.needResponse) {
+        this.handleResponse(res);
+        return;
+      }
+      paymentLog.addLog({
         title: "Action请求返回，开始轮询",
         content: { actionType }
       });
       this.startQuery(actionType);
     } catch (error) {
       if (this.isFinished || !this.shouldContinue()) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "Action异常时已完成或不应继续处理，忽略",
           content: { actionType }
         });
         return;
       }
       if (runActionId !== this.currentRunId) {
-        import_logs.default.addLog({
+        paymentLog.addLog({
           title: "Action响应过期，忽略",
           content: { actionType }
         });
         return;
       }
-      import_logs.default.addLog({
+      paymentLog.addLog({
         title: "Action请求异常，开始轮询",
         content: { actionType, error }
       });
@@ -677,40 +724,44 @@ var PaymentMethod = class {
    * 支付
    * @param params 支付参数
    */
-  pay(params) {
+  pay(params, config) {
     this.run({
       actionType: import_types.ActionType.Pay,
-      params
+      params,
+      config
     });
   }
   /**
    * 支付取消
    * @param params 取消参数
    */
-  payAction(params) {
+  payAction(params, config) {
     this.runAction({
       actionType: import_types.ActionType.PayAction,
-      params
+      params,
+      config
     });
   }
   /**
    * 退款
    * @param params 退款参数
    */
-  refund(params) {
+  refund(params, config) {
     this.run({
       actionType: import_types.ActionType.Refund,
-      params
+      params,
+      config
     });
   }
   /**
    * 退款取消
    * @param params 取消参数
    */
-  refundAction(params) {
+  refundAction(params, config) {
     this.runAction({
       actionType: import_types.ActionType.RefundAction,
-      params
+      params,
+      config
     });
   }
   /**
@@ -733,7 +784,7 @@ var PaymentMethod = class {
    * 停止操作，后续依然可以重新发起操作
    */
   stop() {
-    import_logs.default.addLog({
+    paymentLog.addLog({
       title: "停止操作",
       content: { actionType: this.currentActionType }
     });
@@ -744,9 +795,8 @@ var PaymentMethod = class {
    * 注意：销毁后实例不可再使用
    */
   destroy() {
-    import_logs.default.addLog({ title: "销毁实例，完成所有流程" });
+    paymentLog.addLog({ title: "支付步骤结束，销毁实例" });
     this.clean(true);
-    import_logs.default.clearLogs();
   }
 };
 var payment_default = PaymentMethod;