@pisell/pisellos 2.1.153 → 2.1.155

package/dist/solution/ScanOrder/utils.js

@@ -629,23 +629,55 @@ export function collectLinkProductIdsFromReservationRules(rules) {
 }
 
 /**
- * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
  */
-export function pickFirstDurationMinutesFromProducts(products) {
+export function findReservationRuleProductByResourceId(products, resourceId) {
+  var numericResourceId = Number(resourceId);
+  if (!Number.isFinite(numericResourceId) || numericResourceId <= 0) return undefined;
   var _iterator7 = _createForOfIteratorHelper(products),
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _product$duration;
+      var _product$product_reso;
       var product = _step7.value;
+      var resources = product === null || product === void 0 || (_product$product_reso = product.product_resource) === null || _product$product_reso === void 0 ? void 0 : _product$product_reso.resources;
+      if (!Array.isArray(resources)) continue;
+      var hasMatchedResource = resources.some(function (resource) {
+        var defaultResources = Array.isArray(resource === null || resource === void 0 ? void 0 : resource.default_resource) ? resource.default_resource : [];
+        var optionalResources = Array.isArray(resource === null || resource === void 0 ? void 0 : resource.optional_resource) ? resource.optional_resource : [];
+        return [].concat(_toConsumableArray(defaultResources), _toConsumableArray(optionalResources)).some(function (id) {
+          return Number(id) === numericResourceId;
+        });
+      });
+      if (hasMatchedResource) return product;
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  return undefined;
+}
+
+/**
+ * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ */
+export function pickFirstDurationMinutesFromProducts(products) {
+  var _iterator8 = _createForOfIteratorHelper(products),
+    _step8;
+  try {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var _product$duration;
+      var product = _step8.value;
       var value = product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.value;
       var n = Number(value);
       if (Number.isFinite(n) && n > 0) return Math.floor(n);
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator7.f();
+    _iterator8.f();
   }
   return undefined;
 }
@@ -675,11 +707,11 @@ export function computeResourceIsFull(params) {
   if (!Number.isFinite(totalCapacity) || totalCapacity <= 0) return false;
   var now = dayjs();
   var occupied = 0;
-  var _iterator8 = _createForOfIteratorHelper(capacityList || []),
-    _step8;
+  var _iterator9 = _createForOfIteratorHelper(capacityList || []),
+    _step9;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var slot = _step8.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var slot = _step9.value;
       var start = dayjs(slot === null || slot === void 0 ? void 0 : slot.start_at);
       var end = dayjs(slot === null || slot === void 0 ? void 0 : slot.end_at);
       if (!start.isValid() || !end.isValid()) continue;
@@ -689,9 +721,9 @@ export function computeResourceIsFull(params) {
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator8.f();
+    _iterator9.f();
   }
   return occupied >= totalCapacity;
 }
@@ -701,11 +733,11 @@ export function computeResourceIsFull(params) {
  * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
  */
 export function pickFirstCustomCapacityPaxBounds(products) {
-  var _iterator9 = _createForOfIteratorHelper(products),
-    _step9;
+  var _iterator10 = _createForOfIteratorHelper(products),
+    _step10;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var p = _step9.value;
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var p = _step10.value;
       var cap = p === null || p === void 0 ? void 0 : p.capacity;
       if (!cap || cap.type !== 'custom') continue;
       if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
@@ -724,9 +756,9 @@ export function pickFirstCustomCapacityPaxBounds(products) {
       if (out.min !== undefined || out.max !== undefined) return out;
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator9.f();
+    _iterator10.f();
   }
   return undefined;
 }
@@ -736,11 +768,11 @@ export function pickFirstCustomCapacityPaxBounds(products) {
  * 无匹配时返回 `undefined`，调用方应回退为 `0`。
  */
 export function pickFirstCustomCapacityDimensionId(products) {
-  var _iterator10 = _createForOfIteratorHelper(products),
-    _step10;
+  var _iterator11 = _createForOfIteratorHelper(products),
+    _step11;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var p = _step10.value;
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      var p = _step11.value;
       var cap = p === null || p === void 0 ? void 0 : p.capacity;
       if (!cap || cap.type !== 'custom') continue;
       if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
@@ -756,9 +788,9 @@ export function pickFirstCustomCapacityDimensionId(products) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator11.e(err);
   } finally {
-    _iterator10.f();
+    _iterator11.f();
   }
   return undefined;
 }

package/dist/solution/VenueBooking/index.d.ts

@@ -193,6 +193,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setUIState(key: string, value: any): void;
     getUIState<T = any>(key: string): T | undefined;
     deleteUIState(key: string): void;
+    setBookingHolder(bookingUid: string, holder: any): void;
     checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;

package/dist/solution/VenueBooking/index.js

@@ -3394,6 +3394,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
         this.writeUIStateBucket(bucket);
       }
     }
+  }, {
+    key: "setBookingHolder",
+    value: function setBookingHolder(bookingUid, holder) {
+      var _order$bookings;
+      var order = this.getTempOrder();
+      var booking = order === null || order === void 0 || (_order$bookings = order.bookings) === null || _order$bookings === void 0 ? void 0 : _order$bookings.find(function (b) {
+        var _b$metadata4;
+        return ((_b$metadata4 = b.metadata) === null || _b$metadata4 === void 0 ? void 0 : _b$metadata4.unique_identification_number) === bookingUid;
+      });
+      if (booking) {
+        booking.holder = holder;
+      }
+    }
 
     // ─── OpenData 可用性 ───
   }, {

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult, ScanOrderTempOrder } from './types';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult, ScanOrderTempOrder } from './types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -118,7 +118,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
     private resolveResourceSelectType;
-    private fetchResourceOccupyDetailByResourceId;
+    private fetchResourceOccupyDetailsByResourceId;
+    private resolveAdditionalOrderFromOccupyDetail;
     checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
@@ -142,6 +143,9 @@ export declare class ScanOrderImpl extends BaseModule 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;

package/lib/solution/ScanOrder/index.js

@@ -867,13 +867,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const ruleProduct = this.enabledReservationRuleProducts[0];
     const resourceState = this.store.resource;
     const resourceSelectType = resourceState == null ? void 0 : resourceState.resourceSelectType;
-    const resolveResourceCapacity = () => {
+    const resolveBookingCapacityValue = () => {
       var _a;
       if (resourceSelectType === "single") {
         const raw = (_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.capacity;
         const num = Number(raw);
         if (Number.isFinite(num) && num > 0)
-          return num;
+          return Math.max(1, Math.floor(num));
         return 1;
       }
       return 1;
@@ -892,8 +892,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         };
       }
       const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
-      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
-      const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
+      const hasExplicitCollectPax = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const bookingCapacityValue = resolveBookingCapacityValue();
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
           const original = value.original;
@@ -909,35 +909,42 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: resourceCapacityValue,
+        capacity: bookingCapacityValue,
         metadata: this.buildScanOrderResourceMetadata({
           resourceState,
           resourceName: mainField
         })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
-      const bookingCapacityValue = resourceCapacityValue;
       const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
-      const nextBookings = (payload.bookings || []).map((booking, idx) => ({
-        ...booking,
-        number: bookingCapacityValue,
-        appointment_status: "started",
-        metadata: {
-          ...booking.metadata || {},
-          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
-          ...resourceSelectType ? {
-            capacity: [
-              {
-                id: bookingCapacityDimensionId,
-                value: bookingCapacityValue,
-                name: ""
-              }
-            ]
-          } : {}
-        },
-        ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
-        ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
-      }));
+      const nextBookings = (payload.bookings || []).map((booking, idx) => {
+        const metadata = { ...booking.metadata || {} };
+        if (hasExplicitCollectPax) {
+          metadata.collect_pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax);
+        } else {
+          delete metadata.collect_pax;
+        }
+        return {
+          ...booking,
+          number: bookingCapacityValue,
+          appointment_status: "started",
+          metadata: {
+            ...metadata,
+            ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
+            ...resourceSelectType ? {
+              capacity: [
+                {
+                  id: bookingCapacityDimensionId,
+                  value: bookingCapacityValue,
+                  name: ""
+                }
+              ]
+            } : {}
+          },
+          ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
+          ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
+        };
+      });
       const nextProducts = [...payload.products || []];
       if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
         const sellingPrice = String(ruleProduct.price ?? "0.00");
@@ -974,10 +981,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (!this.store.order) {
         throw new Error("scanOrder解决方案需要 order 模块支持");
       }
-      const pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(this.store.entryPaxNumber);
-      this.store.entryPaxNumber = pax;
       const tempOrderForSubmit = this.store.order.ensureTempOrder();
-      tempOrderForSubmit.metadata = { ...tempOrderForSubmit.metadata, collect_pax: pax };
       tempOrderForSubmit.delivery_type = "shop_service";
       const resourceTableName = (_b = (_a = this.store.resource) == null ? void 0 : _a.table_form_record) == null ? void 0 : _b.name;
       if (resourceTableName && typeof resourceTableName === "object") {
@@ -1524,8 +1528,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const matched = resources.find((r) => Number(r == null ? void 0 : r.id) === numericFormId);
     return matched == null ? void 0 : matched.type;
   }
-  async fetchResourceOccupyDetailByResourceId(resourceId) {
-    var _a, _b, _c, _d;
+  async fetchResourceOccupyDetailsByResourceId(resourceId) {
+    var _a, _b, _c;
     const formRecordId = Number(resourceId);
     if (!Number.isFinite(formRecordId) || formRecordId <= 0) {
       throw new Error(`[ScanOrder] 非法桌台 resourceId: ${resourceId}`);
@@ -1547,13 +1551,57 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     if (!(response == null ? void 0 : response.status)) {
       throw new Error((response == null ? void 0 : response.message) || "获取资源占用详情失败");
     }
-    return ((_d = (_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) == null ? void 0 : _d[0]) ?? null;
+    return ((_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) ?? [];
+  }
+  resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType, allowAddItems) {
+    const currentOrderId = (0, import_utils.toPositiveString)(detail == null ? void 0 : detail.order_id);
+    if (currentOrderId) {
+      return {
+        matched: true,
+        order_id: currentOrderId
+      };
+    }
+    const orderListIds = (Array.isArray(detail == null ? void 0 : detail.order_list) ? (detail == null ? void 0 : detail.order_list) || [] : []).map((order) => (0, import_utils.toPositiveString)(order == null ? void 0 : order.id)).filter(Boolean);
+    if (resourceSelectType !== "single") {
+      return {
+        matched: false,
+        reason: "no_order"
+      };
+    }
+    if (!orderListIds.length) {
+      return {
+        matched: false,
+        reason: "no_order"
+      };
+    }
+    if (!allowAddItems) {
+      return {
+        matched: false,
+        reason: "add_items_disabled"
+      };
+    }
+    if (orderListIds.length === 1) {
+      return {
+        matched: true,
+        order_id: orderListIds[0]
+      };
+    }
+    if (orderListIds.length > 1) {
+      return {
+        matched: false,
+        reason: "multiple_orders"
+      };
+    }
+    return {
+      matched: false,
+      reason: "no_order"
+    };
   }
   // 检测当前链接是否可用
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const normalizedResourceId = String(resourceId ?? "").trim();
     this.logMethodStart("checkResourceAvailable", {
       resourceId: normalizedResourceId
@@ -1645,14 +1693,19 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId
       });
       if (Array.isArray(loaded)) {
-        this.enabledReservationRuleProducts = loaded;
-        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(loaded);
+        const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
+          loaded,
+          normalizedResourceId
+        );
+        const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+        this.enabledReservationRuleProducts = ruleProductsForResource;
+        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
         if (occupancyMinutes !== void 0) {
           tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
         }
-        if ((0, import_utils.hasCustomCapacityProduct)(loaded)) {
+        if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
           pendingRequestEntryPax = 1;
-          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(loaded);
+          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
           if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
             pendingRequestPaxMin = paxBounds.min;
           if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
@@ -1669,15 +1722,54 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           cacheId: this.cacheId
         });
       }
-      const occupyDetail = await this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
+      const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
+      const occupyDetail = occupyDetails[0] ?? null;
       const resourceSelectType = this.resolveResourceSelectType(
         (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id)
       );
+      const allowAddItems = (0, import_utils.toBoolean)(dineInConfig == null ? void 0 : dineInConfig["sale.allow_add_items"]);
+      const additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(
+        occupyDetail,
+        resourceSelectType,
+        allowAddItems
+      );
+      if (additionalOrderResult.reason === "multiple_orders") {
+        const multipleOrdersState = {
+          ...this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId),
+          mode: "multiple_orders"
+        };
+        this.store.resource = multipleOrdersState;
+        const availabilityInfo2 = {
+          mode: "multiple_orders",
+          deskmate_valid: multipleOrdersState.deskmate_valid,
+          relation_id: multipleOrdersState.relationId,
+          table_form_id: multipleOrdersState.tableFormId,
+          table_form_record: multipleOrdersState.table_form_record
+        };
+        this.logMethodSuccess("checkResourceAvailable", {
+          resourceId: normalizedResourceId,
+          mode: availabilityInfo2.mode,
+          orderListCount: ((_e = occupyDetail == null ? void 0 : occupyDetail.order_list) == null ? void 0 : _e.length) || 0,
+          resourceSelectType
+        });
+        return availabilityInfo2;
+      }
       const resourceState = this.normalizeResourceState(
         occupyDetail,
         resourceSelectType,
         hasOrderId
       );
+      const additionalOrderId = additionalOrderResult.order_id;
+      if (additionalOrderId) {
+        resourceState.mode = "additional_order";
+        resourceState.order_id = additionalOrderId;
+      } else if (additionalOrderResult.reason === "add_items_disabled") {
+        resourceState.mode = "resource_busy";
+        resourceState.order_id = "0";
+      } else if (resourceSelectType === "multiple" && resourceState.isFull) {
+        resourceState.mode = "resource_busy";
+        resourceState.order_id = "0";
+      }
       this.store.resource = resourceState;
       if (pendingRequestEntryPax !== void 0) {
         this.store.resource.requestEntryPax = pendingRequestEntryPax;
@@ -1695,34 +1787,35 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         table_form_id: resourceState.tableFormId,
         deskmate_valid: resourceState.deskmate_valid,
         table_form_record: resourceState.table_form_record,
-        policy: (_e = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _e.policy,
-        partyroom_booking: (_f = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _f.partyroom_booking,
+        policy: (_f = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _f.policy,
+        partyroom_booking: (_g = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _g.partyroom_booking,
         ...this.store.resource.requestEntryPax !== void 0 ? { requestEntryPax: this.store.resource.requestEntryPax } : {},
         ...this.store.resource.requestPaxMin !== void 0 ? { requestPaxMin: this.store.resource.requestPaxMin } : {},
         ...this.store.resource.requestPaxMax !== void 0 ? { requestPaxMax: this.store.resource.requestPaxMax } : {}
       };
-      tempOrder.relation_id = normalizedResourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
+      tempOrder.relation_id = normalizedResourceId || ((_h = this.otherParams) == null ? void 0 : _h.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = normalizedResourceId;
-      (_h = this.store.order) == null ? void 0 : _h.persistTempOrder();
+      (_i = this.store.order) == null ? void 0 : _i.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
       }
-      if (availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code") {
-        tempOrder.order_id = resourceState.lastOrderId;
+      const isAdditionalOrderMode = availabilityInfo.mode === "additional_order" || availabilityInfo.mode === "additional_order_with_code";
+      if (isAdditionalOrderMode) {
+        tempOrder.order_id = additionalOrderId;
       }
       if (tempOrder.order_id) {
-        const res = await ((_i = this.store.order) == null ? void 0 : _i.getOrderInfoByRemote(tempOrder.order_id));
-        const entryPaxNumber = (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.bookings) == null ? void 0 : _k.find((p) => {
+        const res = await ((_j = this.store.order) == null ? void 0 : _j.getOrderInfoByRemote(tempOrder.order_id));
+        const entryPaxNumber = (_n = (_m = (_l = (_k = res == null ? void 0 : res.data) == null ? void 0 : _k.bookings) == null ? void 0 : _l.find((p) => {
           var _a2;
           return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
-        })) == null ? void 0 : _l.metadata) == null ? void 0 : _m.collect_pax;
+        })) == null ? void 0 : _m.metadata) == null ? void 0 : _n.collect_pax;
         if (entryPaxNumber) {
           await this.setEntryPaxNumber(entryPaxNumber);
         }
       }
-      const lastOrderInfo = (_o = (_n = this.store.order) == null ? void 0 : _n.getLastOrderInfo) == null ? void 0 : _o.call(_n);
-      const historicalItems = hasOrderId && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
+      const lastOrderInfo = (_p = (_o = this.store.order) == null ? void 0 : _o.getLastOrderInfo) == null ? void 0 : _p.call(_o);
+      const historicalItems = isAdditionalOrderMode && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
         if (typeof (p == null ? void 0 : p.product_id) !== "number")
           return acc;
         acc.push({
@@ -1733,8 +1826,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_p = this.otherParams) == null ? void 0 : _p.businessCode,
-        submissionIndex: hasOrderId ? 1 : 0,
+        serviceType: (_q = this.otherParams) == null ? void 0 : _q.businessCode,
+        submissionIndex: isAdditionalOrderMode ? 1 : 0,
         historicalItems
       });
       if (outsideOperatingHours && closedBehaviorValue === "show_menu_disabled") {
@@ -1907,6 +2000,83 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   getEntryPaxNumber() {
     return this.store.entryPaxNumber;
   }
+  async syncAdditionalOrderFromResource(resourceId) {
+    var _a, _b, _c, _d, _e, _f;
+    const tempOrder = this.ensureTempOrder();
+    const normalizedResourceId = String(
+      resourceId ?? tempOrder.resource_id ?? ((_a = this.store.resource) == null ? void 0 : _a.relationId) ?? ((_b = this.store.resource) == null ? void 0 : _b.relation_id) ?? ""
+    ).trim();
+    this.logMethodStart("syncAdditionalOrderFromResource", {
+      resourceId: normalizedResourceId
+    });
+    if (!normalizedResourceId) {
+      const result2 = {
+        matched: false,
+        reason: "missing_resource_id"
+      };
+      this.logMethodSuccess("syncAdditionalOrderFromResource", result2);
+      return result2;
+    }
+    const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
+    const occupyDetail = occupyDetails[0] ?? null;
+    const resourceSelectType = ((_c = this.store.resource) == null ? void 0 : _c.resourceSelectType) || this.resolveResourceSelectType((0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id));
+    const allowAddItems = (0, import_utils.toBoolean)(
+      (_e = (_d = this.otherParams) == null ? void 0 : _d.dineInConfig) == null ? void 0 : _e["sale.allow_add_items"]
+    );
+    const result = this.resolveAdditionalOrderFromOccupyDetail(
+      occupyDetail,
+      resourceSelectType,
+      allowAddItems
+    );
+    if (!result.matched || !result.order_id) {
+      this.logMethodSuccess("syncAdditionalOrderFromResource", {
+        ...result,
+        resourceId: normalizedResourceId,
+        resourceSelectType,
+        allowAddItems
+      });
+      return result;
+    }
+    tempOrder.order_id = result.order_id;
+    tempOrder.resource_id = normalizedResourceId;
+    tempOrder.relation_id = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_record_id) || normalizedResourceId || tempOrder.relation_id;
+    tempOrder.table_form_id = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id) || tempOrder.table_form_id;
+    (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
+    this.logMethodSuccess("syncAdditionalOrderFromResource", {
+      ...result,
+      resourceId: normalizedResourceId,
+      resourceSelectType,
+      allowAddItems
+    });
+    return result;
+  }
+  // 读取预约规则商品的资源选择类型：single=单个预约，multiple=多个预约，capacity=容量型预约
+  // 依赖 checkResourceAvailable 已根据预约规则商品与 occupy-detail 的 form_id 计算并缓存 store.resource
+  getReservationResourceSelectType() {
+    var _a;
+    this.logMethodStart("getReservationResourceSelectType");
+    const resourceSelectType = (_a = this.store.resource) == null ? void 0 : _a.resourceSelectType;
+    const result = {
+      ...resourceSelectType ? { resourceSelectType } : {},
+      isSingleReservation: resourceSelectType === "single",
+      isMultipleReservation: resourceSelectType === "multiple",
+      isCapacityReservation: resourceSelectType === "capacity"
+    };
+    this.logMethodSuccess("getReservationResourceSelectType", result);
+    return result;
+  }
+  // 判定后台是否开启允许加餐
+  // 依赖 checkResourceAvailable 已缓存的 dineInConfig
+  checkAllowAddItems() {
+    var _a;
+    this.logMethodStart("checkAllowAddItems");
+    const dineInConfig = ((_a = this.otherParams) == null ? void 0 : _a.dineInConfig) || {};
+    const result = {
+      enabled: (0, import_utils.toBoolean)(dineInConfig["sale.allow_add_items"])
+    };
+    this.logMethodSuccess("checkAllowAddItems", result);
+    return result;
+  }
   // 读取取餐/送餐开关
   // 依赖 checkResourceAvailable 已缓存的 dineInConfig
   getFulfillmentModes() {