@pisell/private-materials 3.4.35 → 3.4.36

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -104,4 +105,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/notes/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/payments/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/es/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -4,13 +4,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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); }); }; }
 import { useRef } from 'react';
 import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
+import dayjs from 'dayjs';
 import { useDispatch, updateCustom, updateStatus, updateState } from "../../store";
 import { useFail, useStoreRef } from "../../hooks";
 import { ModeEnum, PayStatus, StatusEnum } from "../../const";
 import { LinklyActionStatus } from "../const";
 
 // 全局超时时间
-var GlobalTimeout = 1000 * 60;
+var GlobalTimeout = 1000 * 60 * 2;
 // 单次请求超时时间
 var RequestTimeout = 1000 * 5;
 export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, handleLinklySuccess) {
@@ -18,7 +19,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var _useStoreRef = useStoreRef(),
     numRef = _useStoreRef.numRef,
     modeRef = _useStoreRef.modeRef,
-    deviceRef = _useStoreRef.deviceRef;
+    deviceRef = _useStoreRef.deviceRef,
+    orderIdRef = _useStoreRef.orderIdRef;
   var fail = useFail(0);
   var failRef = useRef(fail);
   var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
@@ -82,7 +84,6 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 console.log('Success: 全局超时或不需要处理结果，终止查询');
                 return;
               }
-              _log("Success", result);
               isQueryFinishedRef.current = true;
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
@@ -103,8 +104,11 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               // 交易状态为0，且不需要签名，则继续查询
               if ((data === null || data === void 0 ? void 0 : data.status) == 0 && (data === null || data === void 0 ? void 0 : data.signature_flag) != 1) {
                 console.log('交易状态为0需要继续查询');
+                _log("Querying", result);
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
 
@@ -153,7 +157,20 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("AbortError");
                 console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
+                return;
+              }
+
+              // 网关类报错，继续查询
+              if (!(error !== null && error !== void 0 && error.code) || "".concat(error.code) === PayStatus.Timeout) {
+                _log("NetworkError");
+                console.log('Error: 网关类报错，将继续查询');
+                isQueryFinishedRef.current = false;
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
               _log("Error", error);
@@ -243,20 +260,25 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       session_id: numRef.current
     };
     var content = [{
-      key: 'queryId',
-      value: JSON.stringify(queryIdRef.current)
+      key: 'description',
+      value: JSON.stringify({
+        queryId: queryIdRef.current,
+        orderId: orderIdRef.current,
+        type: type,
+        date: dayjs().format('YYYY-MM-DD HH:mm:ss')
+      })
     }, {
       key: 'params',
       value: JSON.stringify(params)
     }];
-    if (type === "Success") {
+    if (type === "Error") {
       content.push({
-        key: 'response',
+        key: 'error',
         value: JSON.stringify(res)
       });
-    } else if (type === "Error") {
+    } else {
       content.push({
-        key: 'error',
+        key: 'response',
         value: JSON.stringify(res)
       });
     }
@@ -268,8 +290,6 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var run = function run() {
     // 重置状态
     reset();
-    console.log('开始查询linkly结果---->>>>>>>');
-    _log("Start");
 
     // 设置全局超时定时器
     globalTimeoutIdRef.current = setTimeout(function () {
@@ -285,6 +305,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = getUniqueId();
+    console.log('开始查询linkly结果---->>>>>>>');
+    _log("Start");
     return _resultQuery();
   };
   return {

package/es/components/eftposPay/payo/config.js

@@ -152,15 +152,15 @@ export var POS = function POS(_ref) {
     controllerRef.current = new AbortController();
     // 支付 or 退款
     var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
-      "operator_id": custom.operator_id,
-      "operator_type": custom.operator_type,
-      "platform": custom.platform,
-      "custom_payment_id": custom.custom_payment_id,
-      "service_charge": {
-        "amount": payRef.current.surMoney,
-        "percentage": payRef.current.surPercentRate
+      operator_id: custom.operator_id,
+      operator_type: custom.operator_type,
+      platform: custom.platform,
+      custom_payment_id: custom.custom_payment_id,
+      service_charge: {
+        amount: payRef.current.surMoney,
+        percentage: payRef.current.surPercentRate
       },
-      "original_amount": payRef.current.amount
+      original_amount: payRef.current.amount
     } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
@@ -199,8 +199,8 @@ export var POS = function POS(_ref) {
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      // 支付接口超时 进行支付状态查询
-      if (err && "".concat(err.code) === PayStatus.Timeout) {
+      // 支付接口超时 进行支付状态查询（超时或者其它错误）
+      if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
         checkApi();
         return;
       }

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "warn" | "success" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -15,6 +15,7 @@ import { Context } from "../../model";
 import { locales } from '@pisell/utils';
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
 import "./index.less";
 import { formatFranchiseeRoute } from "../../utils";
 /**
@@ -27,7 +28,7 @@ import { formatFranchiseeRoute } from "../../utils";
  * @Date: 2024-08-16 10:58
  */
 var ApplePay = function ApplePay(props, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _state$payGroup;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -38,6 +39,12 @@ var ApplePay = function ApplePay(props, ref) {
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.constants) || {},
     config = _ref.config;
 
+  // ApplePay支付日志记录器
+  var paymentLogger = usePaymentLogger({
+    orderId: ((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id) || 'unknown',
+    step: '2'
+  });
+
   /**
    * @title: 初始化
    * @description:
@@ -49,23 +56,45 @@ var ApplePay = function ApplePay(props, ref) {
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _utils$getStore;
-      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup, locale, shopId, currentURL, linkElement, shop_domain, _href;
+      var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup2, locale, shopId, currentURL, linkElement, shop_domain, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref2.payGroup;
+            // 记录ApplePay初始化开始
+            paymentLogger.addLog({
+              key: 'ApplePay初始化开始',
+              value: ""
+            });
+
             // 打开loading
             setOpen(true);
             utils = context.appHelper.utils || {};
             dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState(); // 获取交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
             if (values) {
-              _context.next = 8;
+              _context.next = 11;
               break;
             }
+            // 记录获取支付参数失败
+            paymentLogger.addLog({
+              key: 'ApplePay获取支付参数失败',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u672A\u627E\u5230\u5B58\u50A8\u7684\u652F\u4ED8\u53C2\u6570"),
+                data: {
+                  payGroup: payGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('ApplePay获取支付参数失败');
             setOpen(false);
             return _context.abrupt("return");
-          case 8:
+          case 11:
+            // 记录获取支付参数成功
+            paymentLogger.addLog({
+              key: 'ApplePay获取支付参数成功',
+              value: ""
+            });
             try {
               // 语言
               locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
@@ -76,12 +105,29 @@ var ApplePay = function ApplePay(props, ref) {
 
               // 提取域名
               shop_domain = linkElement.hostname;
-              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history));
+              _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history)); // 记录即将跳转到ApplePay
+              paymentLogger.addLog({
+                key: 'ApplePay准备跳转',
+                value: ""
+              });
+              paymentLogger.sendLogs('ApplePay跳转成功');
               window.location.href = _href;
             } catch (err) {
+              // 记录ApplePay处理错误
+              paymentLogger.addLog({
+                key: 'ApplePay处理错误',
+                value: {
+                  title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((err === null || err === void 0 ? void 0 : err.message) || '未知错误'),
+                  data: {
+                    payGroup: payGroup,
+                    values: values
+                  }
+                }
+              });
+              paymentLogger.sendLogs('ApplePay处理失败', err);
               setOpen(false);
             }
-          case 9:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -5,6 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useImperativeHandle, forwardRef, useContext } from 'react';
 import { Context } from "../../model";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
 import { formatFranchiseeRoute } from "../../utils";
 import "./index.less";
 /**
@@ -17,10 +18,17 @@ import "./index.less";
  * @Date: 2024-08-16 10:59
  */
 var BankDeposit = function BankDeposit(props, ref) {
+  var _state$payGroup;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var context = useEngineContext();
 
+  // BankDeposit支付日志记录器
+  var paymentLogger = usePaymentLogger({
+    orderId: ((_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.order_id) || 'unknown',
+    step: '2'
+  });
+
   /**
    * @title: 初始化
    * @description:
@@ -31,19 +39,35 @@ var BankDeposit = function BankDeposit(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var _context$appHelper;
-      var payGroup, platform, _item, _href;
+      var payGroup, _context$appHelper, platform, _item, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref.payGroup;
+            // 记录BankDeposit初始化开始
+            paymentLogger.addLog({
+              key: 'BankDeposit初始化开始',
+              value: ""
+            });
+            _context.prev = 2;
             // 当前设备类型
             platform = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.platform) || 'h5';
-            _item = payGroup === null || payGroup === void 0 ? void 0 : payGroup.otherPayment; // pc的话打开stripe弹窗
+            _item = payGroup === null || payGroup === void 0 ? void 0 : payGroup.otherPayment; // 记录平台检测结果
+            paymentLogger.addLog({
+              key: 'BankDeposit平台检测',
+              value: ""
+            });
+
+            // pc的话打开stripe弹窗
             if (!(platform === 'pc')) {
-              _context.next = 6;
+              _context.next = 11;
               break;
             }
+            // 记录PC平台处理
+            paymentLogger.addLog({
+              key: 'BankDepositPC处理',
+              value: ""
+            });
             state.payCallback({
               key: _item.service,
               data: {
@@ -51,15 +75,41 @@ var BankDeposit = function BankDeposit(props, ref) {
                 payment_method: _item.title
               }
             });
+            paymentLogger.sendLogs('BankDepositPC处理成功');
             return _context.abrupt("return");
-          case 6:
-            _href = "".concat(formatFranchiseeRoute("/pay/manual-transfer?id=".concat((payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id) || (payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id)), state.history)); // h5打开银行转账页面
+          case 11:
+            _href = "".concat(formatFranchiseeRoute("/pay/manual-transfer?id=".concat((payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id) || (payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id)), state.history)); // 记录H5跳转准备
+            paymentLogger.addLog({
+              key: 'BankDepositH5准备跳转',
+              value: ""
+            });
+
+            // 在跳转前发送日志
+            paymentLogger.sendLogs('BankDepositH5跳转成功');
+
+            // h5打开银行转账页面
             state.history.push(_href);
-          case 8:
+            _context.next = 21;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](2);
+            // 记录BankDeposit处理错误
+            paymentLogger.addLog({
+              key: 'BankDeposit处理错误',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " BankDeposit\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
+                data: {
+                  payGroup: payGroup
+                }
+              }
+            });
+            paymentLogger.sendLogs('BankDeposit处理失败', _context.t0);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[2, 17]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);