@pisell/pisellos 0.0.552 → 0.0.554

package/dist/modules/Order/index.d.ts

@@ -84,7 +84,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/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/dist/solution/ScanOrder/index.js

@@ -2569,9 +2569,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       return matched === null || matched === void 0 ? void 0 : matched.type;
     }
   }, {
-    key: "fetchResourceOccupyDetailByResourceId",
+    key: "fetchResourceOccupyDetailsByResourceId",
     value: function () {
-      var _fetchResourceOccupyDetailByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
+      var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
         var _this$otherParams10, _this$otherParams10$g, _response$data$occupy, _response$data;
         var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
@@ -2607,18 +2607,56 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error((response === null || response === void 0 ? void 0 : response.message) || '获取资源占用详情失败');
             case 11:
-              return _context36.abrupt("return", (_response$data$occupy = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.occupy_details) === null || _response$data === void 0 ? void 0 : _response$data[0]) !== null && _response$data$occupy !== void 0 ? _response$data$occupy : null);
+              return _context36.abrupt("return", (_response$data$occupy = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.occupy_details) !== null && _response$data$occupy !== void 0 ? _response$data$occupy : []);
             case 12:
             case "end":
               return _context36.stop();
           }
         }, _callee36, this);
       }));
-      function fetchResourceOccupyDetailByResourceId(_x18) {
-        return _fetchResourceOccupyDetailByResourceId.apply(this, arguments);
+      function fetchResourceOccupyDetailsByResourceId(_x18) {
+        return _fetchResourceOccupyDetailsByResourceId.apply(this, arguments);
       }
-      return fetchResourceOccupyDetailByResourceId;
-    }() // 检测当前链接是否可用
+      return fetchResourceOccupyDetailsByResourceId;
+    }()
+  }, {
+    key: "resolveAdditionalOrderFromOccupyDetail",
+    value: function resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType) {
+      var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
+      if (currentOrderId) {
+        return {
+          matched: true,
+          order_id: currentOrderId
+        };
+      }
+      if (resourceSelectType !== 'single') {
+        return {
+          matched: false,
+          reason: 'no_order'
+        };
+      }
+      var orderListIds = (Array.isArray(detail === null || detail === void 0 ? void 0 : detail.order_list) ? (detail === null || detail === void 0 ? void 0 : detail.order_list) || [] : []).map(function (order) {
+        return toPositiveString(order === null || order === void 0 ? void 0 : order.id);
+      }).filter(Boolean);
+      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，如果是的话，后续的流程会走加单
   }, {
@@ -2633,6 +2671,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           _this$otherParams12,
           _this$otherParams13,
           _this$otherParams13$g,
+          _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
           _this$otherParams14,
@@ -2666,10 +2705,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           occupancyMinutes,
           paxBounds,
           error,
+          occupyDetails,
           occupyDetail,
           resourceSelectType,
+          additionalOrderResult,
+          _occupyDetail$order_l,
+          multipleOrdersState,
+          _availabilityInfo,
           resourceState,
+          additionalOrderId,
           availabilityInfo,
+          isAdditionalOrderMode,
           _this$store$order7,
           _res$data,
           res,
@@ -2828,15 +2874,45 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
 
-              // Step2: 请求新的资源占用详情接口
+              // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
               _context37.next = 50;
-              return this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
+              return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
             case 50:
-              occupyDetail = _context37.sent;
-              // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
+              occupyDetails = _context37.sent;
+              occupyDetail = (_occupyDetails$ = occupyDetails[0]) !== null && _occupyDetails$ !== void 0 ? _occupyDetails$ : null; // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
-              resourceSelectType = this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id)); // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
+              resourceSelectType = this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
+              additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType);
+              if (!(additionalOrderResult.reason === 'multiple_orders')) {
+                _context37.next = 60;
+                break;
+              }
+              multipleOrdersState = _objectSpread(_objectSpread({}, this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId)), {}, {
+                mode: 'multiple_orders'
+              });
+              this.store.resource = multipleOrdersState;
+              _availabilityInfo = {
+                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: _availabilityInfo.mode,
+                orderListCount: (occupyDetail === null || occupyDetail === void 0 || (_occupyDetail$order_l = occupyDetail.order_list) === null || _occupyDetail$order_l === void 0 ? void 0 : _occupyDetail$order_l.length) || 0,
+                resourceSelectType: resourceSelectType
+              });
+              return _context37.abrupt("return", _availabilityInfo);
+            case 60:
+              // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
               resourceState = this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId);
+              additionalOrderId = additionalOrderResult.order_id;
+              if (additionalOrderId) {
+                resourceState.mode = 'additional_order';
+                resourceState.order_id = additionalOrderId;
+              }
               this.store.resource = resourceState;
 
               // Step5: 把预约规则商品阶段暂存的 requestEntryPax 等注入 store.resource
@@ -2872,23 +2948,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 65;
+                _context37.next = 75;
                 break;
               }
-              _context37.next = 65;
+              _context37.next = 75;
               return this.addNewOrder();
-            case 65:
-              // 如果是加单模式，tempOrder 里 需要记录 lastOrderId，提交的时候走加单接口
-              if (availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code') {
-                tempOrder.order_id = resourceState.lastOrderId;
+            case 75:
+              isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
+              if (isAdditionalOrderMode) {
+                tempOrder.order_id = additionalOrderId;
               }
               if (!tempOrder.order_id) {
-                _context37.next = 74;
+                _context37.next = 85;
                 break;
               }
-              _context37.next = 69;
+              _context37.next = 80;
               return (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getOrderInfoByRemote(tempOrder.order_id);
-            case 69:
+            case 80:
               res = _context37.sent;
               // 找到下单的时候输入的 entryPaxNumber
               entryPaxNumber = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.bookings) === null || _res$data === void 0 || (_res$data = _res$data.find(function (p) {
@@ -2896,14 +2972,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 return (_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.collect_pax;
               })) === null || _res$data === void 0 || (_res$data = _res$data.metadata) === null || _res$data === void 0 ? void 0 : _res$data.collect_pax;
               if (!entryPaxNumber) {
-                _context37.next = 74;
+                _context37.next = 85;
                 break;
               }
-              _context37.next = 74;
+              _context37.next = 85;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 74:
+            case 85:
               lastOrderInfo = (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 || (_this$store$order8$ge = _this$store$order8.getLastOrderInfo) === null || _this$store$order8$ge === void 0 ? void 0 : _this$store$order8$ge.call(_this$store$order8);
-              historicalItems = hasOrderId && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
+              historicalItems = isAdditionalOrderMode && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
                 if (typeof (p === null || p === void 0 ? void 0 : p.product_id) !== 'number') return acc;
                 acc.push(_objectSpread({
                   product_id: p.product_id,
@@ -2913,13 +2989,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 78;
+              _context37.next = 89;
               return this.setItemRuleRuntimeConfig({
                 serviceType: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode,
-                submissionIndex: hasOrderId ? 1 : 0,
+                submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 78:
+            case 89:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -2941,18 +3017,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 83:
-              _context37.prev = 83;
+            case 94:
+              _context37.prev = 94;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 87:
+            case 98:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 83]]);
+        }, _callee37, this, [[3, 94]]);
       }));
       function checkResourceAvailable(_x19) {
         return _checkResourceAvailable.apply(this, arguments);
@@ -3214,15 +3290,110 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     value: function getEntryPaxNumber() {
       return this.store.entryPaxNumber;
     }
+  }, {
+    key: "syncAdditionalOrderFromResource",
+    value: function () {
+      var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(resourceId) {
+        var _ref10, _ref11, _ref12, _this$store$resource2, _this$store$resource3, _occupyDetails$2, _this$store$resource4, _this$store$order9;
+        var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, result;
+        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              normalizedResourceId = String((_ref10 = (_ref11 = (_ref12 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref12 !== void 0 ? _ref12 : (_this$store$resource2 = this.store.resource) === null || _this$store$resource2 === void 0 ? void 0 : _this$store$resource2.relationId) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource3 = this.store.resource) === null || _this$store$resource3 === void 0 ? void 0 : _this$store$resource3.relation_id) !== null && _ref10 !== void 0 ? _ref10 : '').trim();
+              this.logMethodStart('syncAdditionalOrderFromResource', {
+                resourceId: normalizedResourceId
+              });
+              if (normalizedResourceId) {
+                _context42.next = 7;
+                break;
+              }
+              _result = {
+                matched: false,
+                reason: 'missing_resource_id'
+              };
+              this.logMethodSuccess('syncAdditionalOrderFromResource', _result);
+              return _context42.abrupt("return", _result);
+            case 7:
+              _context42.next = 9;
+              return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
+            case 9:
+              occupyDetails = _context42.sent;
+              occupyDetail = (_occupyDetails$2 = occupyDetails[0]) !== null && _occupyDetails$2 !== void 0 ? _occupyDetails$2 : null;
+              resourceSelectType = ((_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
+              result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType);
+              if (!(!result.matched || !result.order_id)) {
+                _context42.next = 16;
+                break;
+              }
+              this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
+                resourceId: normalizedResourceId,
+                resourceSelectType: resourceSelectType
+              }));
+              return _context42.abrupt("return", result);
+            case 16:
+              tempOrder.order_id = result.order_id;
+              tempOrder.resource_id = normalizedResourceId;
+              tempOrder.relation_id = toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_record_id) || normalizedResourceId || tempOrder.relation_id;
+              tempOrder.table_form_id = toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id) || tempOrder.table_form_id;
+              (_this$store$order9 = this.store.order) === null || _this$store$order9 === void 0 || _this$store$order9.persistTempOrder();
+              this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
+                resourceId: normalizedResourceId,
+                resourceSelectType: resourceSelectType
+              }));
+              return _context42.abrupt("return", result);
+            case 23:
+            case "end":
+              return _context42.stop();
+          }
+        }, _callee42, this);
+      }));
+      function syncAdditionalOrderFromResource(_x22) {
+        return _syncAdditionalOrderFromResource.apply(this, arguments);
+      }
+      return syncAdditionalOrderFromResource;
+    }() // 读取预约规则商品的资源选择类型：single=单个预约，multiple=多个预约，capacity=容量型预约
+    // 依赖 checkResourceAvailable 已根据预约规则商品与 occupy-detail 的 form_id 计算并缓存 store.resource
+  }, {
+    key: "getReservationResourceSelectType",
+    value: function getReservationResourceSelectType() {
+      var _this$store$resource5;
+      this.logMethodStart('getReservationResourceSelectType');
+      var resourceSelectType = (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.resourceSelectType;
+      var result = _objectSpread(_objectSpread({}, resourceSelectType ? {
+        resourceSelectType: resourceSelectType
+      } : {}), {}, {
+        isSingleReservation: resourceSelectType === 'single',
+        isMultipleReservation: resourceSelectType === 'multiple',
+        isCapacityReservation: resourceSelectType === 'capacity'
+      });
+      this.logMethodSuccess('getReservationResourceSelectType', result);
+      return result;
+    }
+
+    // 判定后台是否开启允许加餐
+    // 依赖 checkResourceAvailable 已缓存的 dineInConfig
+  }, {
+    key: "checkAllowAddItems",
+    value: function checkAllowAddItems() {
+      var _this$otherParams17;
+      this.logMethodStart('checkAllowAddItems');
+      var dineInConfig = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.dineInConfig) || {};
+      var result = {
+        enabled: toBoolean(dineInConfig['sale.allow_add_items'])
+      };
+      this.logMethodSuccess('checkAllowAddItems', result);
+      return result;
+    }
 
     // 读取取餐/送餐开关
     // 依赖 checkResourceAvailable 已缓存的 dineInConfig
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams17;
+      var _this$otherParams18;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3236,9 +3407,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams18;
+      var _this$otherParams19;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';

package/dist/solution/ScanOrder/types.d.ts

@@ -186,7 +186,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -229,6 +229,10 @@ export interface ScanOrderResourceOccupyDetail {
     form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
+    order_list?: Array<{
+        id?: number | string | null;
+        [key: string]: any;
+    }> | null;
     resource_capacity?: ScanOrderResourceCapacity[] | null;
     form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
@@ -242,6 +246,21 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
     } | null;
 }
 export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
+export interface ScanOrderReservationResourceSelectInfo {
+    resourceSelectType?: ScanOrderResourceSelectType;
+    isSingleReservation: boolean;
+    isMultipleReservation: boolean;
+    isCapacityReservation: boolean;
+}
+export interface ScanOrderAllowAddItemsInfo {
+    enabled: boolean;
+}
+export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'invalid_order_id';
+export interface ScanOrderSyncAdditionalOrderResult {
+    matched: boolean;
+    order_id?: string;
+    reason?: ScanOrderSyncAdditionalOrderReason;
+}
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     relationId?: string;
     tableFormId?: string;

package/lib/modules/Order/index.d.ts

@@ -84,7 +84,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -1524,8 +1524,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 +1547,45 @@ 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) {
+    const currentOrderId = (0, import_utils.toPositiveString)(detail == null ? void 0 : detail.order_id);
+    if (currentOrderId) {
+      return {
+        matched: true,
+        order_id: currentOrderId
+      };
+    }
+    if (resourceSelectType !== "single") {
+      return {
+        matched: false,
+        reason: "no_order"
+      };
+    }
+    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 (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
@@ -1669,15 +1701,46 @@ 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 additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(
+        occupyDetail,
+        resourceSelectType
+      );
+      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;
+      }
       this.store.resource = resourceState;
       if (pendingRequestEntryPax !== void 0) {
         this.store.resource.requestEntryPax = pendingRequestEntryPax;
@@ -1695,34 +1758,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 +1797,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 +1971,77 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   getEntryPaxNumber() {
     return this.store.entryPaxNumber;
   }
+  async syncAdditionalOrderFromResource(resourceId) {
+    var _a, _b, _c, _d;
+    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 result = this.resolveAdditionalOrderFromOccupyDetail(
+      occupyDetail,
+      resourceSelectType
+    );
+    if (!result.matched || !result.order_id) {
+      this.logMethodSuccess("syncAdditionalOrderFromResource", {
+        ...result,
+        resourceId: normalizedResourceId,
+        resourceSelectType
+      });
+      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;
+    (_d = this.store.order) == null ? void 0 : _d.persistTempOrder();
+    this.logMethodSuccess("syncAdditionalOrderFromResource", {
+      ...result,
+      resourceId: normalizedResourceId,
+      resourceSelectType
+    });
+    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() {

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

@@ -186,7 +186,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -229,6 +229,10 @@ export interface ScanOrderResourceOccupyDetail {
     form_id?: number | string | null;
     order_id?: number | string | null;
     last_order_id?: number | string | null;
+    order_list?: Array<{
+        id?: number | string | null;
+        [key: string]: any;
+    }> | null;
     resource_capacity?: ScanOrderResourceCapacity[] | null;
     form_record?: ScanOrderTableFormRecord | null;
     [key: string]: any;
@@ -242,6 +246,21 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
     } | null;
 }
 export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
+export interface ScanOrderReservationResourceSelectInfo {
+    resourceSelectType?: ScanOrderResourceSelectType;
+    isSingleReservation: boolean;
+    isMultipleReservation: boolean;
+    isCapacityReservation: boolean;
+}
+export interface ScanOrderAllowAddItemsInfo {
+    enabled: boolean;
+}
+export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'invalid_order_id';
+export interface ScanOrderSyncAdditionalOrderResult {
+    matched: boolean;
+    order_id?: string;
+    reason?: ScanOrderSyncAdditionalOrderReason;
+}
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     relationId?: string;
     tableFormId?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.552",
+  "version": "0.0.554",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",