@pisell/private-materials 6.3.14 → 6.3.15

package/lib/components/pay/toC/index.js

@@ -45,13 +45,14 @@ var import_PaymentMethods = __toESM(require("./PaymentMethods"));
 var import_serve = require("./serve");
 var import_model = require("./model");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
+var import_usePaymentLogger = __toESM(require("../../../hooks/usePaymentLogger"));
 var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
 var import_utils3 = require("./utils");
 var import_index = require("./index.less");
 var ToCPay = (props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const paymentListRef = (0, import_react.useRef)();
   const paymentMethodsRef = (0, import_react.useRef)();
@@ -61,13 +62,17 @@ var ToCPay = (props, ref) => {
   const [renderType, setRenderType] = (0, import_react.useState)("modal");
   const walletPassBlockRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "1"
+  });
   const [showInformation, setShowInformation] = (0, import_react.useState)(false);
   const [showDetectIncognitoConfirm, setShowDetectIncognitoConfirm] = (0, import_react.useState)(false);
   const utils = context.appHelper.utils || {};
-  const dvaStore = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getStore) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.getState();
-  const customer_id = (_i = (_h = (_g = (_f = (_e = (_d = context.appHelper.utils) == null ? void 0 : _d.getStore()) == null ? void 0 : _e.getState) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.global) == null ? void 0 : _h.userInfo) == null ? void 0 : _i.id;
-  const shopName = (_l = (_k = (_j = dvaStore.core) == null ? void 0 : _j.core) == null ? void 0 : _k.shop) == null ? void 0 : _l.name;
-  import_utils.locales.init(import_locales.default, ((_m = dvaStore.core) == null ? void 0 : _m.translateLocale) || "en");
+  const dvaStore = (_d = (_c = (_b = context.appHelper.utils) == null ? void 0 : _b.getStore) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.getState();
+  const customer_id = (_j = (_i = (_h = (_g = (_f = (_e = context.appHelper.utils) == null ? void 0 : _e.getStore()) == null ? void 0 : _f.getState) == null ? void 0 : _g.call(_f)) == null ? void 0 : _h.global) == null ? void 0 : _i.userInfo) == null ? void 0 : _j.id;
+  const shopName = (_m = (_l = (_k = dvaStore.core) == null ? void 0 : _k.core) == null ? void 0 : _l.shop) == null ? void 0 : _m.name;
+  import_utils.locales.init(import_locales.default, ((_n = dvaStore.core) == null ? void 0 : _n.translateLocale) || "en");
   import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
   const _initStore = (initProps) => {
     var _a2;
@@ -112,18 +117,47 @@ var ToCPay = (props, ref) => {
     });
   };
   const init = async (initProps) => {
+    var _a2;
     const { renderType: renderType2 } = initProps;
-    setRenderType(renderType2 ?? "modal");
-    setOpen(true);
-    setSubmitLoading(false);
-    setLoading(true);
-    _initStore(initProps);
-    (0, import_payGroup.removePayGroupFromStorage)(initProps.order.order_id);
-    await _getPaymentsAndWalletPass(initProps.order);
-    await getWalletSetting(initProps);
+    paymentLogger.addLog({
+      key: "初始化开始",
+      value: ``
+    });
+    try {
+      setRenderType(renderType2 ?? "modal");
+      setOpen(true);
+      setSubmitLoading(false);
+      setLoading(true);
+      _initStore(initProps);
+      (0, import_payGroup.removePayGroupFromStorage)(initProps.order.order_id);
+      await _getPaymentsAndWalletPass(initProps.order);
+      await getWalletSetting(initProps);
+      paymentLogger.addLog({
+        key: "初始化成功",
+        value: ``
+      });
+    } catch (error) {
+      paymentLogger.addLog({
+        key: "初始化错误",
+        value: {
+          title: `订单${(_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.order_id} 初始化失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
+          data: {
+            order: initProps == null ? void 0 : initProps.order
+          }
+        }
+      });
+      paymentLogger.sendLogs("支付初始化失败", error);
+      throw error;
+    }
   };
   const _getPaymentsAndWalletPass = async (order) => {
     var _a2, _b2;
+    paymentLogger.addLog({
+      key: "获取支付列表开始",
+      value: {
+        title: `订单${order == null ? void 0 : order.order_id} 开始获取支付列表, 金额: ${order == null ? void 0 : order.amount}`
+      }
+    });
     try {
       const data = await (0, import_serve.getPaymentsAndWalletPass)({
         order_id: order.order_id,
@@ -137,6 +171,10 @@ var ToCPay = (props, ref) => {
         payment_list,
         walletPass
       } = data || {};
+      paymentLogger.addLog({
+        key: "支付数据获取",
+        value: ""
+      });
       dispatch({
         type: "setPayGroup",
         payload: {
@@ -161,8 +199,22 @@ var ToCPay = (props, ref) => {
       setTimeout(() => {
         setLoading(false);
       }, 100);
+      paymentLogger.addLog({
+        key: "获取支付列表成功",
+        value: ""
+      });
     } catch (err) {
       console.log("err", err);
+      paymentLogger.addLog({
+        key: "获取支付列表错误",
+        value: {
+          title: `订单${order == null ? void 0 : order.order_id} 获取失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            order
+          }
+        }
+      });
+      paymentLogger.sendLogs("获取支付列表失败", err);
       payCallback({
         key: "fail",
         data: {
@@ -175,16 +227,47 @@ var ToCPay = (props, ref) => {
   };
   const handlePaymentByType = async (type, payGroup) => {
     var _a2, _b2, _c2;
-    setSubmitLoading(true);
-    await ((_c2 = paymentMethodsRef.current) == null ? void 0 : _c2.onPay({
-      type: type || ((_b2 = (_a2 = state.payGroup) == null ? void 0 : _a2.otherPayment) == null ? void 0 : _b2.service),
-      payGroup: payGroup || state.payGroup
-    }));
-    setSubmitLoading(false);
+    const paymentType = type || ((_b2 = (_a2 = state.payGroup) == null ? void 0 : _a2.otherPayment) == null ? void 0 : _b2.service);
+    const currentPayGroup = payGroup || state.payGroup;
+    paymentLogger.addLog({
+      key: "开始支付处理",
+      value: ""
+    });
+    try {
+      setSubmitLoading(true);
+      await ((_c2 = paymentMethodsRef.current) == null ? void 0 : _c2.onPay({
+        type: paymentType,
+        payGroup: currentPayGroup
+      }));
+      paymentLogger.addLog({
+        key: "支付方法调用成功",
+        value: ""
+      });
+      paymentLogger.sendLogs("支付方法调用成功");
+      setSubmitLoading(false);
+    } catch (error) {
+      paymentLogger.addLog({
+        key: "支付处理错误",
+        value: {
+          title: `订单${currentPayGroup == null ? void 0 : currentPayGroup.order_id} ${paymentType}支付失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
+          data: {
+            type: paymentType,
+            payGroup: currentPayGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("支付处理失败", error);
+      setSubmitLoading(false);
+      throw error;
+    }
   };
   const paymentInit = async (newOrderId) => {
     var _a2, _b2;
     const orderId = newOrderId || ((_a2 = state.payGroup) == null ? void 0 : _a2.order_id);
+    paymentLogger.addLog({
+      key: "开始创建交易组",
+      value: ""
+    });
     setSubmitLoading(true);
     try {
       const data = await (0, import_serve.getPaymentInit)({
@@ -200,6 +283,10 @@ var ToCPay = (props, ref) => {
           payment_priority: data.payment_priority
         }
       });
+      paymentLogger.addLog({
+        key: "创建交易组成功",
+        value: ""
+      });
       return {
         ...state.payGroup,
         order_id: orderId,
@@ -208,14 +295,16 @@ var ToCPay = (props, ref) => {
         payment_priority: data.payment_priority
       };
     } catch (err) {
-      (0, import_utils.sendWarningLog)({
-        title: "创建交易组失败 paymentInit catch",
-        content: [
-          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
-          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
-          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
-        ]
+      paymentLogger.addLog({
+        key: "创建交易组错误",
+        value: {
+          title: `订单${orderId} 创建交易组失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            order: orderId
+          }
+        }
       });
+      paymentLogger.sendLogs("创建交易组失败", err);
       setSubmitLoading(false);
       payCallback({
         key: "fail",
@@ -230,7 +319,7 @@ var ToCPay = (props, ref) => {
   const waitAmount = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = state.payGroup) == null ? void 0 : _a2.wait_amount) || 0;
-  }, [(_n = state.payGroup) == null ? void 0 : _n.wait_amount]);
+  }, [(_o = state.payGroup) == null ? void 0 : _o.wait_amount]);
   const isWalletPassPay = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     const isWalletPass = (_c2 = (_b2 = (_a2 = state.payGroup) == null ? void 0 : _a2.walletPass) == null ? void 0 : _b2.cards) == null ? void 0 : _c2.length;
@@ -250,28 +339,50 @@ var ToCPay = (props, ref) => {
     return ((payGroup == null ? void 0 : payGroup.wait_amount) || 0) > 0 && (0, import_utils3.getIsWalletPassAndTripartitePayment)(payGroup) && isPrivate;
   };
   const onSubmit = async (newOrderId) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    paymentLogger.addLog({
+      key: "开始提交支付",
+      value: `订单${newOrderId || ((_a2 = state.payGroup) == null ? void 0 : _a2.order_id)} 开始提交, 待支付: ${(_b2 = state.payGroup) == null ? void 0 : _b2.wait_amount}, 总金额: ${(_c2 = state.payGroup) == null ? void 0 : _c2.total_amount}`
+    });
+    let newPayGroup = state.payGroup;
     try {
-      let newPayGroup = state.payGroup;
       const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
       if (result) {
+        paymentLogger.addLog({
+          key: "无痕模式检测",
+          value: ""
+        });
         setShowDetectIncognitoConfirm(true);
         return;
       }
-      if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
+      if (!((_d2 = state.payGroup) == null ? void 0 : _d2.payment_group_id)) {
+        paymentLogger.addLog({
+          key: "需要创建交易组",
+          value: ""
+        });
         newPayGroup = await paymentInit(newOrderId);
       }
+      paymentLogger.addLog({
+        key: "调用支付方法",
+        value: `订单${newPayGroup == null ? void 0 : newPayGroup.order_id} 交易组${newPayGroup == null ? void 0 : newPayGroup.payment_group_id} 使用${(_f2 = (_e2 = state.payGroup) == null ? void 0 : _e2.otherPayment) == null ? void 0 : _f2.service}支付`
+      });
       handlePaymentByType(void 0, newPayGroup);
+      paymentLogger.addLog({
+        key: "支付提交调用成功",
+        value: ""
+      });
     } catch (err) {
       console.log("err", err);
-      (0, import_utils.sendWarningLog)({
-        title: "提交支付失败 onSubmit catch",
-        content: [
-          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
-          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
-          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
-        ]
+      paymentLogger.addLog({
+        key: "提交支付错误",
+        value: {
+          title: `订单${newOrderId || ((_g2 = state.payGroup) == null ? void 0 : _g2.order_id)} 提交失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            newPayGroup
+          }
+        }
       });
+      paymentLogger.sendLogs("提交支付失败", err);
     }
   };
   const paymentTypeChange = (payload) => {
@@ -295,21 +406,45 @@ var ToCPay = (props, ref) => {
     }
   }, [state.payGroup]);
   const payCallback = async (res) => {
-    var _a2;
-    if (res.key === "cancel") {
+    var _a2, _b2, _c2, _d2;
+    const orderId = ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.order_id) || ((_b2 = state.payGroup) == null ? void 0 : _b2.order_id);
+    if (res.key === "success") {
+      paymentLogger.addLog({
+        key: "支付最终成功",
+        value: `订单${orderId} 支付成功`
+      });
+      paymentLogger.sendLogs("支付成功");
+    } else if (res.key === "fail") {
+      paymentLogger.addLog({
+        key: "支付最终失败",
+        value: {
+          title: `订单${orderId} 支付失败`,
+          data: res == null ? void 0 : res.data
+        }
+      });
+      paymentLogger.sendLogs("支付失败", (_c2 = res == null ? void 0 : res.data) == null ? void 0 : _c2.err);
+    } else if (res.key === "cancel") {
+      paymentLogger.addLog({
+        key: "支付被取消",
+        value: `订单${orderId} 支付被取消`
+      });
       setOpen(false);
     }
-    (_a2 = props.callback) == null ? void 0 : _a2.call(props, res);
+    (_d2 = props.callback) == null ? void 0 : _d2.call(props, res);
   };
   const onCancel = () => {
-    var _a2, _b2;
-    (0, import_payGroup.removePayGroupFromStorage)((_a2 = state.payGroup) == null ? void 0 : _a2.order_id);
+    var _a2, _b2, _c2;
+    paymentLogger.addLog({
+      key: "用户主动取消支付",
+      value: `订单${(_a2 = state.payGroup) == null ? void 0 : _a2.order_id} 用户取消支付`
+    });
+    (0, import_payGroup.removePayGroupFromStorage)((_b2 = state.payGroup) == null ? void 0 : _b2.order_id);
     setShowInformation(false);
     setOpen(false);
     payCallback({
       key: "cancel",
       data: {
-        order_id: (_b2 = state.payGroup) == null ? void 0 : _b2.order_id
+        order_id: (_c2 = state.payGroup) == null ? void 0 : _c2.order_id
       }
     });
   };
@@ -318,7 +453,7 @@ var ToCPay = (props, ref) => {
     (_b2 = paymentListRef.current) == null ? void 0 : _b2.calculateSurcharge(
       ((_a2 = state.payGroup) == null ? void 0 : _a2.wait_amount) || 0
     );
-  }, [(_o = state.payGroup) == null ? void 0 : _o.wait_amount]);
+  }, [(_p = state.payGroup) == null ? void 0 : _p.wait_amount]);
   (0, import_react.useImperativeHandle)(ref, () => {
     return {
       init,
@@ -432,9 +567,9 @@ var ToCPay = (props, ref) => {
         loading,
         mask: true
       },
-      ((_p = state.order) == null ? void 0 : _p.countdown) && /* @__PURE__ */ import_react.default.createElement(import_PayCountdown.default, { time: (_q = state.order) == null ? void 0 : _q.countdown }),
-      /* @__PURE__ */ import_react.default.createElement(import_PayAmount.default, { amount: ((_r = state.payGroup) == null ? void 0 : _r.total_amount) || 0 }),
-      ((_s = state.payGroup) == null ? void 0 : _s.walletPass) && /* @__PURE__ */ import_react.default.createElement(
+      ((_q = state.order) == null ? void 0 : _q.countdown) && /* @__PURE__ */ import_react.default.createElement(import_PayCountdown.default, { time: (_r = state.order) == null ? void 0 : _r.countdown }),
+      /* @__PURE__ */ import_react.default.createElement(import_PayAmount.default, { amount: ((_s = state.payGroup) == null ? void 0 : _s.total_amount) || 0 }),
+      ((_t = state.payGroup) == null ? void 0 : _t.walletPass) && /* @__PURE__ */ import_react.default.createElement(
         import_WalletPassBlock.default,
         {
           customer_id,
@@ -452,7 +587,7 @@ var ToCPay = (props, ref) => {
             handlePaymentByType(detail == null ? void 0 : detail.service);
           },
           paymentTypeChange,
-          hide: ((_t = state.payGroup) == null ? void 0 : _t.wait_amount) == 0,
+          hide: ((_u = state.payGroup) == null ? void 0 : _u.wait_amount) == 0,
           renderTitle: renderPaymentListTitle
         }
       )

package/lib/components/schedules/utils.d.ts

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
-  request = {};
   constructor() {
+    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/hooks/usePaymentLogger.d.ts

@@ -0,0 +1,22 @@
+interface LogData {
+    key: string;
+    value: any;
+}
+interface UsePaymentLoggerOptions {
+    orderId: string;
+    step?: string;
+}
+/**
+ * @title: 支付日志记录器 Hook
+ * @description: 用于记录支付过程中的关键信息
+ * @param {UsePaymentLoggerOptions} options - 配置选项
+ * @return {object} 返回日志记录相关方法
+ * @Author: AI Assistant
+ */
+declare const usePaymentLogger: (options: UsePaymentLoggerOptions) => {
+    logs: import("react").MutableRefObject<LogData[]>;
+    addLog: (logData: LogData) => void;
+    sendLogs: (title?: string, err?: any) => void;
+};
+export default usePaymentLogger;
+export type { LogData, UsePaymentLoggerOptions };

package/lib/hooks/usePaymentLogger.js

@@ -0,0 +1,69 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/hooks/usePaymentLogger.ts
+var usePaymentLogger_exports = {};
+__export(usePaymentLogger_exports, {
+  default: () => usePaymentLogger_default
+});
+module.exports = __toCommonJS(usePaymentLogger_exports);
+var import_react = require("react");
+var import_utils = require("@pisell/utils");
+var import_ahooks = require("ahooks");
+var usePaymentLogger = (options) => {
+  const { orderId, step = "unknown" } = options;
+  const logs = (0, import_react.useRef)([]);
+  const addLog = (0, import_ahooks.useMemoizedFn)((logData) => {
+    logs.current.push({
+      key: logData.key,
+      value: logData.value
+    });
+  });
+  const sendLogs = (0, import_ahooks.useMemoizedFn)((title = "支付日志", err) => {
+    const content = [
+      {
+        key: "title",
+        value: title
+      },
+      ...logs.current
+    ];
+    if (err) {
+      content.push(
+        ...[
+          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+        ]
+      );
+    }
+    const formatLogs = content.map((item) => ({
+      key: item.key,
+      value: JSON.stringify(item.value)
+    }));
+    (0, import_utils.sendWarningLog)({
+      title: `h5支付step${step}:${orderId}`,
+      content: formatLogs
+    });
+  });
+  return {
+    logs,
+    addLog,
+    sendLogs
+  };
+};
+var usePaymentLogger_default = usePaymentLogger;

package/lib/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.14",
+  "version": "6.3.15",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "3.0.1",
     "@pisell/materials": "6.3.4",
-    "@pisell/date-picker": "3.0.4",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.1",
+    "@pisell/date-picker": "3.0.4"
   },
   "peerDependencies": {
     "react": "^18.0.0",