@pisell/private-materials 3.4.34 → 3.4.36

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/lib/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页

package/lib/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/eftposPay/linkly/hooks/useTimeQuery.ts
@@ -24,15 +34,16 @@ __export(useTimeQuery_exports, {
 module.exports = __toCommonJS(useTimeQuery_exports);
 var import_react = require("react");
 var import_utils = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var import_store = require("../../store");
 var import_hooks = require("../../hooks");
 var import_const = require("../../const");
 var import_const2 = require("../const");
-var GlobalTimeout = 1e3 * 60;
+var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { numRef, modeRef, deviceRef } = (0, import_hooks.useStoreRef)();
+  const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
   const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
@@ -80,7 +91,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("Success: 全局超时或不需要处理结果，终止查询");
         return;
       }
-      _log("Success" /* Success */, result);
       isQueryFinishedRef.current = true;
       const data = (result == null ? void 0 : result.data) || {};
       if (data.status == 1) {
@@ -95,8 +105,11 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       }
       if ((data == null ? void 0 : data.status) == 0 && (data == null ? void 0 : data.signature_flag) != 1) {
         console.log("交易状态为0需要继续查询");
+        _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       if (data.status < 0) {
@@ -132,7 +145,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
+        return;
+      }
+      if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
+        _log("NetworkError" /* NetworkError */);
+        console.log("Error: 网关类报错，将继续查询");
+        isQueryFinishedRef.current = false;
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       _log("Error" /* Error */, error);
@@ -197,13 +221,21 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       session_id: numRef.current
     };
     const content = [
-      { key: "queryId", value: JSON.stringify(queryIdRef.current) },
+      {
+        key: "description",
+        value: JSON.stringify({
+          queryId: queryIdRef.current,
+          orderId: orderIdRef.current,
+          type,
+          date: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+        })
+      },
       { key: "params", value: JSON.stringify(params) }
     ];
-    if (type === "Success" /* Success */) {
-      content.push({ key: "response", value: JSON.stringify(res) });
-    } else if (type === "Error" /* Error */) {
+    if (type === "Error" /* Error */) {
       content.push({ key: "error", value: JSON.stringify(res) });
+    } else {
+      content.push({ key: "response", value: JSON.stringify(res) });
     }
     (0, import_utils.sendWarningLog)({
       title: `Linkly-${isPay ? "Pay" : "Refund"}-交易结果轮询`,
@@ -212,8 +244,6 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   };
   const run = () => {
     reset();
-    console.log("开始查询linkly结果---->>>>>>>");
-    _log("Start" /* Start */);
     globalTimeoutIdRef.current = setTimeout(() => {
       var _a;
       console.log("全局超时，终止所有重试");
@@ -224,6 +254,8 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = (0, import_utils.getUniqueId)();
+    console.log("开始查询linkly结果---->>>>>>>");
+    _log("Start" /* Start */);
     return _resultQuery();
   };
   return { run, stop: reset };

package/lib/components/eftposPay/pay.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/lib/components/eftposPay/payo/config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

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

@@ -148,15 +148,15 @@ var POS = ({
     const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
       {
         ...(custom == null ? 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,
@@ -215,7 +215,7 @@ var POS = ({
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      if (err && `${err.code}` === import_const.PayStatus.Timeout) {
+      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
         checkApi();
         return;
       }

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

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/lib/components/eftposPay/tip.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

package/lib/components/eftposPay/windcave/windcave.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Deposit: () => JSX.Element;
 export default Deposit;

package/lib/components/eventBooking/components/Provider/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/lib/components/eventBooking/components/Provider/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/lib/components/eventBooking/components/Provider/SelectHolderModal.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const SelectHolderModal: (props: any) => JSX.Element;
 export default SelectHolderModal;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DayItem: (props: any) => JSX.Element;
 export default DayItem;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/lib/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Resource: (props: any) => JSX.Element;
 export default Resource;

package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Schedule: () => JSX.Element;
 export default Schedule;

package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type Item = any;
 interface ProductItemProps {

package/lib/components/login/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface LoginProps {
     title: string;

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

@@ -39,24 +39,47 @@ var import_model = require("../../model");
 var import_utils = require("@pisell/utils");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_index = require("./index.less");
 var import_utils2 = require("../../utils");
 var ApplePay = (props, ref) => {
-  var _a;
+  var _a, _b;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const { config } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
-    var _a2, _b, _c, _d, _e, _f, _g;
+    var _a2, _b2, _c, _d, _e, _f, _g;
+    paymentLogger.addLog({
+      key: "ApplePay初始化开始",
+      value: ""
+    });
     setOpen(true);
     const utils = context.appHelper.utils || {};
-    const dvaStore = (_b = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b.getState();
+    const dvaStore = (_b2 = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b2.getState();
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
     if (!values) {
+      paymentLogger.addLog({
+        key: "ApplePay获取支付参数失败",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} 未找到存储的支付参数`,
+          data: {
+            payGroup
+          }
+        }
+      });
+      paymentLogger.sendLogs("ApplePay获取支付参数失败");
       setOpen(false);
       return;
     }
+    paymentLogger.addLog({
+      key: "ApplePay获取支付参数成功",
+      value: ""
+    });
     try {
       const locale = ((_c = dvaStore.core) == null ? void 0 : _c.translateLocale) || "en";
       const shopId = (_f = (_e = (_d = dvaStore.core) == null ? void 0 : _d.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
@@ -68,8 +91,24 @@ var ApplePay = (props, ref) => {
         `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
         state.history
       )}`;
+      paymentLogger.addLog({
+        key: "ApplePay准备跳转",
+        value: ""
+      });
+      paymentLogger.sendLogs("ApplePay跳转成功");
       window.location.href = _href;
     } catch (err) {
+      paymentLogger.addLog({
+        key: "ApplePay处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} ApplePay处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup,
+            values
+          }
+        }
+      });
+      paymentLogger.sendLogs("ApplePay处理失败", err);
       setOpen(false);
     }
   };

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

@@ -35,30 +35,67 @@ module.exports = __toCommonJS(BankDeposit_exports);
 var import_react = require("react");
 var import_model = require("../../model");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_utils = require("../../utils");
 var import_index = require("./index.less");
 var BankDeposit = (props, ref) => {
+  var _a;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
+  const paymentLogger = (0, import_usePaymentLogger.default)({
+    orderId: ((_a = state.payGroup) == null ? void 0 : _a.order_id) || "unknown",
+    step: "2"
+  });
   const init = async ({ payGroup }) => {
-    var _a, _b;
-    const platform = ((_b = (_a = context.appHelper) == null ? void 0 : _a.constants) == null ? void 0 : _b.platform) || "h5";
-    let _item = payGroup == null ? void 0 : payGroup.otherPayment;
-    if (platform === "pc") {
-      state.payCallback({
-        key: _item.service,
-        data: {
-          order_id: payGroup.order_id,
-          payment_method: _item.title
+    var _a2, _b;
+    paymentLogger.addLog({
+      key: "BankDeposit初始化开始",
+      value: ""
+    });
+    try {
+      const platform = ((_b = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b.platform) || "h5";
+      let _item = payGroup == null ? void 0 : payGroup.otherPayment;
+      paymentLogger.addLog({
+        key: "BankDeposit平台检测",
+        value: ""
+      });
+      if (platform === "pc") {
+        paymentLogger.addLog({
+          key: "BankDepositPC处理",
+          value: ""
+        });
+        state.payCallback({
+          key: _item.service,
+          data: {
+            order_id: payGroup.order_id,
+            payment_method: _item.title
+          }
+        });
+        paymentLogger.sendLogs("BankDepositPC处理成功");
+        return;
+      }
+      const _href = `${(0, import_utils.formatFranchiseeRoute)(
+        `/pay/manual-transfer?id=${(payGroup == null ? void 0 : payGroup.order_id) || (payGroup == null ? void 0 : payGroup.order_id)}`,
+        state.history
+      )}`;
+      paymentLogger.addLog({
+        key: "BankDepositH5准备跳转",
+        value: ""
+      });
+      paymentLogger.sendLogs("BankDepositH5跳转成功");
+      state.history.push(_href);
+    } catch (err) {
+      paymentLogger.addLog({
+        key: "BankDeposit处理错误",
+        value: {
+          title: `订单${payGroup == null ? void 0 : payGroup.order_id} BankDeposit处理失败: ${(err == null ? void 0 : err.message) || "未知错误"}`,
+          data: {
+            payGroup
+          }
         }
       });
-      return;
+      paymentLogger.sendLogs("BankDeposit处理失败", err);
     }
-    const _href = `${(0, import_utils.formatFranchiseeRoute)(
-      `/pay/manual-transfer?id=${(payGroup == null ? void 0 : payGroup.order_id) || (payGroup == null ? void 0 : payGroup.order_id)}`,
-      state.history
-    )}`;
-    state.history.push(_href);
   };
   (0, import_react.useImperativeHandle)(
     ref,