@pisell/private-materials 6.3.14 → 6.3.16

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

@@ -17,7 +17,7 @@ import React, { useState, useMemo, useContext, useRef, useImperativeHandle, forw
 import { Decimal } from 'decimal.js';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { PisellModal, PisellText, PisellContainer, PisellLoading, PisellToast } from '@pisell/materials';
-import { detectIncognito, locales, copyToClipboard, sendWarningLog } from '@pisell/utils';
+import { detectIncognito, locales, copyToClipboard } from '@pisell/utils';
 import PayCountdown from "./PayCountdown";
 import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
@@ -26,6 +26,7 @@ import PaymentMethods from "./PaymentMethods";
 import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
+import usePaymentLogger from "../../../hooks/usePaymentLogger";
 import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
@@ -41,7 +42,7 @@ import "./index.less";
  * @Date: 2024-08-16 10:43
  */
 var ToCPay = function ToCPay(props, ref) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dvaStore$core, _dvaStore$core2, _state$payGroup6, _state$payGroup17, _state$order, _state$order2, _state$payGroup22, _state$payGroup23, _state$payGroup24;
+  var _state$payGroup, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dvaStore$core, _dvaStore$core2, _state$payGroup7, _state$payGroup25, _state$order, _state$order2, _state$payGroup30, _state$payGroup31, _state$payGroup32;
   //@ts-ignore
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -73,6 +74,12 @@ var ToCPay = function ToCPay(props, ref) {
   var walletPassBlockRef = useRef(null);
   var context = useEngineContext();
 
+  // 支付日志记录器
+  var paymentLogger = usePaymentLogger({
+    orderId: ((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id) || 'unknown',
+    step: '1'
+  });
+
   // 退出提醒
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -177,11 +184,16 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(initProps) {
-      var renderType;
+      var renderType, _initProps$order2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            renderType = initProps.renderType;
+            renderType = initProps.renderType; // 记录初始化开始
+            paymentLogger.addLog({
+              key: '初始化开始',
+              value: ""
+            });
+            _context2.prev = 2;
             setRenderType(renderType !== null && renderType !== void 0 ? renderType : 'modal');
             // 打开弹窗
             setOpen(true);
@@ -199,16 +211,39 @@ var ToCPay = function ToCPay(props, ref) {
             removePayGroupFromStorage(initProps.order.order_id);
 
             // 获取支付列表和钱包
-            _context2.next = 9;
-            return _getPaymentsAndWalletPass(initProps.order);
-          case 9:
             _context2.next = 11;
-            return getWalletSetting(initProps);
+            return _getPaymentsAndWalletPass(initProps.order);
           case 11:
+            _context2.next = 13;
+            return getWalletSetting(initProps);
+          case 13:
+            // 记录初始化成功
+            paymentLogger.addLog({
+              key: '初始化成功',
+              value: ""
+            });
+            _context2.next = 21;
+            break;
+          case 16:
+            _context2.prev = 16;
+            _context2.t0 = _context2["catch"](2);
+            // 记录初始化错误并发送日志
+            paymentLogger.addLog({
+              key: '初始化错误',
+              value: {
+                title: "\u8BA2\u5355".concat(initProps === null || initProps === void 0 || (_initProps$order2 = initProps.order) === null || _initProps$order2 === void 0 ? void 0 : _initProps$order2.order_id, " \u521D\u59CB\u5316\u5931\u8D25: ").concat((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || '未知错误'),
+                data: {
+                  order: initProps === null || initProps === void 0 ? void 0 : initProps.order
+                }
+              }
+            });
+            paymentLogger.sendLogs('支付初始化失败', _context2.t0);
+            throw _context2.t0;
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[2, 16]]);
     }));
     return function init(_x2) {
       return _ref2.apply(this, arguments);
@@ -225,20 +260,33 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass;
+      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
+            // 记录获取支付列表开始
+            paymentLogger.addLog({
+              key: '获取支付列表开始',
+              value: {
+                title: "\u8BA2\u5355".concat(order === null || order === void 0 ? void 0 : order.order_id, " \u5F00\u59CB\u83B7\u53D6\u652F\u4ED8\u5217\u8868, \u91D1\u989D: ").concat(order === null || order === void 0 ? void 0 : order.amount)
+              }
+            });
+            _context3.prev = 1;
+            _context3.next = 4;
             return getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
             });
-          case 3:
+          case 4:
             data = _context3.sent;
-            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 设置交易组
+            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 记录获取到的数据
+            paymentLogger.addLog({
+              key: '支付数据获取',
+              value: ""
+            });
+
+            // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
@@ -249,7 +297,7 @@ var ToCPay = function ToCPay(props, ref) {
                 _order: order,
                 payment_group_id: order === null || order === void 0 ? void 0 : order.payment_group_id,
                 // 支付方式没有walletPass时walletPass设置null
-                walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.walletPass), walletPass), {}, {
+                walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
                   amount: wallet_pass_amount,
                   cards: wallet_pass_recommend_list
                 }) : null,
@@ -259,19 +307,37 @@ var ToCPay = function ToCPay(props, ref) {
             });
 
             // 初始化支付列表
-            _context3.next = 8;
+            _context3.next = 10;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
-          case 8:
+          case 10:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
             }, 100);
-            _context3.next = 15;
+
+            // 记录获取支付列表成功
+            paymentLogger.addLog({
+              key: '获取支付列表成功',
+              value: ""
+            });
+            _context3.next = 20;
             break;
-          case 11:
-            _context3.prev = 11;
-            _context3.t0 = _context3["catch"](0);
+          case 14:
+            _context3.prev = 14;
+            _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
+
+            // 记录获取支付列表错误并发送日志
+            paymentLogger.addLog({
+              key: '获取支付列表错误',
+              value: {
+                title: "\u8BA2\u5355".concat(order === null || order === void 0 ? void 0 : order.order_id, " \u83B7\u53D6\u5931\u8D25: ").concat((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || '未知错误'),
+                data: {
+                  order: order
+                }
+              }
+            });
+            paymentLogger.sendLogs('获取支付列表失败', _context3.t0);
             payCallback({
               key: 'fail',
               data: {
@@ -280,11 +346,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 15:
+          case 20:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 11]]);
+      }, _callee3, null, [[1, 14]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -302,27 +368,63 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var handlePaymentByType = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
-      var _paymentMethodsRef$cu, _state$payGroup2;
+      var _state$payGroup3;
+      var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
+            paymentType = type || ((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 || (_state$payGroup3 = _state$payGroup3.otherPayment) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.service);
+            currentPayGroup = payGroup || state.payGroup; // 记录开始处理支付
+            paymentLogger.addLog({
+              key: '开始支付处理',
+              value: ""
+            });
+            _context4.prev = 3;
             // 打开loading
             setSubmitLoading(true);
 
             // 根据不同的支付方式, 调用不同的支付方法
-            _context4.next = 3;
+            _context4.next = 7;
             return (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 ? void 0 : _paymentMethodsRef$cu.onPay({
-              type: type || ((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 || (_state$payGroup2 = _state$payGroup2.otherPayment) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.service),
-              payGroup: payGroup || state.payGroup
+              type: paymentType,
+              payGroup: currentPayGroup
             });
-          case 3:
+          case 7:
+            // 记录支付方法调用成功
+            paymentLogger.addLog({
+              key: '支付方法调用成功',
+              value: ""
+            });
+            paymentLogger.sendLogs('支付方法调用成功');
+
             // 关闭loading
             setSubmitLoading(false);
-          case 4:
+            _context4.next = 18;
+            break;
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4["catch"](3);
+            // 记录支付处理错误并发送日志
+            paymentLogger.addLog({
+              key: '支付处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(currentPayGroup === null || currentPayGroup === void 0 ? void 0 : currentPayGroup.order_id, " ").concat(paymentType, "\u652F\u4ED8\u5931\u8D25: ").concat((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || '未知错误'),
+                data: {
+                  type: paymentType,
+                  payGroup: currentPayGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('支付处理失败', _context4.t0);
+
+            // 关闭loading
+            setSubmitLoading(false);
+            throw _context4.t0;
+          case 18:
           case "end":
             return _context4.stop();
         }
-      }, _callee4);
+      }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
       return _ref5.apply(this, arguments);
@@ -338,21 +440,25 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var paymentInit = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
-      var _state$payGroup3;
-      var orderId, _state$payGroup4, data;
+      var _state$payGroup4;
+      var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             // 默认使用store内的order_id, 如果传入了新的order_id, 则使用新的order_id
-            orderId = newOrderId || ((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id);
+            orderId = newOrderId || ((_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.order_id); // 记录开始创建交易组
+            paymentLogger.addLog({
+              key: '开始创建交易组',
+              value: ""
+            });
             setSubmitLoading(true);
-            _context5.prev = 2;
-            _context5.next = 5;
+            _context5.prev = 3;
+            _context5.next = 6;
             return getPaymentInit({
               order_id: orderId,
-              amount: (_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.total_amount
+              amount: (_state$payGroup5 = state.payGroup) === null || _state$payGroup5 === void 0 ? void 0 : _state$payGroup5.total_amount
             });
-          case 5:
+          case 6:
             data = _context5.sent;
             // 设置交易组
             dispatch({
@@ -364,28 +470,32 @@ var ToCPay = function ToCPay(props, ref) {
                 payment_priority: data.payment_priority
               }
             });
+
+            // 记录创建交易组成功
+            paymentLogger.addLog({
+              key: '创建交易组成功',
+              value: ""
+            });
             return _context5.abrupt("return", _objectSpread(_objectSpread({}, state.payGroup), {}, {
               order_id: orderId,
               total_amount: data.amount,
               payment_group_id: data.payment_group_id,
               payment_priority: data.payment_priority
             }));
-          case 10:
-            _context5.prev = 10;
-            _context5.t0 = _context5["catch"](2);
-            sendWarningLog({
-              title: '创建交易组失败 paymentInit catch',
-              content: [{
-                key: '错误信息',
-                value: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message) || '未知错误'
-              }, {
-                key: '错误堆栈',
-                value: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.stack) || '无堆栈信息'
-              }, {
-                key: '错误类型',
-                value: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.name) || '未知错误类型'
-              }]
+          case 12:
+            _context5.prev = 12;
+            _context5.t0 = _context5["catch"](3);
+            // 记录创建交易组错误并发送日志
+            paymentLogger.addLog({
+              key: '创建交易组错误',
+              value: {
+                title: "\u8BA2\u5355".concat(orderId, " \u521B\u5EFA\u4EA4\u6613\u7EC4\u5931\u8D25: ").concat((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message) || '未知错误'),
+                data: {
+                  order: orderId
+                }
+              }
             });
+            paymentLogger.sendLogs('创建交易组失败', _context5.t0);
             setSubmitLoading(false);
             payCallback({
               key: 'fail',
@@ -395,11 +505,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: 'paymentInit'
               }
             });
-          case 15:
+          case 18:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, null, [[2, 10]]);
+      }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
       return _ref6.apply(this, arguments);
@@ -415,9 +525,9 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:47
    */
   var waitAmount = useMemo(function () {
-    var _state$payGroup5;
-    return ((_state$payGroup5 = state.payGroup) === null || _state$payGroup5 === void 0 ? void 0 : _state$payGroup5.wait_amount) || 0;
-  }, [(_state$payGroup6 = state.payGroup) === null || _state$payGroup6 === void 0 ? void 0 : _state$payGroup6.wait_amount]);
+    var _state$payGroup6;
+    return ((_state$payGroup6 = state.payGroup) === null || _state$payGroup6 === void 0 ? void 0 : _state$payGroup6.wait_amount) || 0;
+  }, [(_state$payGroup7 = state.payGroup) === null || _state$payGroup7 === void 0 ? void 0 : _state$payGroup7.wait_amount]);
 
   /**
    * @title: 是否仅钱包支付
@@ -428,8 +538,8 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:46
    */
   var isWalletPassPay = useMemo(function () {
-    var _state$payGroup7;
-    var isWalletPass = (_state$payGroup7 = state.payGroup) === null || _state$payGroup7 === void 0 || (_state$payGroup7 = _state$payGroup7.walletPass) === null || _state$payGroup7 === void 0 || (_state$payGroup7 = _state$payGroup7.cards) === null || _state$payGroup7 === void 0 ? void 0 : _state$payGroup7.length;
+    var _state$payGroup8;
+    var isWalletPass = (_state$payGroup8 = state.payGroup) === null || _state$payGroup8 === void 0 || (_state$payGroup8 = _state$payGroup8.walletPass) === null || _state$payGroup8 === void 0 || (_state$payGroup8 = _state$payGroup8.cards) === null || _state$payGroup8 === void 0 ? void 0 : _state$payGroup8.length;
     // 待支付金额小于0 并且已经选择了卡
     return waitAmount <= 0 && isWalletPass;
   }, [state.payGroup, waitAmount]);
@@ -445,8 +555,8 @@ var ToCPay = function ToCPay(props, ref) {
   var isDisabled = useMemo(function () {
     // 当待支付金额 大于 0  则必须选择其他支付方式, 否则禁止
     if (waitAmount > 0) {
-      var _state$payGroup8;
-      var isOtherPayment = (_state$payGroup8 = state.payGroup) === null || _state$payGroup8 === void 0 || (_state$payGroup8 = _state$payGroup8.otherPayment) === null || _state$payGroup8 === void 0 ? void 0 : _state$payGroup8.service;
+      var _state$payGroup9;
+      var isOtherPayment = (_state$payGroup9 = state.payGroup) === null || _state$payGroup9 === void 0 || (_state$payGroup9 = _state$payGroup9.otherPayment) === null || _state$payGroup9 === void 0 ? void 0 : _state$payGroup9.service;
       return !isOtherPayment;
     } else {
       return !isWalletPassPay;
@@ -492,58 +602,81 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var onSubmit = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
-      var _state$payGroup9, newPayGroup, result;
+      var _state$payGroup10, _state$payGroup11, _state$payGroup12;
+      var newPayGroup, _state$payGroup13, _newPayGroup, _newPayGroup2, _state$payGroup14, result, _state$payGroup15;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context7.prev = 0;
-            newPayGroup = state.payGroup; // 是否要展示无痕模式提示
-            _context7.next = 4;
+            // 记录开始提交支付
+            paymentLogger.addLog({
+              key: '开始提交支付',
+              value: "\u8BA2\u5355".concat(newOrderId || ((_state$payGroup10 = state.payGroup) === null || _state$payGroup10 === void 0 ? void 0 : _state$payGroup10.order_id), " \u5F00\u59CB\u63D0\u4EA4, \u5F85\u652F\u4ED8: ").concat((_state$payGroup11 = state.payGroup) === null || _state$payGroup11 === void 0 ? void 0 : _state$payGroup11.wait_amount, ", \u603B\u91D1\u989D: ").concat((_state$payGroup12 = state.payGroup) === null || _state$payGroup12 === void 0 ? void 0 : _state$payGroup12.total_amount)
+            });
+            newPayGroup = state.payGroup;
+            _context7.prev = 2;
+            _context7.next = 5;
             return getIsShowDetectIncognitoConfirm(newPayGroup);
-          case 4:
+          case 5:
             result = _context7.sent;
             if (!result) {
-              _context7.next = 8;
+              _context7.next = 10;
               break;
             }
+            paymentLogger.addLog({
+              key: '无痕模式检测',
+              value: ""
+            });
             setShowDetectIncognitoConfirm(true);
             return _context7.abrupt("return");
-          case 8:
-            if ((_state$payGroup9 = state.payGroup) !== null && _state$payGroup9 !== void 0 && _state$payGroup9.payment_group_id) {
-              _context7.next = 12;
+          case 10:
+            if ((_state$payGroup13 = state.payGroup) !== null && _state$payGroup13 !== void 0 && _state$payGroup13.payment_group_id) {
+              _context7.next = 15;
               break;
             }
-            _context7.next = 11;
+            paymentLogger.addLog({
+              key: '需要创建交易组',
+              value: ""
+            });
+            _context7.next = 14;
             return paymentInit(newOrderId);
-          case 11:
+          case 14:
             newPayGroup = _context7.sent;
-          case 12:
+          case 15:
             // 调用支付
+            paymentLogger.addLog({
+              key: '调用支付方法',
+              value: "\u8BA2\u5355".concat((_newPayGroup = newPayGroup) === null || _newPayGroup === void 0 ? void 0 : _newPayGroup.order_id, " \u4EA4\u6613\u7EC4").concat((_newPayGroup2 = newPayGroup) === null || _newPayGroup2 === void 0 ? void 0 : _newPayGroup2.payment_group_id, " \u4F7F\u7528").concat((_state$payGroup14 = state.payGroup) === null || _state$payGroup14 === void 0 || (_state$payGroup14 = _state$payGroup14.otherPayment) === null || _state$payGroup14 === void 0 ? void 0 : _state$payGroup14.service, "\u652F\u4ED8")
+            });
             handlePaymentByType(undefined, newPayGroup);
-            _context7.next = 19;
+
+            // 记录提交成功（这里是调用成功，实际支付结果在payCallback中处理）
+            paymentLogger.addLog({
+              key: '支付提交调用成功',
+              value: ""
+            });
+            _context7.next = 25;
             break;
-          case 15:
-            _context7.prev = 15;
-            _context7.t0 = _context7["catch"](0);
+          case 20:
+            _context7.prev = 20;
+            _context7.t0 = _context7["catch"](2);
             console.log('err', _context7.t0);
-            sendWarningLog({
-              title: '提交支付失败 onSubmit catch',
-              content: [{
-                key: '错误信息',
-                value: (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.message) || '未知错误'
-              }, {
-                key: '错误堆栈',
-                value: (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.stack) || '无堆栈信息'
-              }, {
-                key: '错误类型',
-                value: (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.name) || '未知错误类型'
-              }]
+
+            // 记录提交支付错误并发送日志
+            paymentLogger.addLog({
+              key: '提交支付错误',
+              value: {
+                title: "\u8BA2\u5355".concat(newOrderId || ((_state$payGroup15 = state.payGroup) === null || _state$payGroup15 === void 0 ? void 0 : _state$payGroup15.order_id), " \u63D0\u4EA4\u5931\u8D25: ").concat((_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.message) || '未知错误'),
+                data: {
+                  newPayGroup: newPayGroup
+                }
+              }
             });
-          case 19:
+            paymentLogger.sendLogs('提交支付失败', _context7.t0);
+          case 25:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[0, 15]]);
+      }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
       return _ref8.apply(this, arguments);
@@ -569,28 +702,28 @@ var ToCPay = function ToCPay(props, ref) {
 
   // 确认按钮
   var okText = useMemo(function () {
-    var _state$payGroup10, _state$payGroup11;
-    var current = (_state$payGroup10 = state.payGroup) === null || _state$payGroup10 === void 0 ? void 0 : _state$payGroup10.otherPayment;
+    var _state$payGroup16, _state$payGroup17;
+    var current = (_state$payGroup16 = state.payGroup) === null || _state$payGroup16 === void 0 ? void 0 : _state$payGroup16.otherPayment;
 
     // 没有其他支付金额, 则直接使用钱包支付  展示submit
-    if (((_state$payGroup11 = state.payGroup) === null || _state$payGroup11 === void 0 ? void 0 : _state$payGroup11.wait_amount) == 0) {
+    if (((_state$payGroup17 = state.payGroup) === null || _state$payGroup17 === void 0 ? void 0 : _state$payGroup17.wait_amount) == 0) {
       return locales.getText('tocPay.text.submit');
     }
 
     // 有手续费的话展示手续费
     if (current !== null && current !== void 0 && current.surcharge) {
-      var _state$payGroup12;
+      var _state$payGroup18;
       return /*#__PURE__*/React.createElement("span", {
         className: ""
       }, locales.getText('tocPay.text.pay'), ' ', /*#__PURE__*/React.createElement(PisellText.Amount, {
-        value: ((_state$payGroup12 = state.payGroup) === null || _state$payGroup12 === void 0 ? void 0 : _state$payGroup12.wait_amount) || 0.0
+        value: ((_state$payGroup18 = state.payGroup) === null || _state$payGroup18 === void 0 ? void 0 : _state$payGroup18.wait_amount) || 0.0
       }), " +", locales.getText('tocPay.text.surcharge'));
     } else {
-      var _state$payGroup13;
+      var _state$payGroup19;
       return /*#__PURE__*/React.createElement("span", {
         className: ""
       }, locales.getText('tocPay.text.pay'), ' ', /*#__PURE__*/React.createElement(PisellText.Amount, {
-        value: ((_state$payGroup13 = state.payGroup) === null || _state$payGroup13 === void 0 ? void 0 : _state$payGroup13.wait_amount) || 0.0
+        value: ((_state$payGroup19 = state.payGroup) === null || _state$payGroup19 === void 0 ? void 0 : _state$payGroup19.wait_amount) || 0.0
       }));
     }
   }, [state.payGroup]);
@@ -604,18 +737,39 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var payCallback = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
-      var _props$callback;
+      var _res$data, _state$payGroup20, _props$callback;
+      var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            // 取消支付,关闭弹窗
-            if (res.key === 'cancel') {
+            // 记录支付回调结果
+            orderId = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.order_id) || ((_state$payGroup20 = state.payGroup) === null || _state$payGroup20 === void 0 ? void 0 : _state$payGroup20.order_id);
+            if (res.key === 'success') {
+              paymentLogger.addLog({
+                key: '支付最终成功',
+                value: "\u8BA2\u5355".concat(orderId, " \u652F\u4ED8\u6210\u529F")
+              });
+              paymentLogger.sendLogs('支付成功');
+            } else if (res.key === 'fail') {
+              paymentLogger.addLog({
+                key: '支付最终失败',
+                value: {
+                  title: "\u8BA2\u5355".concat(orderId, " \u652F\u4ED8\u5931\u8D25"),
+                  data: res === null || res === void 0 ? void 0 : res.data
+                }
+              });
+              paymentLogger.sendLogs('支付失败', res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.err);
+            } else if (res.key === 'cancel') {
+              paymentLogger.addLog({
+                key: '支付被取消',
+                value: "\u8BA2\u5355".concat(orderId, " \u652F\u4ED8\u88AB\u53D6\u6D88")
+              });
               setOpen(false);
             }
 
             // 回调外部
             (_props$callback = props.callback) === null || _props$callback === void 0 || _props$callback.call(props, res);
-          case 2:
+          case 3:
           case "end":
             return _context8.stop();
         }
@@ -634,9 +788,15 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-08 16:34
    */
   var onCancel = function onCancel() {
-    var _state$payGroup14, _state$payGroup15;
+    var _state$payGroup21, _state$payGroup22, _state$payGroup23;
+    // 记录取消支付操作
+    paymentLogger.addLog({
+      key: '用户主动取消支付',
+      value: "\u8BA2\u5355".concat((_state$payGroup21 = state.payGroup) === null || _state$payGroup21 === void 0 ? void 0 : _state$payGroup21.order_id, " \u7528\u6237\u53D6\u6D88\u652F\u4ED8")
+    });
+
     // 删除交易组
-    removePayGroupFromStorage((_state$payGroup14 = state.payGroup) === null || _state$payGroup14 === void 0 ? void 0 : _state$payGroup14.order_id);
+    removePayGroupFromStorage((_state$payGroup22 = state.payGroup) === null || _state$payGroup22 === void 0 ? void 0 : _state$payGroup22.order_id);
 
     // 关闭二次提示弹窗
     setShowInformation(false);
@@ -648,16 +808,16 @@ var ToCPay = function ToCPay(props, ref) {
     payCallback({
       key: 'cancel',
       data: {
-        order_id: (_state$payGroup15 = state.payGroup) === null || _state$payGroup15 === void 0 ? void 0 : _state$payGroup15.order_id
+        order_id: (_state$payGroup23 = state.payGroup) === null || _state$payGroup23 === void 0 ? void 0 : _state$payGroup23.order_id
       }
     });
   };
 
   // 待支付金额变化时, 重新计算附加费
   useUpdateEffect(function () {
-    var _paymentListRef$curre2, _state$payGroup16;
-    (_paymentListRef$curre2 = paymentListRef.current) === null || _paymentListRef$curre2 === void 0 || _paymentListRef$curre2.calculateSurcharge(((_state$payGroup16 = state.payGroup) === null || _state$payGroup16 === void 0 ? void 0 : _state$payGroup16.wait_amount) || 0);
-  }, [(_state$payGroup17 = state.payGroup) === null || _state$payGroup17 === void 0 ? void 0 : _state$payGroup17.wait_amount]);
+    var _paymentListRef$curre2, _state$payGroup24;
+    (_paymentListRef$curre2 = paymentListRef.current) === null || _paymentListRef$curre2 === void 0 || _paymentListRef$curre2.calculateSurcharge(((_state$payGroup24 = state.payGroup) === null || _state$payGroup24 === void 0 ? void 0 : _state$payGroup24.wait_amount) || 0);
+  }, [(_state$payGroup25 = state.payGroup) === null || _state$payGroup25 === void 0 ? void 0 : _state$payGroup25.wait_amount]);
   useImperativeHandle(ref, function () {
     return {
       init: init,
@@ -674,7 +834,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:49
    */
   var renderPaymentListTitle = function renderPaymentListTitle() {
-    var _state$payGroup18;
+    var _state$payGroup26;
     // 待支付金额为0 展示无需选择支付方式
     if (waitAmount == 0) {
       return /*#__PURE__*/React.createElement("div", {
@@ -687,13 +847,13 @@ var ToCPay = function ToCPay(props, ref) {
     }
 
     // 有剩余金额, 展示继续支付
-    if (((_state$payGroup18 = state.payGroup) === null || _state$payGroup18 === void 0 ? void 0 : _state$payGroup18.total_amount) !== waitAmount) {
-      var _state$payGroup19;
+    if (((_state$payGroup26 = state.payGroup) === null || _state$payGroup26 === void 0 ? void 0 : _state$payGroup26.total_amount) !== waitAmount) {
+      var _state$payGroup27;
       return /*#__PURE__*/React.createElement("div", {
         className: "custom-payment-list-title"
       }, locales.getText('tocPay.text.continuePayment'), ' ', /*#__PURE__*/React.createElement(PisellText.Amount, {
         className: "custom-payment-list-title-price",
-        value: ((_state$payGroup19 = state.payGroup) === null || _state$payGroup19 === void 0 ? void 0 : _state$payGroup19.wait_amount) || 0.0
+        value: ((_state$payGroup27 = state.payGroup) === null || _state$payGroup27 === void 0 ? void 0 : _state$payGroup27.wait_amount) || 0.0
       }));
     }
 
@@ -709,12 +869,12 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:50
    */
   var onWalletPassChange = useMemoizedFn(function (walletPass) {
-    var _state$payGroup20, _state$payGroup21;
-    var _waitAmount = new Decimal(String(((_state$payGroup20 = state.payGroup) === null || _state$payGroup20 === void 0 ? void 0 : _state$payGroup20.total_amount) || 0)).minus(new Decimal(String(walletPass.amount || 0))).toNumber();
+    var _state$payGroup28, _state$payGroup29;
+    var _waitAmount = new Decimal(String(((_state$payGroup28 = state.payGroup) === null || _state$payGroup28 === void 0 ? void 0 : _state$payGroup28.total_amount) || 0)).minus(new Decimal(String(walletPass.amount || 0))).toNumber();
     dispatch({
       type: 'setPayGroup',
       payload: {
-        walletPass: _objectSpread(_objectSpread({}, (_state$payGroup21 = state.payGroup) === null || _state$payGroup21 === void 0 ? void 0 : _state$payGroup21.walletPass), walletPass),
+        walletPass: _objectSpread(_objectSpread({}, (_state$payGroup29 = state.payGroup) === null || _state$payGroup29 === void 0 ? void 0 : _state$payGroup29.walletPass), walletPass),
         wait_amount: _waitAmount
       }
     });
@@ -793,8 +953,8 @@ var ToCPay = function ToCPay(props, ref) {
   }, ((_state$order = state.order) === null || _state$order === void 0 ? void 0 : _state$order.countdown) && /*#__PURE__*/React.createElement(PayCountdown, {
     time: (_state$order2 = state.order) === null || _state$order2 === void 0 ? void 0 : _state$order2.countdown
   }), /*#__PURE__*/React.createElement(PayAmount, {
-    amount: ((_state$payGroup22 = state.payGroup) === null || _state$payGroup22 === void 0 ? void 0 : _state$payGroup22.total_amount) || 0
-  }), ((_state$payGroup23 = state.payGroup) === null || _state$payGroup23 === void 0 ? void 0 : _state$payGroup23.walletPass) && /*#__PURE__*/React.createElement(WalletPassBlock, {
+    amount: ((_state$payGroup30 = state.payGroup) === null || _state$payGroup30 === void 0 ? void 0 : _state$payGroup30.total_amount) || 0
+  }), ((_state$payGroup31 = state.payGroup) === null || _state$payGroup31 === void 0 ? void 0 : _state$payGroup31.walletPass) && /*#__PURE__*/React.createElement(WalletPassBlock, {
     customer_id: customer_id,
     payGroup: state.payGroup,
     onWalletPassChange: onWalletPassChange,
@@ -806,7 +966,7 @@ var ToCPay = function ToCPay(props, ref) {
       handlePaymentByType(detail === null || detail === void 0 ? void 0 : detail.service);
     },
     paymentTypeChange: paymentTypeChange,
-    hide: ((_state$payGroup24 = state.payGroup) === null || _state$payGroup24 === void 0 ? void 0 : _state$payGroup24.wait_amount) == 0,
+    hide: ((_state$payGroup32 = state.payGroup) === null || _state$payGroup32 === void 0 ? void 0 : _state$payGroup32.wait_amount) == 0,
     renderTitle: renderPaymentListTitle
   })), /*#__PURE__*/React.createElement(PaymentMethods, {
     ref: paymentMethodsRef,