@pisell/private-materials 6.3.45 → 6.3.47

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -125,6 +125,7 @@ var VoucherCard = function VoucherCard(props) {
     });
     pisellos.effects.on('appointmentBooking_cart:onAddItem', onCartChange);
     pisellos.effects.on('appointmentBooking_cart:onUpdateQuotationPrice', onCartChange);
+    pisellos.effects.on('appointmentBooking_cart:onUpdateBookingDate', onCartChange);
     pisellos.effects.on('appointmentBooking_cart:onUpdateCartItemNums', onCartChange);
     pisellos.effects.on('appointmentBooking_cart:onRemoveItem', onCartChange);
     pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {

package/es/components/booking/components/voucher/index.js

@@ -90,7 +90,9 @@ var VoucherCard = function VoucherCard(props) {
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
         discount_list: value.discount_list,
-        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total
+        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total,
+        quantity: value._extend.quantity,
+        startDate: value._extend.startDate
       };
     });
     return val;

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

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

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 | "flexible" | {
+}) => number | {
     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: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "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: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ 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<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     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<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -14,6 +14,8 @@ import { LinklyActionStatus } from "../const";
 var GlobalTimeout = 1000 * 60 * 2;
 // 单次请求超时时间
 var RequestTimeout = 1000 * 5;
+// 轮询间隔时间（2秒）
+var QUERY_INTERVAL = 1000 * 2;
 export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, handleLinklySuccess) {
   var dispatch = useDispatch();
   var _useStoreRef = useStoreRef(),
@@ -38,6 +40,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var isQueryFinishedRef = useRef(true);
   // 每轮查询的唯一标识
   var queryIdRef = useRef(null);
+  // 轮询间隔定时器
+  var queryIntervalTimerRef = useRef(null);
   var _resultQuery = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _deviceRef$current;
@@ -106,9 +110,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 console.log('交易状态为0需要继续查询');
                 _log("Querying", result);
                 isQueryFinishedRef.current = false;
-                setTimeout(function () {
+                queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
-                }, 1500);
+                }, QUERY_INTERVAL);
                 return;
               }
 
@@ -157,9 +161,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("AbortError");
                 console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
-                setTimeout(function () {
+                queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
-                }, 1500);
+                }, QUERY_INTERVAL);
                 return;
               }
 
@@ -168,9 +172,9 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("NetworkError");
                 console.log('Error: 网关类报错，将继续查询');
                 isQueryFinishedRef.current = false;
-                setTimeout(function () {
+                queryIntervalTimerRef.current = setTimeout(function () {
                   _resultQuery();
-                }, 1500);
+                }, QUERY_INTERVAL);
                 return;
               }
               _log("Error", error);
@@ -242,6 +246,10 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       clearTimeout(requestTimeoutIdRef.current);
       requestTimeoutIdRef.current = null;
     }
+    if (queryIntervalTimerRef.current) {
+      clearTimeout(queryIntervalTimerRef.current);
+      queryIntervalTimerRef.current = null;
+    }
     if (controllerRef.current) {
       controllerRef.current.abort();
       controllerRef.current = null;

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

@@ -27,6 +27,7 @@ import { getUuid, getPayParams } from "../helper";
 import { useFail, useStoreRef } from "../hooks";
 import { useContextData, useDispatch, updateNextStep, updateComponent, updateState, updateCustom } from "../store";
 import { useValidate } from "./hooks";
+import { usePayment, ActionType } from "./payment";
 
 // 注意断网与卸载未完成的回调将终止处理
 export var POS = function POS(_ref) {
@@ -59,6 +60,16 @@ export var POS = function POS(_ref) {
   var _useValidate = useValidate(1000 * 60),
     _useValidate2 = _slicedToArray(_useValidate, 1),
     check = _useValidate2[0];
+  var _usePayment = usePayment({
+      payApi: api.pay,
+      checkApi: api.check,
+      shouldContinue: function shouldContinue() {
+        // 无网 或 已卸载 则不进行处理
+        return !(unloadRef.current || !netRef.current);
+      }
+    }),
+    paymentRun = _usePayment.run,
+    paymentClean = _usePayment.clean;
   useEffect(function () {
     failRef.current = fail;
   }, [fail]);
@@ -151,17 +162,18 @@ 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 ? {
+    var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
+    var apiParams = isPay ? _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,
+      custom_payment_id: custom.custom_payment_id
+    } : {}), {}, {
+      original_amount: payRef.current.amount,
       service_charge: {
         amount: payRef.current.surMoney,
         percentage: payRef.current.surPercentRate
       },
-      original_amount: payRef.current.amount
-    } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
       card_reader_type: eftposRef.current,
@@ -170,9 +182,7 @@ export var POS = function POS(_ref) {
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
-    }), {
-      signal: controllerRef.current.signal
-    }) : api.refund({
+    }) : {
       order_id: orderIdRef.current,
       amount: amountRef.current,
       card_reader_type: eftposRef.current,
@@ -181,31 +191,58 @@ export var POS = function POS(_ref) {
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
-    }, {
-      signal: controllerRef.current.signal
-    });
-    resultPromise.then(function (res) {
-      console.log('netRef.current111 = ', netRef.current);
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (res && "".concat(res.code) === '200') {
-        success(res);
-        return;
-      }
-      return Promise.reject(res);
-    }).catch(function (err) {
-      console.log('netRef.current222 = ', netRef.current, unloadRef.current, err);
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      // 支付接口超时 进行支付状态查询（超时或者其它错误）
-      if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
-        checkApi();
-        return;
-      }
-      failRef.current(err, true);
-    });
+    };
+    // const resultPromise = isPay
+    //   ? api.pay(apiParams, { signal: controllerRef.current.signal })
+    //   : api.refund(apiParams, { signal: controllerRef.current.signal });
+
+    // 支付场景单独接入新的流程 
+    if (isPay) {
+      var _deviceRef$current4;
+      paymentRun({
+        paymentType: ActionType.Pay,
+        paymentNum: numRef.current,
+        orderId: orderIdRef.current,
+        deviceId: (_deviceRef$current4 = deviceRef.current) === null || _deviceRef$current4 === void 0 ? void 0 : _deviceRef$current4.id,
+        params: apiParams,
+        callbacks: {
+          onSuccess: function onSuccess(res) {
+            success(res);
+          },
+          onError: function onError(err) {
+            console.log('err = >>>>>', err);
+            failRef.current(err, true);
+          }
+        }
+      });
+      return;
+    } else {
+      var resultPromise = api.refund(apiParams, {
+        signal: controllerRef.current.signal
+      });
+      resultPromise.then(function (res) {
+        console.log('netRef.current111 = ', netRef.current);
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (res && "".concat(res.code) === '200') {
+          success(res);
+          return;
+        }
+        return Promise.reject(res);
+      }).catch(function (err) {
+        console.log('netRef.current222 = ', netRef.current, unloadRef.current, err);
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        // 支付接口超时 进行支付状态查询（超时或者其它错误）
+        if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
+          checkApi();
+          return;
+        }
+        failRef.current(err, true);
+      });
+    }
   }, [api, check, dispatch, onChange]);
   useEffect(function () {
     return function () {
@@ -215,6 +252,7 @@ export var POS = function POS(_ref) {
       if (clearRef.current) {
         clearTimeout(clearRef.current);
       }
+      paymentClean();
     };
   }, []);
   return /*#__PURE__*/React.createElement(Step, props);

package/es/components/eftposPay/payo/payment.d.ts

@@ -0,0 +1,66 @@
+interface RunApiParams {
+    [key: string]: any;
+}
+export declare enum ActionType {
+    Pay = "pay",
+    Refund = "refund",
+    Query = "query"
+}
+interface UsePaymentOptions {
+    /**
+     * 支付接口
+     */
+    payApi: (params: RunApiParams, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 退款接口
+     */
+    refundApi?: (params: RunApiParams, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 查询接口
+     */
+    checkApi: (params: {
+        number: string;
+    }, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 检查是否应该继续处理结果（用于处理网络断开、组件卸载等情况）
+     */
+    shouldContinue?: () => boolean;
+}
+interface RunParams {
+    /** 支付类型 */
+    paymentType: ActionType;
+    /** 支付交易号 */
+    paymentNum: string;
+    /** 订单ID */
+    orderId?: string | number;
+    /** 设备ID */
+    deviceId?: string | number;
+    /** 支付参数 */
+    params: RunApiParams;
+    /** 回调方法 */
+    callbacks: RunCallbacks;
+}
+interface RunCallbacks {
+    /**
+     * 成功回调
+     */
+    onSuccess: (res: any) => void;
+    /**
+     * 失败回调
+     */
+    onError: (error: any) => void;
+}
+export declare const usePayment: (options: UsePaymentOptions) => {
+    run: (options: RunParams) => Promise<void>;
+    stop: () => void;
+    clean: (params?: {
+        clearCallbacks?: boolean;
+    }) => void;
+};
+export {};