@pisell/private-materials 6.6.55 → 6.6.57

package/lib/components/booking/addons/index.js

@@ -68,15 +68,14 @@ var formatProducts = (values) => {
       discountway: "num",
       discount_type: "discount",
       bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
+      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
       "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
       "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
       "source_product_price": (0, import_utils.getSourceProductPrice)(item),
       "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
       "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
       "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
-      "tax_fee": item._extend.tax_fee,
-      is_price_include_tax: item.is_price_include_tax
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;

package/lib/components/booking/components/footer/amount.js

@@ -508,7 +508,7 @@ var getMainProductTotal = (item) => {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const discountAmount = getDiscountAmount(bundleItem.discount_list);
       const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice;
+      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
       total = total.add(bundleItemTotal);
     }
   }

package/lib/components/booking/components/footer/index.js

@@ -269,15 +269,6 @@ var Footer = (props) => {
       ...getDataFromHost()
     });
   }, [state, isEdit]);
-  (0, import_react.useEffect)(() => {
-    window.dispatchEvent(
-      new CustomEvent("onOriginExpectAmountWithoutDiscountChange", {
-        detail: {
-          originExpectAmountWithoutDiscount: total == null ? void 0 : total.originExpectAmountWithoutDiscount
-        }
-      })
-    );
-  }, [total == null ? void 0 : total.originExpectAmountWithoutDiscount]);
   (0, import_ahooks.useDebounceEffect)(() => {
     var _a2;
     if ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.addTimeModal) {

package/lib/components/booking/components/footer/utils.d.ts

@@ -15,7 +15,7 @@ export declare const formatProductOption: (option: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
+export declare const formatProductBundle: (bundle: any) => any;
 /**
  * 获取子商品折扣信息
  * @param item

package/lib/components/booking/components/footer/utils.js

@@ -97,7 +97,7 @@ var log = (data) => {
     ]
   });
 };
-var formatProductBundle = (bundle, is_price_include_tax) => {
+var formatProductBundle = (bundle) => {
   if (!bundle) {
     return;
   }
@@ -137,7 +137,6 @@ var formatProductBundle = (bundle, is_price_include_tax) => {
       "option": option,
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
-      is_price_include_tax,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -407,7 +406,7 @@ var formatProducts = (item, quantity) => {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
+    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
     "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
@@ -417,8 +416,7 @@ var formatProducts = (item, quantity) => {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data,
-    is_price_include_tax: item.is_price_include_tax
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 var formatAppointmentProductLists = (data) => {

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

@@ -135,17 +135,11 @@ var VoucherCard = (props) => {
     }
     onScanCode(e.detail.code);
   });
-  const onOriginExpectAmountWithoutDiscountChange = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2;
-    (_a2 = shopDiscount == null ? void 0 : shopDiscount.setOriginTotalAmount) == null ? void 0 : _a2.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
-  });
   (0, import_react.useEffect)(() => {
     const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
-    window.addEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     return () => {
       window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
-      window.removeEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {

package/lib/components/booking/components/voucher/index.less

@@ -1,8 +1,5 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -50,9 +47,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
+    overflow: hidden;
     display: flex;
     flex-direction: column;
-    overflow: auto;
 
     &.show {
       max-height: unset;

package/lib/components/booking/components/voucherModal/index.less

@@ -6,7 +6,6 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
-    display: flex;
   }
 
   // 隐藏状态下的样式优化

package/lib/components/booking/dashboard/index.js

@@ -144,7 +144,7 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     calcBookingDataCount();
   };
   const calcBookingDataCount = () => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h;
     let groupsOnSiteNow = statisticData.groups_today_num || 0;
     let peopleOnSiteNow = statisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : "-");
     let totalVisitorsToday = ((_a2 = statisticData.total_visitors_today) == null ? void 0 : _a2.num) || 0;
@@ -154,8 +154,8 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     let upcoming = ((_e = statisticData.upcoming_visitors) == null ? void 0 : _e.num) || 0;
     let upcomingChildren = ((_f = statisticData.upcoming_visitors) == null ? void 0 : _f.statistics) || [];
     let overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : "-");
-    let completed = statisticData.completed_visitors.num || 0;
-    let completedChildren = statisticData.completed_visitors.statistics || [];
+    let completed = ((_g = statisticData.completed_visitors) == null ? void 0 : _g.num) || 0;
+    let completedChildren = ((_h = statisticData.completed_visitors) == null ? void 0 : _h.statistics) || [];
     let departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : "-");
     onDataChange == null ? void 0 : onDataChange(
       {

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

@@ -0,0 +1,219 @@
+import dayjs from 'dayjs';
+export declare const formatActiveKey: (lists: any[], platform: string, isEdit: boolean) => any[];
+/**
+ * @title: 获取资源名称
+ * @description:
+ * @param {any} id
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 18:02
+ */
+export declare const getResourceItem: (id: any, state: any) => any;
+/**
+ * @title: 错误提示
+ * @description:
+ * @param {any} service
+ * @param {any} resourceItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 18:41
+ */
+export declare const getErrorMessage: (service: any, resourceItem: any, isDay?: boolean) => any;
+/**
+ * @title: 格式化主体列表
+ * @description:
+ * @param {any} lists
+ * @param {boolean} isOpenGroup
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 11:27
+ */
+export declare const formatHolderLists: (lists: any) => any;
+export declare const isBookingProduct: (extension_type: any, bol?: boolean) => boolean | undefined;
+/**
+ * @title: 是否是预约商品
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-06 11:24
+ */
+export declare const isDayBookingProduct: (item: any, state: any) => boolean | undefined;
+export declare const handleChangeHolder: (products: any[], currentItem: any, other: any) => any[];
+/**
+ * @title: 更新商品数据
+ * @description:
+ * @param {any} state
+ * @param currentItem
+ * @param {string} type
+ * @param {any} other
+ * @param actions
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-03 15:00
+ */
+export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
+export declare const formItems: (items: any[]) => any[];
+export declare const getIsSubjectRequire: (state: any) => boolean;
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
+export declare const isAllNormalProductByState: (state: any) => boolean;
+export declare const genRowKey: (key: string) => string;
+/**
+ * @title: 格式化商品数据
+ * @description:
+ * @param {any} lists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 17:36
+ */
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
+/**
+ * @title: 禁用日期
+ * @description:
+ * @param {any} current
+ * @param {string} position
+ * @param {any} startDate
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-03 17:51
+ */
+export declare const disabledDate: (current: any, position: string, currentDate: any) => any;
+/**
+ * @title: 是否是跨日预约
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 09:49
+ */
+export declare const isDayBooking: (state: any) => boolean;
+export declare const isDaysBooking: (state: any) => boolean;
+export declare const isEventBooking: (state: any) => boolean;
+export declare const isAppointmentProduct: (item: any) => boolean;
+/**
+ * @title: 是否是terminal上的跨日预约
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 15:31
+ */
+export declare const isTerminalDayBooking: (state: any) => any;
+export declare const formatDayDate: (_extend: any) => any;
+/**
+ * @title: 根据营业日时间格式化时间
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 12:07
+ */
+export declare const formatDayTime: ({ startDate, endDate }: any) => {
+    startDateTime: dayjs.Dayjs;
+    endDateTime: dayjs.Dayjs;
+};
+export declare const formatDateTime: (start_date: any, end_date: any) => {
+    value: dayjs.Dayjs;
+    end_date: dayjs.Dayjs;
+};
+/**
+ * @title: 初始化日期
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-06 17:24
+ */
+export declare const initDate: () => {
+    value: dayjs.Dayjs;
+    end_date: dayjs.Dayjs;
+};
+/**
+ * @title: 是否有预约商品
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-12 15:47
+ */
+export declare const isHasDayAppointmentProduct: (state: any) => boolean;
+/**
+ * @title: 过滤出如果是预约商品，则只获取跨日的预约商品
+ * @description:
+ * @param {any} lists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-13 16:44
+ */
+export declare const getDayProducts: (holderId: number, lists: any, isTerminal?: boolean) => any;
+/**
+ * @title: 格式化表单数据
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:19
+ */
+export declare const getPets: (state: any) => any;
+/**
+ * @title: 得出预约商品
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:26
+ */
+export declare const getAppointmentService: (state: any) => any;
+/**
+ * @title: 判断是否打开删除宠物弹窗
+ * @description:
+ * @param {any} state
+ * @param {any} newVal
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-16 16:12
+ */
+export declare const isOpenDeletePet: (state: any, newVal: any) => {
+    ids: any;
+    lists: any;
+};
+/**
+ * @title: 当前选中的表单id
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-17 14:40
+ */
+export declare const holderId: (state: any) => number;
+/**
+ * @title: 更新套餐的价格
+ * @description:
+ * @param {any} currentValue
+ * @param {any} newBundleData
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-31 15:16
+ */
+export declare function updateNormalBundlePrice(currentValue: any, newBundleData: any): any[];
+/**
+ * @title: 更新预约商品报价单
+ * @description:
+ * @param {any} state
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-25 16:41
+ */
+export declare const updateAppointmentServicePrice: (state: any, { start_date, end_date, product_id }: any) => Promise<{
+    multiDayPrices: any;
+    price: number;
+}>;
+/**
+ * @title: 更新普通商品报价单价格
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-24 11:32
+ */
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/info2/service/editService/index.js

@@ -61,13 +61,12 @@ var import_EditTabs = __toESM(require("../../../info/service/editService/EditTab
 var import_BookingList = __toESM(require("../../../info/service/editService/BookingList"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils9 = require("../../../info/service2/Group/utils");
-var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -86,10 +85,6 @@ var Info = (_, ref) => {
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
-  const context = (0, import_useEngineContext.default)();
-  const {
-    getData
-  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const valuesRef = (0, import_react.useRef)({});
   const noInOriginalDiscountIdsRef = (0, import_react.useRef)([]);
   const isEditedRef = (0, import_react.useRef)(false);
@@ -107,7 +102,7 @@ var Info = (_, ref) => {
       return true;
     }
     return ((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.cacheItem);
-  }, [(_b = state == null ? void 0 : state.service) == null ? void 0 : _b.cacheItem]);
+  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
   const getCurrentCacheItem = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
     let values = form.getFieldsValue();
     let _item = _cacheItem || state.service.cacheItem;
@@ -137,7 +132,7 @@ var Info = (_, ref) => {
     state.service.cacheItem,
     useStartTime,
     useResource,
-    (_e = (_d = (_c = state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.basic) == null ? void 0 : _e.service_time
+    (_d = (_c = (_b = state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
     const op = (0, import_utils7.getFlexibleOption)({
@@ -159,7 +154,7 @@ var Info = (_, ref) => {
     durationProps,
     useStartTime,
     currentResource,
-    (_h = (_g = (_f = state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.basic) == null ? void 0 : _h.service_time,
+    (_g = (_f = (_e = state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.service_time,
     useDuration
   ]);
   (0, import_react.useEffect)(() => {
@@ -256,7 +251,6 @@ var Info = (_, ref) => {
     }, 1500);
     let _list = [...state.service.value];
     let _item = {
-      is_price_include_tax: getData("is_price_include_tax"),
       ...cacheItem ?? state.service.cacheItem,
       autoClose: false
     };
@@ -436,7 +430,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_j = (_i = state.service.cacheItem) == null ? void 0 : _i._extend) == null ? void 0 : _j.origin_total]);
+  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
   const getResources = () => {
     var _a2, _b2;
     let res = (0, import_utils7.formatResources)({
@@ -500,11 +494,11 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_l = (_k = state.service.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.origin_total]);
+  }, [useTotal, (_k = (_j = state.service.cacheItem) == null ? void 0 : _j._extend) == null ? void 0 : _k.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_p = (_o = (_n = (_m = state.service) == null ? void 0 : _m.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.bundle]);
+  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
     var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
@@ -635,7 +629,7 @@ var Info = (_, ref) => {
     }
     return false;
   }, [state.renderType, isNormalProduct]);
-  const SelectTime = (_q = window.BaseMaterials) == null ? void 0 : _q.SelectTime;
+  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
   const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
   const items = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -672,7 +666,7 @@ var Info = (_, ref) => {
       }
     ))));
   }, [
-    (_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name,
+    (_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name,
     bundles,
     state.amountSymbol,
     state.isBookingCreatePage
@@ -717,7 +711,7 @@ var Info = (_, ref) => {
     ));
   }, [
     useTotal,
-    (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total,
+    (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
     state.amountSymbol,
     state.channelDisabledEdit
   ]);
@@ -765,7 +759,7 @@ var Info = (_, ref) => {
         }
       ) : null
     ));
-  }, [SelectTime, (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value, isEditGroup]);
+  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value, isEditGroup]);
   const endTime = (0, import_react.useMemo)(() => {
     if (!isEditGroup) {
       return null;
@@ -804,8 +798,8 @@ var Info = (_, ref) => {
     ));
   }, [
     state.renderType,
-    (_B = (_A = state.service.cacheItem) == null ? void 0 : _A._data) == null ? void 0 : _B.resources,
-    (_D = (_C = state.service.cacheItem) == null ? void 0 : _C._data) == null ? void 0 : _D.resourceMaps
+    (_A = (_z = state.service.cacheItem) == null ? void 0 : _z._data) == null ? void 0 : _A.resources,
+    (_C = (_B = state.service.cacheItem) == null ? void 0 : _B._data) == null ? void 0 : _C.resourceMaps
   ]);
   const holder = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
@@ -843,7 +837,7 @@ var Info = (_, ref) => {
   }, [
     state.locale,
     state.isTerminal,
-    (_G = (_F = (_E = state.service) == null ? void 0 : _E.cacheItem) == null ? void 0 : _F._data) == null ? void 0 : _G.capacitys
+    (_F = (_E = (_D = state.service) == null ? void 0 : _D.cacheItem) == null ? void 0 : _E._data) == null ? void 0 : _F.capacitys
   ]);
   const hiddenQuantity = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null));
@@ -923,10 +917,10 @@ var Info = (_, ref) => {
         import_utils.locales.getText("pisell2.text.apply")
       )
     );
-  }, [(_H = state.service.resourcesOrigin) == null ? void 0 : _H.length, isNormalProduct]);
+  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
   console.log("render edit");
   console.log(
-    state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
+    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
     performance.now() - window.pp1,
     "打开商品1"
   );
@@ -1061,7 +1055,7 @@ var Info = (_, ref) => {
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       mask: state.drawerMask,
-      open: !isNoSpecAndPackage && state.service.editModal && !((_J = state.service.cacheItem) == null ? void 0 : _J.autoClose),
+      open: !isNoSpecAndPackage && state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         var _a2;
@@ -1087,7 +1081,7 @@ var Info = (_, ref) => {
           display: currentTab === "batch_edit" ? "block" : "none"
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_L = (_K = state.client) == null ? void 0 : _K.value) == null ? void 0 : _L.id) && holder),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_K = (_J = state.client) == null ? void 0 : _J.value) == null ? void 0 : _K.id) && holder),
       /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
         import_noteModal.default,
         {

package/lib/components/checkout/components/WalletPassModule/index.js

@@ -68,7 +68,6 @@ var WalletPassModule = (0, import_react.forwardRef)(
     } = (0, import_useWalletPass.useWalletPass)({
       onSelectChange,
       customAmount,
-      totalAmount: Number(orderInfo == null ? void 0 : orderInfo.totalAmount) || 0,
       clientId
     });
     const [expiredModalVisible, setExpiredModalVisible] = (0, import_react.useState)(false);

package/lib/components/checkout/components/WalletPassModule/utils.d.ts

@@ -1,7 +1,6 @@
 declare type WalletPassDataType = Record<string, any>;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => any;
 export declare const voucherTime: (data: WalletPassDataType, key?: string) => any;
-export declare const getVoucherAvailableStatus: (item: any) => boolean;
 export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[], otherProps?: Record<string, any>) => any;
 export declare const formatDiscountWalletData: (data: any, selectId?: number[]) => any;
 export interface WalletPassUsageUnit {

package/lib/components/checkout/components/WalletPassModule/utils.js

@@ -33,7 +33,6 @@ __export(utils_exports, {
   formatMachineCodeServer2CardList: () => formatMachineCodeServer2CardList,
   getAvailableMaxAmount: () => getAvailableMaxAmount,
   getPointCardAmount: () => getPointCardAmount,
-  getVoucherAvailableStatus: () => getVoucherAvailableStatus,
   isSameContent: () => isSameContent,
   voucherTime: () => voucherTime
 });
@@ -44,9 +43,6 @@ var import_materials = require("@pisell/materials");
 var import_decimal = __toESM(require("decimal.js"));
 var Amount = import_materials.PisellText.Amount;
 var getAvailableMaxAmount = (data) => {
-  if ((0, import_utils.isNumber)(data._available_max_amount)) {
-    return data._available_max_amount;
-  }
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var voucherTime = (data, key = "expire_date") => {
@@ -59,20 +55,9 @@ var voucherTime = (data, key = "expire_date") => {
   }
   return import_utils.locales.getText("pisell2.text.walletPassPermanent");
 };
-var getVoucherAvailableStatus = (item) => {
-  return item.unified_available_status === 1 && ((0, import_utils.isNumber)(item._unified_available_status) ? !!item._unified_available_status : true);
-};
 var formatMachineCodeServer2CardList = (data, selectId = [], otherProps = {}) => {
   return (data || []).map((item) => {
     var _a, _b;
-    let disabled = false;
-    if (item.unified_available_status === 0) {
-      disabled = true;
-    } else {
-      if ((0, import_utils.isNumber)(item._unified_available_status)) {
-        disabled = !item._unified_available_status;
-      }
-    }
     return {
       id: item.id,
       name: item.product_name,
@@ -89,8 +74,8 @@ var formatMachineCodeServer2CardList = (data, selectId = [], otherProps = {}) =>
       showQrCode: false,
       showStatus: true,
       code: item.code,
-      disabled,
-      disabledReason: (0, import_utils.isNumber)(item._unified_available_status) && item._unified_available_status !== 1 ? item.reason : (_a = item.unified_messages) == null ? void 0 : _a.title,
+      disabled: !item.unified_available_status,
+      disabledReason: (_a = item.unified_messages) == null ? void 0 : _a.title,
       cover: (_b = item.product) == null ? void 0 : _b.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
@@ -168,7 +153,6 @@ var isSameContent = (arr1, arr2) => {
   formatMachineCodeServer2CardList,
   getAvailableMaxAmount,
   getPointCardAmount,
-  getVoucherAvailableStatus,
   isSameContent,
   voucherTime
 });

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -9,7 +9,6 @@ export declare const useWalletPass: (props: {
     }[]) => void) | undefined;
     customAmount?: string | undefined;
     clientId?: number | undefined;
-    totalAmount?: number | undefined;
 }) => {
     walletRecommendList: any[];
     userIdentificationCodes: any[];
@@ -30,6 +29,7 @@ export declare const useWalletPass: (props: {
     selectedDiscountList: any;
     handleSelectDiscount: (this: unknown, value: number[], option: any) => void;
     customerName: any;
+    fetchWalletRecommendList: (this: unknown, params: any) => Promise<any>;
     fetchUserIdentificationCodes: (this: unknown, params: any) => Promise<any>;
     getCachedWalletRecommendList: (this: unknown) => any;
     getCachedUserIdentificationCodes: (this: unknown) => any;