@pisell/private-materials 6.0.25 → 6.1.1

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/es/components/booking/notes/addNote/index.js

@@ -35,7 +35,7 @@ var AddNote = function AddNote(_ref) {
     }
   }, [debouncedValue]);
   return /*#__PURE__*/React.createElement("div", {
-    className: ""
+    className: "pisell-lowcode__booking-notes"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-notes-label"
   }, title), /*#__PURE__*/React.createElement("div", {

package/es/components/booking/notes/addNote/index.less

@@ -1,3 +1,6 @@
+.pisell-lowcode__booking-notes {
+  padding: 20px 0;
+}
 .pisell-lowcode__booking-notes-label {
   font-size: 16px;
   font-weight: 500;

package/es/components/booking/notes/model.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

@@ -158,6 +158,7 @@ var Payments = Provider(function (props) {
     header: locales.getText("pisell2.text.payments"),
     footer: state.bookingId && /*#__PURE__*/React.createElement(Footer, {
       state: state,
+      dispatch: dispatch,
       source: "payment"
     }),
     loading: loading && state.bookingId
@@ -188,7 +189,7 @@ var Payments = Provider(function (props) {
         className: "payment-list-item-surcharge"
       }, "(", locales.getText("pisell2.text.surcharge"), " ", formatAmount(item.service_fee, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || "$"), ")") : null, /*#__PURE__*/React.createElement("div", {
         className: "payment-list-item-date"
-      }, dayjs("2024-01-17 16:56:41").format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
+      }, dayjs(item.payment_time).format("HH:mm YYYY/MM/DD"), /*#__PURE__*/React.createElement("span", {
         className: "payment-list-item-platform-type"
       }, item.platform && locales.getText("pisell2.text.platform.type")(item.platform))))))));
     }

package/es/components/booking/payments/model.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

@@ -140,6 +140,9 @@ export declare const deleteCacheParams: () => void;
  * @Date: 2024-12-01 22:43
  */
 export declare const getDays: (cacheItem: any, type: 'minutes' | 'days') => any;
+export declare const isSessionProduct: (cacheItem: any) => boolean;
+export declare const getIsEject: (item: any, type: 'select' | 'detail') => boolean;
+export declare const getIsOnlySession: (item: any) => boolean;
 /**
  * @title: 创建一个服务商品
  * @description:
@@ -162,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/booking/utils.js

@@ -17,6 +17,7 @@ import dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
+import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -250,6 +251,12 @@ export var formatProductListByCategory = function formatProductListByCategory(li
   });
 };
 export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cacheItem) {
+  var _cacheItem$_extend;
+  // 是编辑的商品
+  var isEdit = !!cacheItem.booking_id;
+
+  // 是当前绑定的资源
+  var isCurrentRelation = item.item_id === (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.relation_id);
   var startDate = dayjs(cacheItem._extend.start_date.format('YYYY-MM-DD') + ' ' + getServeStartTime(cacheItem._extend.start_time));
   var isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
 
@@ -263,8 +270,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   if (time.max_participants_limit == 0) {
     isMaxLimitRange = true;
   } else {
-    // unknown 为 未知的,  需要掉接口确认是否可用
-    isMaxLimitRange = 'unknown';
+    // 编辑当前选择资源，当前资源已预约数量 - 1
+    var orderEventCount = isEdit && isCurrentRelation ? time.order_event_count - 1 : time.order_event_count;
+    isMaxLimitRange = orderEventCount < time.max_participants_limit;
   }
   var timeStartDate = dayjs(time.start_date + ' ' + time.start_time).subtract(1, 'second');
   var timeEndDate = dayjs(time.end_date + ' ' + time.end_time).add(1, 'second');
@@ -304,8 +312,8 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
  * @Date: 2024-01-09 13:57
  */
 export var formatTimes = function formatTimes(resourceItem, cacheItem) {
-  var _cacheItem$_extend;
-  if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.sub_type) === 'days') {
+  var _cacheItem$_extend2;
+  if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.sub_type) === 'days') {
     var isResourceItem = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) > 0;
 
     // 是否在最大预约数量的区间内
@@ -479,8 +487,16 @@ export var getEndDate = function getEndDate(startDate, duration, endDate) {
 // export const get
 
 export var getServiceTimes = function getServiceTimes(service) {
+  var _service$_extend;
   var startDate = dayjs(dayjs(service._extend.start_date).format('YYYY-MM-DD ') + getServeStartTime(service._extend.start_time));
   var endDate = startDate.add(flexibleObj.getValue(service._extend.duration), 'minute');
+  var session = service === null || service === void 0 || (_service$_extend = service._extend) === null || _service$_extend === void 0 || (_service$_extend = _service$_extend.other) === null || _service$_extend === void 0 ? void 0 : _service$_extend.session;
+  if (isSessionProduct(service) && session) {
+    return {
+      startDate: dayjs(session.start_at),
+      endDate: dayjs(session.end_at)
+    };
+  }
   return {
     startDate: startDate,
     endDate: endDate
@@ -512,9 +528,9 @@ export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
 
     // 跨日预约
     if (isDay) {
-      var _cacheItem$_extend2 = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend,
-        start_date = _cacheItem$_extend2.start_date,
-        end_date = _cacheItem$_extend2.end_date;
+      var _cacheItem$_extend3 = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend,
+        start_date = _cacheItem$_extend3.start_date,
+        end_date = _cacheItem$_extend3.end_date;
       startText = start_date === null || start_date === void 0 ? void 0 : start_date.format('YYYY-MM-DD');
       endText = end_date ? end_date === null || end_date === void 0 ? void 0 : end_date.format('YYYY-MM-DD') : '';
     } else {
@@ -555,7 +571,7 @@ export var getErrorList = function getErrorList(resource, cacheItem, isDay) {
  * @Date: 2024-01-09 13:40
  */
 export var formatResource = function formatResource(resourceItem, cacheItem, formatLabel) {
-  var _cacheItem$_extend3;
+  var _resourceItem$_extend, _cacheItem$_extend4;
   // 当前资源
   var _resourceItem = _objectSpread({}, resourceItem);
 
@@ -567,12 +583,12 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
 
   // 格式化label
   _resourceItem.labelText = _resourceItem.room_name || _resourceItem.name;
-  var usable = _resourceItem._extend.usableTime && _resourceItem._extend.usableProduct;
+  var usable = _resourceItem._extend.usableTime && ((_resourceItem$_extend = _resourceItem._extend.usableTime._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.isMaxLimitRange) && _resourceItem._extend.usableProduct;
 
   // 跨日预约
-  if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.sub_type) === 'days') {
-    var _resourceItem$_extend, _resourceItem$_extend2;
-    usable = ((_resourceItem$_extend = _resourceItem._extend) === null || _resourceItem$_extend === void 0 || (_resourceItem$_extend = _resourceItem$_extend.usableTime) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.isUsable) && ((_resourceItem$_extend2 = _resourceItem._extend) === null || _resourceItem$_extend2 === void 0 ? void 0 : _resourceItem$_extend2.usableProduct);
+  if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.sub_type) === 'days') {
+    var _resourceItem$_extend2, _resourceItem$_extend3;
+    usable = ((_resourceItem$_extend2 = _resourceItem._extend) === null || _resourceItem$_extend2 === void 0 || (_resourceItem$_extend2 = _resourceItem$_extend2.usableTime) === null || _resourceItem$_extend2 === void 0 ? void 0 : _resourceItem$_extend2.isUsable) && ((_resourceItem$_extend3 = _resourceItem._extend) === null || _resourceItem$_extend3 === void 0 ? void 0 : _resourceItem$_extend3.usableProduct);
   }
   _resourceItem.usable = usable;
   if (formatLabel) {
@@ -604,7 +620,7 @@ export var deleteCacheParams = function deleteCacheParams() {
  * @Date: 2024-12-01 22:43
  */
 export var getDays = function getDays(cacheItem, type) {
-  var _cacheItem$_extend4, _cacheItem$_extend5;
+  var _cacheItem$_extend5, _cacheItem$_extend6;
   // 计算天数
   if (type === 'days') {
     var _formatDayDate = formatDayDate(cacheItem._extend),
@@ -612,10 +628,22 @@ export var getDays = function getDays(cacheItem, type) {
       end_date = _formatDayDate.end_date;
     return end_date.diff(start_date, 'day');
   }
-  var startDate = dayjs((_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.start_date);
-  var endDate = dayjs((_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.end_date);
+  var startDate = dayjs((_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.start_date);
+  var endDate = dayjs((_cacheItem$_extend6 = cacheItem._extend) === null || _cacheItem$_extend6 === void 0 ? void 0 : _cacheItem$_extend6.end_date);
   return endDate.diff(startDate, type);
 };
+export var isSessionProduct = function isSessionProduct(cacheItem) {
+  return ['session_product', 'session_ticket'].includes(cacheItem.extension_type);
+};
+export var getIsEject = function getIsEject(item, type) {
+  var isSession = isSessionProduct(item);
+  // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
+  return type === 'detail' || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0 || isSession;
+};
+export var getIsOnlySession = function getIsOnlySession(item) {
+  var isSession = isSessionProduct(item);
+  return !(item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0) && isSession;
+};
 
 /**
  * @title: 创建一个服务商品
@@ -627,19 +655,30 @@ export var getDays = function getDays(cacheItem, type) {
  * @Date: 2024-01-26 14:09
  */
 export var getServerItemExtend = function getServerItemExtend(state, cacheItem, timeObj) {
-  var _cacheItem$duration;
   // 编辑直接返回原数据
   if (!cacheItem.new && cacheItem._extend.endDate) {
     return cacheItem._extend;
   }
+  var appointmentTimingPreference = getAppointmentTimingPreference(state);
+  var isSession = isSessionProduct(cacheItem);
   var isDay = isDayBooking(state);
+  var setDuration = function setDuration() {
+    var _cacheItem$duration;
+    if (isDay) {
+      return getDays(cacheItem, 'days');
+    }
+    if (isSession) {
+      return getDays(cacheItem, 'minutes');
+    }
+    return findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
+  };
 
   // 获取上一个服务商品
   var lastServer = isDay ? false : getLastServer(state.service.value);
 
   // 下一个商品的扩展参数
   var _extend = {
-    duration: isDay ? getDays(cacheItem, 'days') : findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
+    duration: setDuration()
   };
 
   // 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
@@ -648,11 +687,17 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     _extend.resource = lastServer._extend.resource;
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
-    // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+
+    // 同时预约模式
+    if (appointmentTimingPreference === 'parallel') {
+      _extend.start_time = lastServerStartDate.format('HH:mm');
     } else {
-      _extend.start_time = lastServerEndDate.format('HH:mm');
+      // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
+      if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     // 没有上一个商品  资源为 0

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页
@@ -9,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -11,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" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "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,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" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "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<"tyro" | "windcave" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -33,7 +33,8 @@ export var POS = function POS(_ref) {
   var api = _ref.api,
     onChange = _ref.onChange;
   var _useContextData = useContextData(),
-    steps = _useContextData.steps;
+    steps = _useContextData.steps,
+    custom = _useContextData.custom;
   var _useStoreRef = useStoreRef(),
     deviceRef = _useStoreRef.deviceRef,
     payRef = _useStoreRef.payRef,
@@ -150,7 +151,17 @@ export var POS = function POS(_ref) {
     }));
     controllerRef.current = new AbortController();
     // 支付 or 退款
-    var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay({
+    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
+      },
+      "original_amount": payRef.current.amount
+    } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
       card_reader_type: eftposRef.current,
@@ -159,7 +170,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,

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

@@ -12,6 +12,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useCallback, useEffect, useRef } from 'react';
 import { PayStatus } from "../const";
 import { sleep } from "../helper";
+import { sendWarningLog } from '@pisell/utils';
 
 /**
  * @title: 循环查询 接口状态
@@ -111,14 +112,24 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
   }, []);
   var run = function run() {
+    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+      params[_key] = arguments[_key];
+    }
     isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
       isTimeoutCloseRef.current = true;
+      sendWarningLog({
+        title: '支付状态查询超时',
+        content: [{
+          key: 'params',
+          value: JSON.stringify(params)
+        }]
+      });
       close();
     }, timeout);
-    return checkApi.apply(void 0, arguments);
+    return checkApi.apply(void 0, params);
   };
   useEffect(function () {
     return function () {

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" | "success" | "warn" | "fail" | "question";
+        status: "success" | "loading" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,20 +295,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

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

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

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

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

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

package/es/components/eftposPay/windcave/windcave.js

@@ -173,7 +173,17 @@ export default (function (_ref) {
     var _params = {};
     if (isPay) {
       var _deviceRef$current2;
-      _params = {
+      _params = _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
+        },
+        "original_amount": payRef.current.amount
+      } : {}), {}, {
         order_id: orderIdRef.current,
         amount: payRef.current.total,
         card_reader_type: eftposRef.current,
@@ -182,7 +192,7 @@ export default (function (_ref) {
         pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
           number: numRef.current
         })))))
-      };
+      });
     } else {
       var _deviceRef$current3;
       _params = {