@pisell/private-materials 6.4.75 → 6.4.76

package/es/components/booking/info2/service/addService/index.js

@@ -30,7 +30,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getProductExtend } from "./utils";
-import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
@@ -297,13 +297,12 @@ var Info = function Info(props) {
           _extend: {
             start_date: state.date.value,
             quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other: other
           },
           new: 1
         });
-        console.log(cacheItem, 'cacheItem', e);
+        cacheItem._extend.price = getMainPrice(_detail, _detail.price);
         var _total = getProductTotalPrice(cacheItem);
         // 用于折扣 可修改
         cacheItem._extend.total = _total;

package/es/components/booking/info2/service/contactInfoMode/index.d.ts

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

package/es/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/es/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

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

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

@@ -153,6 +153,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration

package/es/components/booking/utils.js

@@ -18,7 +18,7 @@ import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
-import Decimal from 'decimal.js';
+import Decimal from "decimal.js";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -755,11 +755,24 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   return _extend;
 };
 
+// 获取主商品价格 包含组合规格
+export var getMainPrice = function getMainPrice(item, price) {
+  var _item$_extend;
+  var newPrice = new Decimal(price || item._extend.price || 0);
+  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    newPrice = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
+
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend;
+  var _item$_extend2;
   var price = new Decimal(item._extend.price || 0);
-  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/pay.d.ts

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

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

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

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 {};