@pisell/private-materials 6.4.83 → 6.4.84

package/lib/components/booking/info2/utilsByBooking.js

@@ -42,7 +42,8 @@ module.exports = __toCommonJS(utilsByBooking_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../utils");
-var import_utils3 = require("../../ticketBooking/components/addServiceVariant/utils");
+var import_utils3 = require("../info/service2/utils");
+var import_utils4 = require("../../ticketBooking/components/addServiceVariant/utils");
 var getUseableEventCount = (eventList, current) => {
   return (eventList || []).reduce((pre, event) => {
     return pre - event.pax;
@@ -218,7 +219,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
     };
   }
   const appointmentTimingPreference = getAppointmentTimingPreference(state);
-  let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem));
+  let lastServer = (0, import_utils2.getLastServer)((_a = state.service.value) == null ? void 0 : _a.filter((item) => !item.isCustomItem && !(0, import_utils3.isNormalProductByDurationSchedule)(item)));
   let _extend = {
     // 时长: 当前商品时长 > 第一个时长
     duration: (0, import_utils2.findNextDuration)(
@@ -269,11 +270,14 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   _extend.endDate = endDate;
   const session = (_e = (_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.session;
   if ((0, import_utils2.isSessionProduct)(cacheItem) && session) {
-    _extend.start_date = session.start_at;
-    _extend.startDate = session.start_at;
+    const startAt = (0, import_dayjs.default)(`${state.date.value.format("YYYY-MM-DD")} ${session.start_at.format("HH:mm:ss")}`);
+    const endAt = (0, import_dayjs.default)(`${state.date.value.format("YYYY-MM-DD")} ${session.end_at.format("HH:mm:ss")}`);
+    _extend.start_date = startAt;
+    _extend.startDate = startAt;
     _extend.start_time = session.start_time;
-    _extend.end_date = session.end_at;
-    _extend.endDate = session.end_at;
+    _extend.end_date = endAt;
+    _extend.endDate = endAt;
+    _extend.end_time = session.end_time;
     _extend.duration = (0, import_utils2.getDays)({ _extend }, "minutes");
   }
   return _extend;
@@ -286,7 +290,7 @@ var getIsNoSpecAndPackage = (product) => {
   if (product == null ? void 0 : product.isEditBooking) {
     return ((_a = product == null ? void 0 : product.product_bundle) == null ? void 0 : _a.length) === 0 && (product == null ? void 0 : product.product_variant_id) === 0 && (((_c = (_b = product == null ? void 0 : product.product_sku) == null ? void 0 : _b.option) == null ? void 0 : _c.length) || 0) === 0;
   }
-  return (product == null ? void 0 : product.is_bundle) === 0 && (((_d = product == null ? void 0 : product.variant) == null ? void 0 : _d.length) || 0) === 0 && !(0, import_utils3.isOption)(product);
+  return (product == null ? void 0 : product.is_bundle) === 0 && (((_d = product == null ? void 0 : product.variant) == null ? void 0 : _d.length) || 0) === 0 && !(0, import_utils4.isOption)(product);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,4 +1,8 @@
 import dayjs from 'dayjs';
+/**
+ * @title: 高阶函数结果缓存（Memoization）
+ */
+export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;
@@ -23,13 +27,8 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @title: 时间切片
- * @description:
- * @param {any} config
- * @param {string} locale
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-04-26 13:59
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {

package/lib/components/booking/utils.js

@@ -58,6 +58,7 @@ __export(utils_exports, {
   isNowTime: () => isNowTime,
   isSessionProduct: () => isSessionProduct,
   isWalkIn: () => isWalkIn,
+  memoize: () => memoize,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
 });
@@ -68,6 +69,18 @@ var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var import_utilsByBooking = require("./info2/utilsByBooking");
 var import_decimal = __toESM(require("decimal.js"));
+function memoize(fn) {
+  const cache = /* @__PURE__ */ new Map();
+  return function(...args) {
+    const key = JSON.stringify(args);
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+    const result = fn.apply(this, args);
+    cache.set(key, result);
+    return result;
+  };
+}
 var Request = class {
   request = {};
   constructor() {
@@ -100,7 +113,7 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
+var _sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
   import_dayjs.default.locale(dayjsLocale);
@@ -149,6 +162,7 @@ var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   }
   return { timeSlices, durationSlicesBasedOnTime };
 };
+var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
 var getNowTime = () => {
   return (0, import_dayjs.default)().format("HH:mm");
 };
@@ -186,12 +200,15 @@ var findNextSlice = ({
   return timeSlices[index].value;
 };
 var findNextDuration = (current, array, defaultValue) => {
+  if (defaultValue) {
+    return defaultValue;
+  }
   for (let i = 0; i < array.length; i++) {
     if (array[i].value == (current == null ? void 0 : current.value)) {
       return array[i].value;
     }
   }
-  return defaultValue || array[0].value;
+  return array[0].value;
 };
 var formatProductListByCategory = (list, filterItem) => {
   let _list = list || [];
@@ -504,7 +521,7 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   return _resourceItem;
 };
 var getLastServer = (list) => {
-  return list[list.length - 1];
+  return list == null ? void 0 : list[0];
 };
 var getCacheParams = () => {
   const sessionData = sessionStorage.getItem("pisell2.booking.serviceParams");
@@ -725,6 +742,7 @@ var getIsEdit = (state) => {
   isNowTime,
   isSessionProduct,
   isWalkIn,
+  memoize,
   request,
   sliceDayIntoFiveMinutes
 });

package/lib/components/checkout/PaymentModal.js

@@ -62,6 +62,7 @@ var import_lodash = require("lodash");
 var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
+var import_printer = __toESM(require("../../hooks/printer"));
 var import_priceKeyboard = require("../../pro/priceKeyboard");
 var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
@@ -133,6 +134,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const walletPassRef = (0, import_react.useRef)(null);
     const [paymentItems, setPaymentItems] = (0, import_react.useState)([]);
     const [walletPassData, setWalletPassData] = (0, import_react.useState)({});
+    const { nativePrint } = (0, import_printer.default)();
     const [syncingLock, setSyncingLock] = (0, import_react.useState)(false);
     const isOrderFree = (0, import_react.useMemo)(() => {
       if (!customAmount) return false;
@@ -607,11 +609,12 @@ var PaymentContent = (0, import_react.forwardRef)(
             data: {
               order_id: responseData.order_id,
               machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-              small_ticket_data: (_b = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b.small_ticket_data
+              small_ticket_data: (_b = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b.small_ticket_data,
+              machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
             }
           };
           console.log("print_order_onOrderSynced_params>>>>", params);
-          (0, import_utils.webPrint)(params, (res) => {
+          nativePrint(params, (res) => {
             console.log("print_order_onOrderSynced_res>>>>", res);
           });
         } catch (error) {
@@ -732,7 +735,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               data: { order_id: data.orderId }
             };
             try {
-              (0, import_utils.webPrint)(params, (res) => {
+              nativePrint(params, (res) => {
                 console.log("handleButtonClick_print-receipt_res>>>>", res);
                 if (!(res == null ? void 0 : res.result)) {
                   Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");
@@ -1085,6 +1088,7 @@ var PaymentModal = ({
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
+  const { nativePrint } = (0, import_printer.default)();
   const handleRetry = async () => {
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
     const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
@@ -1505,7 +1509,8 @@ var PaymentModal = ({
                     data: {
                       order_id: responseData.order_id,
                       machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                      small_ticket_data: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.small_ticket_data
+                      small_ticket_data: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.small_ticket_data,
+                      machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
                     }
                   };
                   console.log("print_order_onOrderSynced_params>>>>", params);
@@ -1516,7 +1521,7 @@ var PaymentModal = ({
                       params
                     }
                   });
-                  (0, import_utils.webPrint)(params, (res) => {
+                  nativePrint(params, (res) => {
                     console.log("print_order_onOrderSynced_res>>>>", res);
                     logger == null ? void 0 : logger.addLog({
                       type: "info",
@@ -1698,7 +1703,7 @@ var PaymentModal = ({
           data: { order_id: data2.orderId }
         };
         try {
-          (0, import_utils.webPrint)(params, (res) => {
+          nativePrint(params, (res) => {
             console.log("handleButtonClick_print-receipt_res>>>>", res);
             if (!(res == null ? void 0 : res.result)) {
               Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");

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

@@ -150,6 +150,8 @@ function AdditionalModule({
                   )
                 );
               }
+            } else if (key === "print-receipt") {
+              handleButtonClick("print-receipt");
             } else if (key === "split-payment") {
               handleButtonClick("split-payment");
             } else if (key === "print-receipt") {

package/lib/components/checkout/components/AmountSummary/index.less

@@ -248,7 +248,6 @@
 
   .balance-due-label {
     font-size: 16px;
-    color: #7f56da;
     font-weight: 400;
     line-height: 1.5;
     margin-bottom: 4px;
@@ -256,7 +255,7 @@
 
   .balance-due-amount {
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 600;
     color: #7f56da;
     line-height: 0.75;
     text-decoration: underline;
@@ -272,13 +271,13 @@
   .pay-text {
     font-size: 16px;
     font-weight: 500;
-    color: #7f56da;
     letter-spacing: 0.09375em;
+    margin-top: 12px;
   }
 
   .pay-amount {
-    font-size: 32px;
-    font-weight: 400;
+    font-size: 36px;
+    font-weight: 600;
     color: #1e1830;
     line-height: 0.75;
   }

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

@@ -38,8 +38,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_utils = require("@pisell/utils");
 var import_locales = __toESM(require("../../locales"));
 var import_useToast = __toESM(require("../../../../hooks/useToast"));
-var import_priceKeyboard = require("../../../../pro/priceKeyboard");
 var import_ahooks = require("ahooks");
+var import_priceKeyboard = require("../../../../pro/priceKeyboard");
 var import_index = require("./index.less");
 function CashPaymentModule({
   amountSymbol,
@@ -78,6 +78,12 @@ function CashPaymentModule({
   }, [customAmount, balanceDueAmount, orderInfo == null ? void 0 : orderInfo.isDeposit]);
   const isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
   const isInputDisabled = disabled || Number(customAmount || 0) === 0;
+  const handleAmountClick = (clickedAmount) => {
+    if (isAmountButtonsDisabled) return;
+    const amountStr = clickedAmount.toString();
+    setAmount(amountStr);
+    setRoundingAmount(0);
+  };
   const handleCashPayInternal = () => {
     if (isAmountButtonsDisabled) return;
     if (onPaymentComplete) {

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

@@ -216,6 +216,7 @@ var ScrollableList = ({
     {
       style: {
         ...bottomGradientStyle,
+        width: "100%",
         border: "none",
         background: "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)",
         ...gradientStyle

package/lib/components/checkout/components/SearchAndClientModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/lib/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

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

package/lib/components/list/List.js

@@ -35,7 +35,6 @@ module.exports = __toCommonJS(List_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
-var import_Tab = __toESM(require("./components/Tab"));
 var import_Pagination = __toESM(require("./components/Pagination"));
 var import_EmptyState = __toESM(require("./components/EmptyState"));
 var import_ScrollLoader = __toESM(require("./components/ScrollLoader"));
@@ -48,6 +47,7 @@ var import_locales = __toESM(require("./locales"));
 var import_useWaterfall = __toESM(require("./hooks/useWaterfall"));
 var import_useListState = require("./hooks/useListState");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_utils = require("./utils");
 var MOCK_LIST_DATA = (() => {
   const mockData = [];
   for (let i = 0; i < 8; i++) {
@@ -131,6 +131,7 @@ var List = (props) => {
     externalCurrentPage: pagination == null ? void 0 : pagination.current,
     tabItems,
     defaultPageSize,
+    tabStyle,
     onLoadData
   });
   const { activeTab, isStickyActive } = listState;
@@ -143,11 +144,16 @@ var List = (props) => {
     }
     return fieldValue === targetValue;
   };
+  const dataIdMap = (0, import_react.useMemo)(() => {
+    return data.reduce((pre, cur) => {
+      return {
+        ...pre,
+        [cur.id]: cur
+      };
+    }, {});
+  }, [data]);
   const processedData = (0, import_react.useMemo)(() => {
     const sourceData = loading ? MOCK_LIST_DATA : data || [];
-    console.log(`processedData recalculating: tabStyle=${tabStyle}, activeTab=${activeTab}, tabItems=${tabItems.length}, dataLength=${sourceData.length}`);
-    console.log(`sourceData sample: ${JSON.stringify(sourceData.slice(0, 2), null, 2)}`);
-    console.log(`tabGroup: ${tabGroup}`);
     if (tabStyle === "anchor" && tabItems.length > 0) {
       const groupedData = [];
       const categoryTabs = tabItems.filter((tab) => tab.key !== "all");
@@ -195,20 +201,30 @@ var List = (props) => {
       if (!activeTab || activeTab === "all") {
         return [{ tabKey: "all", tabLabel: "", items: filteredData }];
       }
-      const currentTab = tabItems.find((tab) => tab.key === activeTab);
-      if (currentTab && currentTab.group) {
-        const filterField = "category";
-        filteredData = filteredData.filter((item) => matchesFieldValue(item[filterField], currentTab.group));
-      } else if (currentTab) {
-        const possibleFields = ["category", "status", "type", tabGroup];
-        for (const field of possibleFields) {
-          if (field && field !== "字段" && filteredData.some((item) => matchesFieldValue(item[field], activeTab))) {
-            filteredData = filteredData.filter((item) => matchesFieldValue(item[field], activeTab));
-            break;
+      if (Array.isArray(activeTab)) {
+        const productIds = (0, import_utils.findProductIdsByPath)(tabItems, activeTab, 0);
+        const items = productIds.map((id) => dataIdMap[id]);
+        return [{
+          tabKey: activeTab,
+          tabLabel: "",
+          items
+        }];
+      } else {
+        const currentTab = tabItems.find((tab) => tab.key === activeTab);
+        if (currentTab && currentTab.group) {
+          const filterField = "category";
+          filteredData = filteredData.filter((item) => matchesFieldValue(item[filterField], currentTab.group));
+        } else if (currentTab) {
+          const possibleFields = ["category", "status", "type", tabGroup];
+          for (const field of possibleFields) {
+            if (field && field !== "字段" && filteredData.some((item) => matchesFieldValue(item[field], activeTab))) {
+              filteredData = filteredData.filter((item) => matchesFieldValue(item[field], activeTab));
+              break;
+            }
           }
         }
+        return [{ tabKey: activeTab, tabLabel: (currentTab == null ? void 0 : currentTab.label) || "", items: filteredData }];
       }
-      return [{ tabKey: activeTab, tabLabel: (currentTab == null ? void 0 : currentTab.label) || "", items: filteredData }];
     }
   }, [data, activeTab, tabItems, tabGroup, tabStyle, loading]);
   const totalDataLength = (0, import_react.useMemo)(() => {
@@ -505,11 +521,10 @@ var List = (props) => {
         className: headerClasses
       },
       /* @__PURE__ */ import_react.default.createElement(
-        import_Tab.default,
+        import_materials.PisellTabbar,
         {
-          className: (0, import_classnames.default)("pisell-list-tabs", `pisell-list-tabs-${tabStyle}`),
-          activeKey: activeTab,
-          items: tabItems,
+          dataSource: tabItems,
+          value: activeTab,
           onChange: handleTabChangeWithScroll
         }
       )

package/lib/components/list/hooks/useListState.d.ts

@@ -6,7 +6,7 @@ export interface ListState {
 }
 export declare type ListAction = {
     type: 'SET_ACTIVE_TAB';
-    payload: string;
+    payload: string[] | string;
 } | {
     type: 'SET_CURRENT_PAGE';
     payload: number;
@@ -25,6 +25,8 @@ export interface UseListStateProps {
     defaultPageSize: number;
     /** 数据加载回调 */
     onLoadData?: (params: LoadDataParams) => void;
+    /** tab样式 */
+    tabStyle: 'anchor' | 'switch' | 'none';
 }
 export interface UseListStateReturn {
     state: ListState;
@@ -32,7 +34,7 @@ export interface UseListStateReturn {
     setCurrentPage: (page: number) => void;
     setStickyActive: (active: boolean) => void;
     resetPage: () => void;
-    handleTabChange: (key: string) => void;
+    handleTabChange: (key: string[] | string) => void;
     handlePageChange: (page: number, size?: number) => void;
     handleShowSizeChange: (current: number, size: number) => void;
     handleLoadMore: () => void;
@@ -40,4 +42,4 @@ export interface UseListStateReturn {
     handleScrollLoad: () => void;
     actualCurrentPage: number;
 }
-export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, }: UseListStateProps) => UseListStateReturn;
+export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, tabStyle, }: UseListStateProps) => UseListStateReturn;

package/lib/components/list/hooks/useListState.js

@@ -41,14 +41,27 @@ var useListState = ({
   externalCurrentPage,
   tabItems,
   defaultPageSize,
-  onLoadData
+  onLoadData,
+  tabStyle
 }) => {
   const initialState = {
     activeTab: tabItems.length > 0 ? tabItems[0].key : "all",
     currentPage: 1,
     isStickyActive: false
   };
+  const isSetDefaultTabRef = (0, import_react.useRef)(false);
   const [state, dispatch] = (0, import_react.useReducer)(listStateReducer, initialState);
+  (0, import_react.useEffect)(() => {
+    var _a, _b;
+    if (tabStyle === "switch" && tabItems.length > 0 && !isSetDefaultTabRef.current) {
+      isSetDefaultTabRef.current = true;
+      const defaultTab = [tabItems[0].key];
+      if (((_b = (_a = tabItems[0]) == null ? void 0 : _a.children) == null ? void 0 : _b.length) > 0) {
+        defaultTab.push("0");
+      }
+      setActiveTab(defaultTab);
+    }
+  }, [tabItems, tabStyle]);
   const actualCurrentPage = externalCurrentPage || state.currentPage;
   const setActiveTab = (0, import_react.useCallback)((tab) => {
     dispatch({ type: "SET_ACTIVE_TAB", payload: tab });

package/lib/components/list/styles/header.less

@@ -58,12 +58,12 @@
       top: 0;
       z-index: 10;
       /* 毛玻璃效果 */
-      background: rgba(255, 255, 255, 0.80);
+      background: transparent;
       backdrop-filter: blur(12px);
-      border-bottom: 1px solid #D0D5DD;
-      padding-bottom: 12px;
+      padding: 0;
       box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
       transition: box-shadow 0.2s ease, backdrop-filter 0.2s ease, background 0.2s ease;
+      border: none;
     }
 
   }

package/lib/components/list/utils/index.d.ts

@@ -1,4 +1,16 @@
 /**
  * List 组件工具函数导出
  */
-export { useGetText, createGetText, default as createGetTextDefault, type SupportedLanguage, type LocalesObject, type GetTextFunctions } from './getText';
+export { useGetText, createGetText, default as createGetTextDefault, type SupportedLanguage, type LocalesObject, type GetTextFunctions, } from './getText';
+/**
+ * 根据层级路径数组递归查找对应节点的 productIds
+ * @param nodes 当前层级的节点列表
+ * @param levelPath 层级路径数组，每个元素是对应层级的分类 ID
+ * @param currentLevel 当前遍历的层级索引
+ * @returns 找到的节点的 productIds，找不到返回空数组
+ *
+ * @description
+ * 特殊逻辑：如果 levelPath 最后一位是 0，则取倒数第二层节点的 productIds
+ * 例如：[1, 2, 0] -> 取 id=2 节点的 productIds
+ */
+export declare const findProductIdsByPath: (nodes: any[], levelPath: (string | number)[], currentLevel?: number) => number[];

package/lib/components/list/utils/index.js

@@ -31,13 +31,40 @@ var utils_exports = {};
 __export(utils_exports, {
   createGetText: () => import_getText.createGetText,
   createGetTextDefault: () => import_getText.default,
+  findProductIdsByPath: () => findProductIdsByPath,
   useGetText: () => import_getText.useGetText
 });
 module.exports = __toCommonJS(utils_exports);
 var import_getText = __toESM(require("./getText"));
+var findProductIdsByPath = (nodes, levelPath, currentLevel = 0) => {
+  const lastItem = levelPath[levelPath.length - 1];
+  const effectivePath = (lastItem === 0 || lastItem === "0") && levelPath.length > 1 ? levelPath.slice(0, -1) : levelPath;
+  if (!nodes || nodes.length === 0 || currentLevel >= effectivePath.length) {
+    return [];
+  }
+  const targetId = effectivePath[currentLevel];
+  const targetNode = nodes.find(
+    (node) => String(node.id) === String(targetId) || String(node.key) === String(targetId)
+  );
+  if (!targetNode) {
+    return [];
+  }
+  if (currentLevel === effectivePath.length - 1) {
+    return targetNode.productIds || [];
+  }
+  if (targetNode.children && targetNode.children.length > 0) {
+    return findProductIdsByPath(
+      targetNode.children,
+      effectivePath,
+      currentLevel + 1
+    );
+  }
+  return targetNode.productIds || [];
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createGetText,
   createGetTextDefault,
+  findProductIdsByPath,
   useGetText
 });

package/lib/components/pay/toB/components/Cache/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ToBPayCache: (props: {
     open: boolean;

package/lib/components/pay/toB/components/MX51/index.js

@@ -33,8 +33,8 @@ __export(MX51_exports, {
 });
 module.exports = __toCommonJS(MX51_exports);
 var import_react = require("react");
-var import_utils = require("@pisell/utils");
 var import_useLogger = __toESM(require("../../../../../hooks/useLogger"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var getUuid = () => {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx".replace(/[xy]/g, (c) => {
     const r = Math.random() * 16 | 0;
@@ -43,7 +43,10 @@ var getUuid = () => {
   });
 };
 var MX51 = (props, ref) => {
+  var _a, _b;
   const logger = (0, import_useLogger.default)();
+  const context = (0, import_useEngineContext.default)();
+  const action = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.action;
   const onOpen = ({ data, payCallback }) => {
     const { params, mode } = data;
     const uniquePaymentNumber = getUuid();
@@ -62,18 +65,40 @@ var MX51 = (props, ref) => {
       title: "ToB_MX51_onOpen 开始调用",
       metadata: { params: newData }
     });
-    (0, import_utils.webPayment)(newData, (res) => {
-      const isSame = (res == null ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
-      logger == null ? void 0 : logger.addLog({
-        type: "info",
-        title: "ToB_MX51_onOpen_callback",
-        metadata: {
-          msg: isSame ? "uniquePaymentNumber一致" : "uniquePaymentNumber不一致",
-          res
+    action({
+      type: "webpos.handleMX51Pay",
+      data: newData,
+      callback: (res) => {
+        var _a2, _b2;
+        let isSame = false;
+        if (res == null ? void 0 : res.uniquePaymentNumber) {
+          const _res = res;
+          isSame = (_res == null ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback == null ? void 0 : payCallback(_res);
+          }
+        } else {
+          const _res = res;
+          const newRes = {
+            result: (_res == null ? void 0 : _res.code) == "200" ? true : false,
+            msg: _res == null ? void 0 : _res.msg,
+            amount: (_a2 = _res == null ? void 0 : _res.data) == null ? void 0 : _a2.amount,
+            surcharge: (_b2 = _res == null ? void 0 : _res.data) == null ? void 0 : _b2.surcharge,
+            uniquePaymentNumber: _res == null ? void 0 : _res.uuid
+          };
+          isSame = (_res == null ? void 0 : _res.uuid) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback == null ? void 0 : payCallback(newRes);
+          }
         }
-      });
-      if (isSame) {
-        payCallback == null ? void 0 : payCallback(res);
+        logger == null ? void 0 : logger.addLog({
+          type: "info",
+          title: "ToB_MX51_onOpen_callback",
+          metadata: {
+            msg: isSame ? "交易流水号一致" : "交易流水号不一致",
+            res
+          }
+        });
       }
     });
   };

package/lib/components/pay/toB/types/index.d.ts

@@ -58,3 +58,15 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
+/**
+ * @title 原生MX51支付结果
+ */
+export interface NativeMX51PayResult {
+    code: string;
+    msg?: string;
+    data: {
+        amount: number;
+        surcharge: number;
+    };
+    uuid: string;
+}

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -258,7 +258,7 @@ var checkTDSAuth = async (step2, step3, callback) => {
         billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
         billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
         billAddrState: paymentInfo.billingAddress.billAddrState,
-        threeDSCompInd: isPre ? "" : threeDSCompInd,
+        threeDSCompInd: isPre ? "" : threeDSCompInd || "N",
         threeDSServerTransID: isPre ? "" : threeDSServerTransID,
         threeDSRequestorAuthenticationInd: "01",
         threeDSRequestorURL: window.location.href,