@pisell/pisellos 2.3.40 → 2.3.41

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -77,15 +77,10 @@ function calculateResourceAvailableTime({
 function findFastestAvailableResource({
   resources,
   currentCapacity = 1,
-  countMap = {},
-  targetDate,
-  durationMinutes = 30
+  countMap = {}
 }) {
   var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
-  const resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
-  const targetDay = targetDate ? (0, import_dayjs.default)(targetDate) : currentTime;
-  const isTargetDayToday = targetDay.isSame(currentTime, "day");
   let fastestTime = null;
   let fastestResources = [];
   console.log("[TimeslotUtils] 查找最快可用资源:", {
@@ -95,22 +90,19 @@ function findFastestAvailableResource({
     countMap
   });
   for (const resource of resources) {
-    const targetDayTimes = resource.times.filter((time) => {
-      const isSameTargetDay = (0, import_dayjs.default)(time.start_at).isSame(targetDay, "day");
-      if (!isSameTargetDay)
-        return false;
-      if (!isTargetDayToday)
-        return true;
-      return (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+    const todayTimes = resource.times.filter((time) => {
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+      return isToday && isStillWorking;
     });
-    if (targetDayTimes.length === 0) {
+    if (todayTimes.length === 0) {
       console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
     }
-    for (const time of targetDayTimes) {
+    for (const time of todayTimes) {
       const workStartTime = (0, import_dayjs.default)(time.start_at);
       const workEndTime = (0, import_dayjs.default)(time.end_at);
-      let nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
+      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
       console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
         workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
         checkStartTime: nextAvailableTime.format("HH:mm:ss"),
@@ -134,7 +126,7 @@ function findFastestAvailableResource({
           pax: event.pax || 1
         });
         if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
             finalAvailableTime = eventEnd;
             console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
@@ -142,7 +134,7 @@ function findFastestAvailableResource({
           const totalCapacity = resource.capacity || 0;
           const currentUsedCapacity = countMap[resource.id] || 0;
           const eventUsedCapacity = event.pax || 1;
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
             const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
             if (totalRequiredCapacity > totalCapacity) {
               finalAvailableTime = eventEnd;
@@ -151,7 +143,7 @@ function findFastestAvailableResource({
           }
         }
       }
-      if (finalAvailableTime.add(resolvedDuration, "minute").isAfter(workEndTime)) {
+      if (finalAvailableTime.isAfter(workEndTime)) {
         console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
         continue;
       }

package/lib/solution/BookingTicket/index.d.ts

@@ -46,6 +46,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getIdGeneratorPlugin;
     private loadOpenDataConfig;
     getOpenData(): Promise<OpenDataConfig | null>;
+    /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
+    clearOpenDataCache(): void;
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
@@ -189,10 +191,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     getCustomer(): ICustomer | null;
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
-    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
+    getProductByIds(ids: number[], options?: {
+        loadMissing?: boolean;
+    }): Promise<ProductData[]>;
     /**
      * 获取日程时间段点
      * @param params 参数
@@ -322,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -219,8 +219,14 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
   }
   async getOpenData() {
+    return this.loadOpenDataConfig();
+  }
+  /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
+  clearOpenDataCache() {
     var _a;
-    return (_a = this.store.openData) == null ? void 0 : _a.getOpenData();
+    this.loadOpenDataConfigInFlight = null;
+    this.otherParams.openData = null;
+    (_a = this.store.openData) == null ? void 0 : _a.clearCache();
   }
   async getShortNumberOrDeviceId() {
     const getAsyncIotDeviceInfo = this.getAppData("async_iot_device_info");
@@ -233,6 +239,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return String(this.getAppData("device_id") || 0).slice(-2);
   }
   async configureIdGeneratorFromOpenData() {
+    this.setPaymentNumberDevicePrefix(null);
     let openDataConfig = null;
     try {
       openDataConfig = await this.loadOpenDataConfig();
@@ -264,6 +271,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const resetReceiptSequenceDaily = typeof (openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"]) === "boolean" ? openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"] : false;
     const operatingDayBoundary = this.getAppData("operating_day_boundary");
     const deviceId = await this.getShortNumberOrDeviceId();
+    this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
     if (!businessCode) {
       console.warn("[BookingTicket] businessCode 缺失，跳过 idGenerator 配置");
@@ -714,11 +722,53 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return this.getOrderCustomerSnapshot();
   }
   /**
-   * 通过 ids 获取商品列表（不加载到模块中）
-   * @returns 商品列表
+   * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+   * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
    */
-  async getProductByIds(ids) {
-    return this.store.products.getProductByIds(ids);
+  async getProductByIds(ids, options) {
+    var _a, _b;
+    const normalizedIds = Array.from(
+      new Set(
+        (ids || []).map((id) => Number(id)).filter((id) => Number.isFinite(id))
+      )
+    );
+    const localProducts = await this.store.products.getProductByIds(normalizedIds) || [];
+    if (!(options == null ? void 0 : options.loadMissing)) {
+      return localProducts;
+    }
+    const localProductIds = new Set(
+      localProducts.map((product) => Number(product.id))
+    );
+    const missingIds = normalizedIds.filter(
+      (id) => !localProductIds.has(id)
+    );
+    if (!missingIds.length) {
+      return localProducts;
+    }
+    const rawBookingDate = this.getBookingDate();
+    const bookingDate = rawBookingDate && (0, import_dayjs.default)(rawBookingDate).isValid() ? (0, import_dayjs.default)(rawBookingDate) : null;
+    const customerId = Number(
+      ((_a = this.getOrderCustomerSnapshot()) == null ? void 0 : _a.id) ?? ((_b = this.getOrderCustomer()) == null ? void 0 : _b.customer_id)
+    );
+    const loadedProducts = await this.store.products.loadProducts({
+      product_ids: missingIds,
+      with_count: ["bundleGroup", "optionGroup"],
+      with_schedule: 1,
+      cacheId: this.cacheId,
+      ...bookingDate ? {
+        schedule_date: bookingDate.format("YYYY-MM-DD"),
+        schedule_datetime: bookingDate.format("YYYY-MM-DD HH:mm:ss")
+      } : {},
+      ...Number.isFinite(customerId) && customerId > 0 ? { customer_id: customerId } : {}
+    });
+    const productById = /* @__PURE__ */ new Map();
+    [...localProducts, ...loadedProducts || []].forEach((product) => {
+      const productId = Number(product.id);
+      if (Number.isFinite(productId)) {
+        productById.set(productId, product);
+      }
+    });
+    return normalizedIds.map((id) => productById.get(id)).filter((product) => Boolean(product));
   }
   /**
    * 获取日程时间段点
@@ -1042,11 +1092,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    */
   scanGlobalListener(callback) {
     const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
-    const scanCallback = (0, import_handleScan.handleGlobalScan)(
-      this.request,
-      localSearch,
-      this.getSubmitOrderSalesChannel()
-    );
+    const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
     const safeCallback = (d) => {
       try {
         callback(d);
@@ -1157,7 +1203,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   /** 读取当前 booking config。 */
   getBookingConfig() {
-    return this.store.bookingContext.getBookingConfig();
+    var _a;
+    return (_a = this.store.bookingContext) == null ? void 0 : _a.getBookingConfig();
   }
   /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
   setResources(resources) {
@@ -1374,11 +1421,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     try {
       const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
-      const scanCallback = (0, import_handleScan.handleGlobalScan)(
-        this.request,
-        localSearch,
-        this.getSubmitOrderSalesChannel()
-      );
+      const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
       const raw = await scanCallback({ type: "nativeScanner", value: trimmed });
       const formatted = (0, import_formatGlobalScan.formatGlobalScanResult)(raw, trimmed);
       if (!formatted) {
@@ -1397,7 +1440,9 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
           decideAddProduct: (item, options) => this.decideAddProduct(item, options),
           decideAfterDetail: (cacheItem, options) => this.decideAfterDetail(cacheItem, options),
           transformDetailToProductAndBooking: (input) => this.transformDetailToProductAndBooking(input),
-          addProductToOrder: (product, booking) => this.addProductToOrder(product, booking)
+          addProductToOrder: (product, booking) => this.addProductToOrder(product, booking),
+          refreshWalletAssets: (params) => this.refreshWalletAssets(params),
+          scanWalletAsset: (scanCode) => this.scanWalletAsset(scanCode)
         },
         formatted,
         bridge
@@ -1534,8 +1579,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return result;
   }
   async setOtherParams(params, { cover = false } = {}) {
-    super.setOtherParams(params, { cover });
-    if (params == null ? void 0 : params.businessCode) {
+    await super.setOtherParams(params, { cover });
+    if ((params == null ? void 0 : params.businessCode) !== void 0 || (params == null ? void 0 : params.business_code) !== void 0) {
       await this.configureIdGeneratorFromOpenData();
     }
   }

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(addProductDecision_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_BookingContext = require("../../../modules/BookingContext");
 var import_transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
+var import_weighingProductSku = require("./weighingProductSku");
 function needsSpecDetailModal(item) {
   if (item == null ? void 0 : item.open_sold_weight)
     return true;
@@ -281,11 +282,14 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
   const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
   const extend = (cacheItem == null ? void 0 : cacheItem._extend) || {};
+  const productSku = (0, import_weighingProductSku.buildProductSkuFromCacheItem)(cacheItem);
   return {
     id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
     product_id: resolvedPid,
     variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
     quantity,
+    // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
+    product_sku: productSku ? { ...productSku, option: (other == null ? void 0 : other.option) || [] } : void 0,
     option: (other == null ? void 0 : other.option) || [],
     bundle: (other == null ? void 0 : other.bundle) || ((_c = extend == null ? void 0 : extend.skuValue) == null ? void 0 : _c.bundle) || ((_d = extend == null ? void 0 : extend._skuValue) == null ? void 0 : _d.bundle) || [],
     unique: other == null ? void 0 : other.unique,

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts

@@ -24,6 +24,14 @@ export interface GlobalScanApplyHost {
         cacheItem: any;
     };
     addProductToOrder(product: any, booking?: any): Promise<any>;
+    refreshWalletAssets?(params?: {
+        preserveSelection?: boolean;
+    }): Promise<any>;
+    scanWalletAsset?(code: string): Promise<{
+        type: 'walletCode' | 'normalCode';
+        asset?: any;
+        selected: boolean;
+    }>;
 }
 /**
  * 应用全局扫码格式化结果：设客户 / 加车 / 开单 / 弹窗链。

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -101,13 +101,32 @@ async function applyGlobalScan(host, formatted, bridge) {
     return { status: "success", kind: "customer" };
   }
   if (searchType === "walletPass") {
-    if (!data) {
-      (_c = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _c.call(bridge, "fail", "pisell2.text.scan-global-failed");
-      return { status: "failed", reason: "invalid_data" };
-    }
     const snapshot = host.getOrderCustomerSnapshot();
     const scannedCustomerIsWalkIn = (0, import_cartView.isWalkInCustomer)(data);
+    const trySelectWalletAsset = async () => {
+      var _a2, _b2;
+      if (!host.scanWalletAsset)
+        return null;
+      const walletResult = await host.scanWalletAsset(scanCode).catch((error) => {
+        console.warn("[GlobalScan] Wallet asset lookup failed", error);
+        return null;
+      });
+      if (!walletResult)
+        return null;
+      if (walletResult.type !== "normalCode" || !walletResult.asset) {
+        return null;
+      }
+      if (walletResult.selected) {
+        (_a2 = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _a2.call(bridge, "success");
+        return { status: "success", kind: "promotion" };
+      }
+      (_b2 = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _b2.call(bridge, "fail", "pisell2.text.goodpass.code-invalid-cart");
+      return { status: "failed", reason: "invalid_data" };
+    };
     if ((0, import_cartView.isWalkInCustomer)(snapshot) || scannedCustomerIsWalkIn) {
+      const walletSelection2 = await trySelectWalletAsset();
+      if (walletSelection2)
+        return walletSelection2;
       if (!(bridge == null ? void 0 : bridge.applyPromotionCode)) {
         return { status: "failed", reason: "no_bridge" };
       }
@@ -118,6 +137,19 @@ async function applyGlobalScan(host, formatted, bridge) {
       return { status: "failed", reason: "invalid_data" };
     }
     host.setOrderCustomer(data);
+    await ((_c = host.refreshWalletAssets) == null ? void 0 : _c.call(host, { preserveSelection: false }));
+    const walletSelection = await trySelectWalletAsset();
+    if (walletSelection)
+      return walletSelection;
+    if (bridge == null ? void 0 : bridge.applyPromotionCode) {
+      const promotionResult = await bridge.applyPromotionCode(
+        scanCode,
+        Number((data == null ? void 0 : data.id) ?? (data == null ? void 0 : data.customer_id)) || void 0
+      );
+      if (promotionResult == null ? void 0 : promotionResult.isAvailable) {
+        return { status: "success", kind: "promotion" };
+      }
+    }
     (_d = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _d.call(bridge, "success", "pisell2.text.add-client-success");
     return { status: "success", kind: "customer" };
   }

package/lib/solution/BookingTicket/utils/scan/handleScan.d.ts

@@ -2,11 +2,9 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
- * @param localSearch 本地商品搜索
- * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;

package/lib/solution/BookingTicket/utils/scan/handleScan.js

@@ -102,14 +102,14 @@ var handleScanFn = (getRequestList, localSearch) => {
     }
   };
 };
-var handleGlobalScan = (request, localSearch, channel) => {
+var handleGlobalScan = (request, localSearch) => {
   const getRequestList = (value) => {
     let requestList = [];
     if (value.startsWith("WL")) {
       requestList = [(0, import_cloudSearch.searchWallet)(request, value)];
     } else {
       requestList = [
-        ...channel === "kiosk" ? [] : [(0, import_cloudSearch.searchOrder)(request, value)],
+        (0, import_cloudSearch.searchOrder)(request, value),
         (0, import_cloudSearch.searchWalletPass)(request, value),
         (0, import_cloudSearch.searchWallet)(request, value),
         (0, import_cloudSearch.searchProduct)(request, value)

package/lib/solution/BookingTicket/utils/weighingProductSku.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export declare function buildProductSkuFromCacheItem(cacheItem: Record<string, any> | null | undefined): Record<string, any> | undefined;

package/lib/solution/BookingTicket/utils/weighingProductSku.js

@@ -0,0 +1,63 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BookingTicket/utils/weighingProductSku.ts
+var weighingProductSku_exports = {};
+__export(weighingProductSku_exports, {
+  buildProductSkuFromCacheItem: () => buildProductSkuFromCacheItem
+});
+module.exports = __toCommonJS(weighingProductSku_exports);
+var WEIGHT_UNIT_MAP = {
+  KILOGRAMS: "kg",
+  GRAMS: "g",
+  POUNDS: "lb",
+  OUNCES: "oz"
+};
+function isRecord(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function buildProductSkuFromCacheItem(cacheItem) {
+  var _a, _b, _c, _d;
+  const currentSku = isRecord(cacheItem == null ? void 0 : cacheItem.product_sku) ? cacheItem.product_sku : void 0;
+  const weighing = isRecord((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.weighing) ? (_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.weighing : void 0;
+  const hasRuntimeWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1 && ((currentSku == null ? void 0 : currentSku.weight) !== void 0 || (currentSku == null ? void 0 : currentSku.net_weight) !== void 0 || (currentSku == null ? void 0 : currentSku.weight_source) !== void 0);
+  const isWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1;
+  if (!isWeighingSku && !weighing)
+    return void 0;
+  if (hasRuntimeWeighingSku)
+    return { ...currentSku };
+  if (!weighing)
+    return currentSku ? { ...currentSku } : void 0;
+  return {
+    ...currentSku || {},
+    open_sold_weight: 1,
+    unit_data_snapshot: weighing.scalePriceProduct,
+    unit: WEIGHT_UNIT_MAP[String(weighing.unit)] || weighing.unit,
+    unit_weight: weighing.unit_weight ?? "1.000",
+    unit_price: weighing.unit_price,
+    weight_source: weighing.mode,
+    tare_name: ((_c = weighing.tare) == null ? void 0 : _c.label) ?? "",
+    tare_weight: ((_d = weighing.tare) == null ? void 0 : _d.value) ?? 0,
+    weight: weighing.weight ?? 0,
+    net_weight: weighing.net_weight ?? 0
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildProductSkuFromCacheItem
+});

package/lib/solution/Sales/index.d.ts

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/lib/solution/Sales/index.js

@@ -39,6 +39,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 __reExport(Sales_exports, require("./types"), module.exports);
+var UNPAID_PAYMENT_STATUSES = /* @__PURE__ */ new Set(["unpaid", "partially_paid", "payment_processing"]);
 var SalesImpl = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
@@ -258,6 +259,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
+  isUnpaidBooking(booking) {
+    return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+  }
   countBookingOrders(bookings) {
     const orderIds = /* @__PURE__ */ new Set();
     bookings.forEach((booking) => {
@@ -631,9 +635,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
-    const unpaidBookingList = matchedBookingList.filter(
-      (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
-    );
+    const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
     const bookings = this.pickBookingsForCurrentPoint(
       current,
       this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)

package/lib/solution/ScanOrder/index.d.ts

@@ -1,9 +1,8 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
-import { BaseSalesImpl } from '../BaseSales';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderState, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult } from './types';
+import { BaseModule } from '../../modules/BaseModule';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
 import type { UpdateOrderProductParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
-import { RequestPlugin, WindowPlugin } from '../../plugins';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
@@ -16,16 +15,16 @@ interface ScanOrderItemRuleRuntimeConfig {
     submissionIndex?: number;
     custom?: Record<string, any>;
 }
-export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
+export declare class ScanOrderImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     isSolution: boolean;
-    protected initializeOptions: ModuleOptions;
-    protected store: ScanOrderState;
-    protected otherParams: Record<string, any>;
-    protected cacheId: string | undefined;
-    window: WindowPlugin;
-    request: RequestPlugin;
+    private initializeOptions;
+    private store;
+    private otherParams;
+    private cacheId;
+    private window;
+    private request;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -54,10 +53,9 @@ export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     private registerCustomerLoginListeners;
     private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
-    protected getRegisteredModuleNames(): readonly string[];
-    protected createSubModule(moduleName: string): Module | null;
     /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
     getCacheId(): string | undefined;
+    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -73,14 +71,12 @@ export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     };
     getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
     updateTempOrderNote(note: string): string;
-    updateTempOrderNote(note: string, sync: true): Promise<string>;
-    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
-        service_type: 'dine_in' | '';
+        service_type: 'dine_in';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
     setPickupRef(buzzer: string): string;
-    private ensureScanOrderTempOrder;
+    private ensureTempOrder;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
@@ -96,10 +92,7 @@ export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     }): Promise<void>;
     private findReservationRuleResource;
     private buildScanOrderResourceMetadata;
-    private prepareRetailAvailability;
     private buildSubmitPayloadEnhancer;
-    private isScanOrderMoreMode;
-    private submitScanOrderMore;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -124,10 +117,8 @@ export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
     private resolveResourceSelectType;
-    private fetchResourceOccupyDetailsByResourceId;
-    private resolveAdditionalOrderFromOccupyDetail;
-    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
-    restorePreviousOrderData(): Promise<void>;
+    private fetchResourceOccupyDetailByResourceId;
+    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';
@@ -150,9 +141,6 @@ export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     clearUIState(): void;
     setEntryPaxNumber(number: number): Promise<void>;
     getEntryPaxNumber(): number | null;
-    syncAdditionalOrderFromResource(resourceId?: string | null): Promise<ScanOrderSyncAdditionalOrderResult>;
-    getReservationResourceSelectType(): ScanOrderReservationResourceSelectInfo;
-    checkAllowAddItems(): ScanOrderAllowAddItemsInfo;
     getFulfillmentModes(): {
         enablePickup: boolean;
         enableTableService: boolean;