@pisell/private-materials 6.9.1 → 6.9.3

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -142,7 +142,7 @@ var Product = (props) => {
     return /* @__PURE__ */ import_react.default.createElement(
       Comp,
       {
-        type: isRetail ? "a2" : "a5",
+        type: isRetail ? "a9" : "a5",
         rightActions: [
           {
             key: "update_number",

package/lib/components/systemSettings/registry/components/SectionList.js

@@ -37,6 +37,7 @@ var import_antd = require("antd");
 var import_icons = require("@ant-design/icons");
 var import_icon = require("@pisell/icon");
 var import_utils = require("@pisell/utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var getLocalizedText = (text, locale = "zh-CN") => {
   if (typeof text === "string") {
     return text;
@@ -66,9 +67,11 @@ var SectionList = ({
   hasMore = false,
   onLoadMore
 }) => {
+  var _a, _b;
   const scrollContainerRef = (0, import_react.useRef)(null);
   const loadingRef = (0, import_react.useRef)(null);
-  const currentLocale = localStorage.getItem("umi_locale") || "zh-CN";
+  const context = (0, import_useEngineContext.default)();
+  const currentLocale = ((_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale) || localStorage.getItem("umi_locale") || "en";
   const handleScroll = (0, import_react.useCallback)(() => {
     if (!scrollContainerRef.current || !hasMore || loading || !onLoadMore) {
       return;

package/lib/components/ticketBooking/components/ProductDisplayAdapter/ProductDisplayAdapter.js

@@ -33,7 +33,6 @@ __export(ProductDisplayAdapter_exports, {
 });
 module.exports = __toCommonJS(ProductDisplayAdapter_exports);
 var import_react = __toESM(require("react"));
-var import_ahooks = require("ahooks");
 var import_productSelect = __toESM(require("../../../../plus/productSelect"));
 var import_List = __toESM(require("../../../list/List"));
 var import_SkuCard = __toESM(require("../../../../plus/productSelect/ProductCard/SkuCard"));
@@ -54,9 +53,7 @@ var ProductDisplayAdapter = (props) => {
     className
   } = props;
   const { displayMode = "product-select" } = config;
-  const listRef = (0, import_react.useRef)(null);
   const [keyword, setKeyword] = (0, import_react.useState)("");
-  const size = (0, import_ahooks.useSize)(listRef);
   const renderProductSelect = (0, import_react.useMemo)(() => {
     const {
       showSearch = true,
@@ -74,6 +71,7 @@ var ProductDisplayAdapter = (props) => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_productSelect.default,
       {
+        tabSwitchMode: "switch",
         dataSource,
         layout,
         onChange: onSelectProduct,
@@ -143,14 +141,13 @@ var ProductDisplayAdapter = (props) => {
       "div",
       {
         className: `sku-list-container ${className || ""}`,
-        style,
-        ref: listRef
+        style
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_List.default,
         {
           className: "sku-list",
-          style: { maxHeight: size == null ? void 0 : size.height, overflow: "auto" },
+          style: { maxHeight: "100%", overflow: "auto" },
           data: filteredData,
           renderSearch: () => searchDom,
           loading: false,
@@ -188,7 +185,6 @@ var ProductDisplayAdapter = (props) => {
     emptyDescription,
     style,
     className,
-    size == null ? void 0 : size.height,
     _filteredList,
     tabData
   ]);

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -65,7 +65,7 @@ var productListSetting = {
   isStock: 0
 };
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const {
     onEdit,
     state,
@@ -77,6 +77,9 @@ var AddSerivce = (props) => {
   } = props;
   const context = (0, import_useEngineContext.default)();
   const platform = (0, import_useEngineContext.usePlatform)();
+  const {
+    getData
+  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const notAvailableRef = (0, import_react.useRef)(null);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const isActive = (0, import_IsActiveContext.useIsActive)();
@@ -88,9 +91,9 @@ var AddSerivce = (props) => {
     dispatch
   });
   const isBooking4 = (0, import_utils5.isBooking4Shop)(
-    ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+    ((_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getData) == null ? void 0 : _d.call(_c, "shop_id")) || ((_i = (_h = (_g = (_f = (_e = context.appHelper.utils.store) == null ? void 0 : _e.getState) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.global) == null ? void 0 : _h.globalConfig) == null ? void 0 : _i.id),
     state == null ? void 0 : state.renderType,
-    (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
+    (_j = context.appHelper.utils) == null ? void 0 : _j.businessUtils
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const [firstLoading, setFirstLoading] = (0, import_react.useState)(true);
@@ -100,7 +103,7 @@ var AddSerivce = (props) => {
   const stateRef = (0, import_react.useRef)(state);
   stateRef.current = state;
   const prerenderCompletedRef = (0, import_react.useRef)(false);
-  const latestServiceValueRef = (0, import_react.useRef)(((_j = state == null ? void 0 : state.service) == null ? void 0 : _j.value) || []);
+  const latestServiceValueRef = (0, import_react.useRef)(((_k = state == null ? void 0 : state.service) == null ? void 0 : _k.value) || []);
   const lastOperationTimeRef = (0, import_react.useRef)(0);
   const isInFastClickMode = () => {
     const now = Date.now();
@@ -163,11 +166,11 @@ var AddSerivce = (props) => {
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
-  }, [(_k = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _k.config]);
+  }, [(_l = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _l.config]);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_m = (_l = state.client) == null ? void 0 : _l.value) == null ? void 0 : _m.id]);
+  }, [(_n = (_m = state.client) == null ? void 0 : _m.value) == null ? void 0 : _n.id]);
   const scanAddService = (0, import_ahooks.useMemoizedFn)((list, code) => {
     let newService = [...stateRef.current.service.value || []];
     list.forEach((item) => {
@@ -257,7 +260,7 @@ var AddSerivce = (props) => {
     return true;
   });
   const createCacheItemFromParams = (0, import_ahooks.useMemoizedFn)((item, params, detail) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     const _detail = detail || item;
     const other = JSON.parse(JSON.stringify(params));
     other.session = params.session;
@@ -265,31 +268,36 @@ var AddSerivce = (props) => {
       ..._detail,
       product_id: item.id,
       _id: (0, import_utils.getUniqueId)(),
+      is_price_include_tax: getData("is_price_include_tax"),
       _key: params.key,
       _extend: {
         start_date: state.date.value,
         quantity: (params == null ? void 0 : params.quantity) || 1,
-        price: _detail.price,
         product_name: item.title,
         other,
         // end_date: endDate, 这个参数合并过来的没有入参
         isFormSubject: ((_d2 = (_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) == null ? void 0 : _d2.type) === "form",
         isNormalProduct: (0, import_utils4.isNormalProductByDurationSchedule)(item),
         note: (_e2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _e2.note,
-        priceOverride: (_f2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _f2.priceOverride
+        priceOverride: (_f2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _f2.priceOverride,
+        origin_total: (_g2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _g2.origin_total,
+        // 用于在购物车里唤醒 sku 弹窗时，复原商品的选择数据
+        // 因为packages/private-materials/src/components/booking/info2/service/editNormalService/index.tsx
+        // 可能会去修改option 之类的 price 字段，所以这里必须先 cloneDeep 一次，再次打开 SKU 弹窗时，应该使用没有修改的价格才对
+        _skuValue: (_h2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _h2.skuValue,
+        price: (_i2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _i2.price
       },
       new: 1
     };
-    cacheItem._extend.price = (0, import_utils2.getMainPrice)(cacheItem, _detail.price);
-    if (((_g2 = cacheItem._extend) == null ? void 0 : _g2.priceOverride) || ((_h2 = cacheItem._extend) == null ? void 0 : _h2.priceOverride) === 0) {
-      cacheItem._extend.price = (_i2 = cacheItem._extend) == null ? void 0 : _i2.priceOverride;
-    }
+    cacheItem._extend.price = (0, import_utils2.getMainPrice)(cacheItem, ((_j2 = _detail == null ? void 0 : _detail._extend) == null ? void 0 : _j2.price) ?? _detail.price);
     let _total = (0, import_utils2.getProductTotalPrice)(cacheItem);
     cacheItem._extend.total = _total;
-    cacheItem._extend.origin_total = _total;
+    if (!((_k2 = cacheItem._extend) == null ? void 0 : _k2.origin_total) && ((_l2 = cacheItem._extend) == null ? void 0 : _l2.origin_total) !== 0) {
+      cacheItem._extend.origin_total = _total;
+    }
     const _isEdit = !!state.service.cacheItem;
     if (_isEdit) {
-      cacheItem._id = (_j2 = state.service.cacheItem) == null ? void 0 : _j2._id;
+      cacheItem._id = (_m2 = state.service.cacheItem) == null ? void 0 : _m2._id;
       cacheItem.new = 0;
     }
     if (renderMode === "current") {
@@ -458,8 +466,30 @@ var AddSerivce = (props) => {
     });
     createBooking({ booking: data });
   });
-  const handleBooking4Service = (0, import_ahooks.useMemoizedFn)((item, params, detail, notShowToast) => {
+  const handleAddHolder = (0, import_ahooks.useMemoizedFn)(async (cacheItem) => {
+    var _a2, _b2, _c2;
+    const holderConfig = ((_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.bookingConfig) == null ? void 0 : _b2.holder) || {};
+    const currentMaxSelectedCount = (holderConfig == null ? void 0 : holderConfig.maxSelectedCount) || ((_c2 = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c2.quantity) || 1;
+    const result = await (0, import_selectHolderModal.selectHolderModal)({
+      state: stateRef.current,
+      dispatch,
+      maxSelectedCount: currentMaxSelectedCount
+    });
+    return result;
+  });
+  const handleBooking4Service = (0, import_ahooks.useMemoizedFn)(async (item, params, detail, notShowToast) => {
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     const cacheItem = createCacheItemFromParams(item, params, detail);
+    if (!(0, import_utils4.isNormalProductByDurationSchedule)(cacheItem) && (!cacheItem._extend.holder_id || !cacheItem._extend.holder_id.length) && !(0, import_utils2.isWalkIn)((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) && ((_f2 = (_e2 = (_d2 = (_c2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c2.config) == null ? void 0 : _d2.basic) == null ? void 0 : _e2.appointment_subject) == null ? void 0 : _f2.type) === "form" && ((_j2 = (_i2 = (_h2 = (_g2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _g2.config) == null ? void 0 : _h2.basic) == null ? void 0 : _i2.appointment_subject) == null ? void 0 : _j2.show_hold_on_add_cart) !== 0) {
+      const res = await handleAddHolder(cacheItem);
+      if (res && res.length > 0) {
+        cacheItem._extend.holder_id = res;
+      } else {
+        if (((_m2 = (_l2 = (_k2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _k2.config) == null ? void 0 : _l2.basic) == null ? void 0 : _m2.subject_require) === "require") {
+          return;
+        }
+      }
+    }
     if (cacheItem.autoClose) {
       processAutoCloseService(cacheItem, item, detail, notShowToast);
     } else {

package/lib/components/ticketBooking/components/bookingDataPanel/index.js

@@ -96,9 +96,10 @@ var BookingDataPanel = (0, import_react.forwardRef)((props, ref) => {
         {
           className: "pisell-ticket-booking-data-panel-tab-extra",
           onClick: () => {
-            var _a, _b;
+            var _a, _b, _c;
             (_a = bookingListRef.current) == null ? void 0 : _a.refresh();
-            (_b = Toast == null ? void 0 : Toast.success) == null ? void 0 : _b.call(Toast, import_utils.locales.getText("pisell2.ticket-booking.refresh-success"));
+            (_b = bookingDashboardRef.current) == null ? void 0 : _b.refresh();
+            (_c = Toast == null ? void 0 : Toast.success) == null ? void 0 : _c.call(Toast, import_utils.locales.getText("pisell2.ticket-booking.refresh-success"));
           }
         },
         /* @__PURE__ */ import_react.default.createElement(import_icons.SyncOutlined, null)

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -64,6 +64,7 @@ var import_context = require("../../context");
 var import_IsActiveContext = require("../../context/IsActiveContext");
 var import_useShopDiscountModule = require("../../hooks/pisellos/useShopDiscountModule");
 var import_utils5 = require("../../../booking/utils");
+var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
 var _formatBookingDetail = (data, modalState) => {
   var _a, _b, _c, _d;
   let {
@@ -251,6 +252,7 @@ var TicketBooking = (props) => {
     getProductsRef.current = getProducts;
   });
   const engineContext = (0, import_useEngineContext.default)();
+  const logger = (0, import_useLogger.default)();
   const { props: engineProps } = engineContext.engine;
   const {
     action,
@@ -317,6 +319,7 @@ var TicketBooking = (props) => {
       }
     }
   });
+  const businessCode = (0, import_context.useBusinessCode)();
   (0, import_react.useEffect)(() => {
     if (isActive) {
       openScan((data) => {
@@ -441,19 +444,27 @@ var TicketBooking = (props) => {
         "bookingTicket",
         "clearAllCart",
         (type, orderId) => {
-          var _a3;
+          var _a3, _b2;
           console.log("bookingTicket.clearAllCart");
           _initFn(() => {
           });
           _setIntervalTime(true);
           setTimeout(() => {
-            var _a4, _b2;
-            if (!(0, import_utils5.isWalkIn)((_b2 = (_a4 = state.client) == null ? void 0 : _a4.value) == null ? void 0 : _b2.id)) {
+            var _a4, _b3;
+            if (!(0, import_utils5.isWalkIn)((_b3 = (_a4 = state.client) == null ? void 0 : _a4.value) == null ? void 0 : _b3.id)) {
               selectCustomer(null, { reset: true });
             }
           }, 200);
           enableAllScanListeners();
           (_a3 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a3.call(shopDiscount);
+          (_b2 = logger == null ? void 0 : logger.addLog) == null ? void 0 : _b2.call(logger, {
+            type: "info",
+            metadata: {
+              type,
+              orderId
+            },
+            title: `清空购物车 bookingTicket.clearAllCart`
+          });
         }
       );
     }
@@ -1074,8 +1085,9 @@ var TicketBooking = (props) => {
         icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-person" }),
         key: "dashboard",
         onClick: () => {
-          var _a2;
-          (_a2 = pisellFloatingPanelRef.current) == null ? void 0 : _a2.open();
+          var _a2, _b2, _c2;
+          (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+          (_c2 = pisellFloatingPanelRef.current) == null ? void 0 : _c2.open();
         }
       }
     ];
@@ -1163,10 +1175,12 @@ var TicketBooking = (props) => {
       drawerMask: true,
       isBookingTicket2: true,
       isParallelResourcesBooking: state.isParallelResourcesBooking,
+      setIntervalTime: _setIntervalTime,
       onQrCodeClick: () => {
         console.log("onQrCodeClick");
         bookingTicket == null ? void 0 : bookingTicket.activateCamera();
-      }
+      },
+      businessCode
     };
   }, [
     state.modalState,

package/lib/components/ticketBooking/context/OsKeyContext.d.ts

@@ -7,10 +7,12 @@ import React from 'react';
 interface OsKeyContextType {
     /** pisellos 模块的唯一标识 */
     osKey: string | undefined;
+    businessCode: string | undefined;
 }
 declare const OsKeyContext: React.Context<OsKeyContextType>;
 interface OsKeyProviderProps {
     osKey: string | undefined;
+    businessCode: string | undefined;
     children: React.ReactNode;
 }
 /**
@@ -23,4 +25,5 @@ export declare const OsKeyProvider: React.FC<OsKeyProviderProps>;
  * 在子组件中使用此 hook 获取 osKey
  */
 export declare const useOsKey: () => string;
+export declare const useBusinessCode: () => string;
 export default OsKeyContext;

package/lib/components/ticketBooking/context/OsKeyContext.js

@@ -31,15 +31,17 @@ var OsKeyContext_exports = {};
 __export(OsKeyContext_exports, {
   OsKeyProvider: () => OsKeyProvider,
   default: () => OsKeyContext_default,
+  useBusinessCode: () => useBusinessCode,
   useOsKey: () => useOsKey
 });
 module.exports = __toCommonJS(OsKeyContext_exports);
 var import_react = __toESM(require("react"));
 var OsKeyContext = (0, import_react.createContext)({
-  osKey: void 0
+  osKey: void 0,
+  businessCode: void 0
 });
-var OsKeyProvider = ({ osKey, children }) => {
-  return /* @__PURE__ */ import_react.default.createElement(OsKeyContext.Provider, { value: { osKey } }, children);
+var OsKeyProvider = ({ osKey, businessCode, children }) => {
+  return /* @__PURE__ */ import_react.default.createElement(OsKeyContext.Provider, { value: { osKey, businessCode } }, children);
 };
 var useOsKey = () => {
   const context = (0, import_react.useContext)(OsKeyContext);
@@ -48,9 +50,17 @@ var useOsKey = () => {
   }
   return (context == null ? void 0 : context.osKey) || "ticket";
 };
+var useBusinessCode = () => {
+  const context = (0, import_react.useContext)(OsKeyContext);
+  if (!context) {
+    throw new Error("useBusinessCode must be used within an OsKeyProvider");
+  }
+  return (context == null ? void 0 : context.businessCode) || "";
+};
 var OsKeyContext_default = OsKeyContext;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   OsKeyProvider,
+  useBusinessCode,
   useOsKey
 });

package/lib/components/ticketBooking/context/index.d.ts

@@ -1,2 +1,2 @@
-export { OsKeyProvider, useOsKey } from './OsKeyContext';
+export { OsKeyProvider, useOsKey, useBusinessCode } from './OsKeyContext';
 export { default as OsKeyContext } from './OsKeyContext';

package/lib/components/ticketBooking/context/index.js

@@ -31,6 +31,7 @@ var context_exports = {};
 __export(context_exports, {
   OsKeyContext: () => import_OsKeyContext2.default,
   OsKeyProvider: () => import_OsKeyContext.OsKeyProvider,
+  useBusinessCode: () => import_OsKeyContext.useBusinessCode,
   useOsKey: () => import_OsKeyContext.useOsKey
 });
 module.exports = __toCommonJS(context_exports);
@@ -40,5 +41,6 @@ var import_OsKeyContext2 = __toESM(require("./OsKeyContext"));
 0 && (module.exports = {
   OsKeyContext,
   OsKeyProvider,
+  useBusinessCode,
   useOsKey
 });

package/lib/components/ticketBooking/hooks/pisellos/useCustomer.d.ts

@@ -19,7 +19,7 @@ export declare const useCustomer: (props: {
     changePage: (page: number, pageSize: number) => Promise<void>;
     selectCustomer: (customer: ClientData | null, options?: any) => void;
     addCustomerToFirst: (customer: ClientData) => void;
-    initLoad: (this: any, keyword?: any) => Promise<void>;
+    initLoad: (this: any, keyword: any, formId: number) => Promise<void>;
     hasMore: boolean;
     loadMore: () => Promise<void>;
 };

package/lib/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -91,11 +91,12 @@ var useCustomer = (props) => {
       setLoading(false);
     }
   );
-  const initLoad = (0, import_ahooks.useMemoizedFn)(async (keyword = "") => {
+  const initLoad = (0, import_ahooks.useMemoizedFn)(async (keyword = "", formId) => {
     try {
       setLoading(true);
       await bookingTicket.resetAndLoadCustomers({
-        search: keyword || void 0
+        search: keyword || void 0,
+        relation_form_id: formId || void 0
       });
     } catch (error2) {
       console.error("初始化加载失败:", error2);

package/lib/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -37,6 +37,7 @@ var import_bookingTicket = require("./bookingTicket");
 var import_react = require("react");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_dayjs = __toESM(require("dayjs"));
+var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
 var useProducts = (notAvailableRef) => {
   var _a;
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
@@ -47,6 +48,7 @@ var useProducts = (notAvailableRef) => {
   const isFirstLoadRef = (0, import_react.useRef)(true);
   const isFirstLoadDataRef = (0, import_react.useRef)(true);
   const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const logger = (0, import_useLogger.default)();
   const app = getApp();
   const [scheduleTimePoints, setScheduleTimePoints] = (0, import_react.useState)([]);
   const scheduledTaskQueueIdRef = (0, import_react.useRef)("booking-schedule-products");
@@ -56,11 +58,29 @@ var useProducts = (notAvailableRef) => {
     setLoading(true);
     try {
       paramsRef.current = params;
+      logger.addLog({
+        title: "useProducts: getProducts 调用",
+        metadata: {
+          params
+        }
+      });
       const products2 = await bookingTicket.loadProducts(params);
+      logger.addLog({
+        title: "useProducts: getProducts 返回",
+        metadata: {
+          products: (products2 == null ? void 0 : products2.length) || 0
+        }
+      });
       setProducts(products2);
       setLoading(false);
       isFirstLoadRef.current = false;
     } catch (error) {
+      logger.addLog({
+        title: "useProducts: getProducts 错误",
+        metadata: {
+          error: error == null ? void 0 : error.message
+        }
+      });
       if ((error == null ? void 0 : error.code) === 607100 && (isFirstLoadRef.current || products.length > 0)) {
         (_a2 = notAvailableRef.current) == null ? void 0 : _a2.open();
       }
@@ -81,7 +101,21 @@ var useProducts = (notAvailableRef) => {
       }
       app2.tasksManager.addTaskFunction("getProducts", async ({ task }) => {
         console.log("定时执行 getProducts，参数：", task.payload);
+        logger.addLog({
+          title: "useProducts: 定时执行 getProducts",
+          metadata: {
+            payload: task.payload,
+            task
+          }
+        });
         await getProducts(task.payload);
+        logger.addLog({
+          title: "useProducts: 定时执行 getProducts 完成",
+          metadata: {
+            payload: task.payload,
+            task
+          }
+        });
         return { status: "success" };
       });
       if (scheduleTimePoints && scheduleTimePoints.length > 0) {
@@ -115,22 +149,47 @@ var useProducts = (notAvailableRef) => {
           module: "scheduledTasks",
           queueId: scheduledTaskQueueIdRef.current
         });
+        logger.addLog({
+          title: "useProducts: 创建定时任务",
+          metadata: {
+            tasks: tasks.length,
+            log: `已为 ${tasks.length} 个时间点创建定时任务`
+          }
+        });
         console.log(`已为 ${tasks.length} 个时间点创建定时任务`);
       }
     } catch (error) {
       console.error("创建定时任务失败：", error);
+      logger.addLog({
+        title: "useProducts: 创建定时任务失败",
+        metadata: {
+          error: error == null ? void 0 : error.message
+        }
+      });
     }
     return () => {
       var _a3, _b2, _c2;
       try {
         const app2 = (_c2 = (_b2 = (_a3 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a3.utils) == null ? void 0 : _b2.getApp) == null ? void 0 : _c2.call(_b2);
         if (app2 && app2.tasksManager) {
+          logger.addLog({
+            title: "useProducts: 清理定时任务",
+            metadata: {
+              queueId: scheduledTaskQueueIdRef.current
+            }
+          });
           app2.tasksManager.clearTasks({
             module: "scheduledTasks",
             queueId: scheduledTaskQueueIdRef.current
           });
         }
       } catch (error) {
+        logger.addLog({
+          title: "useProducts: 清理定时任务失败",
+          metadata: {
+            error: error == null ? void 0 : error.message
+          }
+        });
         console.error("清理定时任务失败：", error);
       }
     };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {
@@ -10,6 +11,7 @@ interface TicketBookingProps {
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
     isActive?: boolean;
     rulesHooks?: any;
+    businessCode?: string;
 }
 declare const _default: (props: TicketBookingProps) => JSX.Element;
 export default _default;

package/lib/components/ticketBooking/index.js

@@ -272,7 +272,7 @@ var ticketBooking_default = (props) => {
       });
     }
   }, [osKey]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-ticket-booking-wrapper" }, isShowMenuBar && /* @__PURE__ */ import_react.default.createElement(import_menuBar.default, { activeNavKey, onNavChange: setActiveNavKey }), /* @__PURE__ */ import_react.default.createElement(import_IsActiveContext.IsActiveProvider, { isActive }, /* @__PURE__ */ import_react.default.createElement(import_OsKeyContext.OsKeyProvider, { osKey }, /* @__PURE__ */ import_react.default.createElement(import_miniRedux.Provider, { store: storeRef.current, key: activeNavKey }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-ticket-booking-wrapper" }, isShowMenuBar && /* @__PURE__ */ import_react.default.createElement(import_menuBar.default, { activeNavKey, onNavChange: setActiveNavKey }), /* @__PURE__ */ import_react.default.createElement(import_IsActiveContext.IsActiveProvider, { isActive }, /* @__PURE__ */ import_react.default.createElement(import_OsKeyContext.OsKeyProvider, { osKey, businessCode: props == null ? void 0 : props.businessCode }, /* @__PURE__ */ import_react.default.createElement(import_miniRedux.Provider, { store: storeRef.current, key: activeNavKey }, /* @__PURE__ */ import_react.default.createElement(
     import_ticketBooking.default,
     {
       onPrerenderComplete,

package/lib/components/walletList/index.js

@@ -156,7 +156,8 @@ var DEFAULT_BALANCE = {
   gift_card_balance: 0,
   point_card_balance: 0,
   voucher_count: 0,
-  discount_card_count: 0
+  discount_card_count: 0,
+  good_pass_count: 0
 };
 var WalletList = (0, import_model.Provider)((props) => {
   var _a, _b, _c, _d, _e, _f, _g;
@@ -523,6 +524,9 @@ var WalletList = (0, import_model.Provider)((props) => {
     const cardItems = showcaseWalletPassNew.map((showCaseItem) => {
       const balanceKey = _balanceKeyMap[showCaseItem.type];
       let value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      if (showCaseItem.type === "voucher") {
+        value += balanceItem.good_pass_count || 0;
+      }
       return {
         ...showCaseItem,
         value

package/lib/index.d.ts

@@ -69,13 +69,16 @@ export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
 export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
-export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
-export { default as SelectHolder } from './plus/selectHolder';
-export { default as HolderList } from './plus/selectHolder/components/HolderList';
 export { default as SettingsRegistry } from './components/systemSettings/registry';
 export { default as Selector } from './pro/Selector';
+export { default as SelectHolder } from './plus/selectHolder';
+export { default as HolderList } from './plus/selectHolder/components/HolderList';
+export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
 export { default as WebPosLogin } from './plus/webPosLogin';
 export { default as PaymentModal } from './components/checkout/plugin';
 export { default as SKUOptionsSelection } from './plus/skuOptionsSelection';
 export { default as KioskSkuDetail } from './components/kioskSkuDetail';
-export { default as MyTeamLogin } from './plus/myTeamLogin';
+export { default as EcoCupProject } from './components/ecocup/cupProject';
+export { default as EcoCupList } from './components/ecocup/cupList';
+export { default as EcoCustomerList } from './components/ecocup/customerList';
+export { default as OrderList } from './plus/orderList';