@pisell/pisellos 2.1.154 → 2.1.156

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

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

@@ -1411,13 +1411,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceState = this.store.resource;
       var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
 
-      // ScanOrder 的 booking 容量只由预约规则决定：single 占用整张桌台，multiple 占用 1 个容量位。
-      var resolveBookingCapacityValue = function resolveBookingCapacityValue() {
+      // 无 collect_pax 时的资源占用兜底：single 独占整张桌台，其余模式占 1 个容量位。
+      var resolveResourceCapacity = function resolveResourceCapacity() {
         if (resourceSelectType === 'single') {
           var _resourceState$table_;
           var raw = resourceState === null || resourceState === void 0 || (_resourceState$table_ = resourceState.table_form_record) === null || _resourceState$table_ === void 0 ? void 0 : _resourceState$table_.capacity;
           var num = Number(raw);
-          if (Number.isFinite(num) && num > 0) return Math.max(1, Math.floor(num));
+          if (Number.isFinite(num) && num > 0) return num;
           return 1;
         }
         return 1;
@@ -1435,8 +1435,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }
         var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
-        var hasExplicitCollectPax = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
-        var bookingCapacityValue = resolveBookingCapacityValue();
+        var hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
+        var resourceCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
         var pickOriginal = function pickOriginal(value) {
           if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
             var original = value.original;
@@ -1452,25 +1452,21 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           main_field: mainField,
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
-          capacity: bookingCapacityValue,
+          capacity: resourceCapacityValue,
           metadata: _this5.buildScanOrderResourceMetadata({
             resourceState: resourceState,
             resourceName: mainField
           })
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
+        // 有 collect_pax 时 booking/resource capacity 与 number 都代表本次 pax；否则使用资源占用兜底值。
+        var bookingCapacityValue = resourceCapacityValue;
         var bookingCapacityDimensionId = (_pickFirstCustomCapac = pickFirstCustomCapacityDimensionId(_this5.enabledReservationRuleProducts)) !== null && _pickFirstCustomCapac !== void 0 ? _pickFirstCustomCapac : 0;
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
-          var metadata = _objectSpread({}, booking.metadata || {});
-          if (hasExplicitCollectPax) {
-            metadata.collect_pax = normalizeSubmitCollectPaxValue(rawCollectPax);
-          } else {
-            delete metadata.collect_pax;
-          }
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {
             number: bookingCapacityValue,
             appointment_status: 'started',
-            metadata: _objectSpread(_objectSpread(_objectSpread({}, metadata), resourceSelectType ? {
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, booking.metadata || {}), resourceSelectType ? {
               resource_select_type: resourceSelectType
             } : {}), resourceSelectType ? {
               capacity: [{
@@ -1520,7 +1516,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitScanOrder",
     value: function () {
       var _submitScanOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        var _this$store$resource, _this$otherParams5, _this$otherParams6, _this$otherParams7, _this$otherParams8, _tempOrder$products, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
+        var _this$store$resource, _this$otherParams5, _this$otherParams6, _this$otherParams7, _this$otherParams8, _tempOrder$products, pax, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1535,7 +1531,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('scanOrder解决方案需要 order 模块支持');
             case 6:
+              pax = normalizeSubmitCollectPaxValue(this.store.entryPaxNumber);
+              this.store.entryPaxNumber = pax;
               tempOrderForSubmit = this.store.order.ensureTempOrder();
+              tempOrderForSubmit.metadata = _objectSpread(_objectSpread({}, tempOrderForSubmit.metadata), {}, {
+                collect_pax: pax
+              });
               tempOrderForSubmit.delivery_type = 'shop_service';
               resourceTableName = (_this$store$resource = this.store.resource) === null || _this$store$resource === void 0 || (_this$store$resource = _this$store$resource.table_form_record) === null || _this$store$resource === void 0 ? void 0 : _this$store$resource.name;
               if (resourceTableName && _typeof(resourceTableName) === 'object') {
@@ -1545,7 +1546,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               this.store.order.persistTempOrder();
               enhancePayload = this.buildSubmitPayloadEnhancer();
-              _context18.next = 14;
+              _context18.next = 17;
               return this.store.order.submitTempOrder({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform,
@@ -1554,23 +1555,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 type: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.type,
                 enhancePayload: enhancePayload
               });
-            case 14:
+            case 17:
               result = _context18.sent;
               tempOrder = this.store.order.getTempOrder();
               this.logMethodSuccess('submitScanOrder', {
                 productCount: (tempOrder === null || tempOrder === void 0 || (_tempOrder$products = tempOrder.products) === null || _tempOrder$products === void 0 ? void 0 : _tempOrder$products.length) || 0
               });
               return _context18.abrupt("return", result);
-            case 20:
-              _context18.prev = 20;
+            case 23:
+              _context18.prev = 23;
               _context18.t0 = _context18["catch"](1);
               this.logMethodError('submitScanOrder', _context18.t0);
               throw _context18.t0;
-            case 24:
+            case 27:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[1, 20]]);
+        }, _callee18, this, [[1, 23]]);
       }));
       function submitScanOrder() {
         return _submitScanOrder.apply(this, arguments);
@@ -2568,9 +2569,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       return matched === null || matched === void 0 ? void 0 : matched.type;
     }
   }, {
-    key: "fetchResourceOccupyDetailsByResourceId",
+    key: "fetchResourceOccupyDetailByResourceId",
     value: function () {
-      var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
+      var _fetchResourceOccupyDetailByResourceId = _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) {
@@ -2606,68 +2607,18 @@ 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 ? void 0 : _response$data.occupy_details) !== null && _response$data$occupy !== void 0 ? _response$data$occupy : []);
+              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);
             case 12:
             case "end":
               return _context36.stop();
           }
         }, _callee36, this);
       }));
-      function fetchResourceOccupyDetailsByResourceId(_x18) {
-        return _fetchResourceOccupyDetailsByResourceId.apply(this, arguments);
-      }
-      return fetchResourceOccupyDetailsByResourceId;
-    }()
-  }, {
-    key: "resolveAdditionalOrderFromOccupyDetail",
-    value: function resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType, allowAddItems) {
-      var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
-      if (currentOrderId) {
-        return {
-          matched: true,
-          order_id: currentOrderId
-        };
-      }
-      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 (resourceSelectType !== 'single') {
-        return {
-          matched: false,
-          reason: 'no_order'
-        };
-      }
-      if (!orderListIds.length) {
-        return {
-          matched: false,
-          reason: 'no_order'
-        };
+      function fetchResourceOccupyDetailByResourceId(_x18) {
+        return _fetchResourceOccupyDetailByResourceId.apply(this, arguments);
       }
-      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'
-      };
-    }
-
-    // 检测当前链接是否可用
+      return fetchResourceOccupyDetailByResourceId;
+    }() // 检测当前链接是否可用
     // 通过 resource_id + 店铺配置
     // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   }, {
@@ -2682,7 +2633,6 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           _this$otherParams12,
           _this$otherParams13,
           _this$otherParams13$g,
-          _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
           _this$otherParams14,
@@ -2716,18 +2666,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           occupancyMinutes,
           paxBounds,
           error,
-          occupyDetails,
           occupyDetail,
           resourceSelectType,
-          allowAddItems,
-          additionalOrderResult,
-          _occupyDetail$order_l,
-          multipleOrdersState,
-          _availabilityInfo,
           resourceState,
-          additionalOrderId,
           availabilityInfo,
-          isAdditionalOrderMode,
           _this$store$order7,
           _res$data,
           res,
@@ -2886,52 +2828,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
 
-              // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
+              // Step2: 请求新的资源占用详情接口
               _context37.next = 50;
-              return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
+              return this.fetchResourceOccupyDetailByResourceId(normalizedResourceId);
             case 50:
-              occupyDetails = _context37.sent;
-              occupyDetail = (_occupyDetails$ = occupyDetails[0]) !== null && _occupyDetails$ !== void 0 ? _occupyDetails$ : null; // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
+              occupyDetail = _context37.sent;
+              // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
-              resourceSelectType = this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
-              allowAddItems = toBoolean(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['sale.allow_add_items']);
-              additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
-              if (!(additionalOrderResult.reason === 'multiple_orders')) {
-                _context37.next = 61;
-                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 61:
-              // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
+              resourceSelectType = this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id)); // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
               resourceState = this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId);
-              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;
 
               // Step5: 把预约规则商品阶段暂存的 requestEntryPax 等注入 store.resource
@@ -2967,23 +2872,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 76;
+                _context37.next = 65;
                 break;
               }
-              _context37.next = 76;
+              _context37.next = 65;
               return this.addNewOrder();
-            case 76:
-              isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
-              if (isAdditionalOrderMode) {
-                tempOrder.order_id = additionalOrderId;
+            case 65:
+              // 如果是加单模式，tempOrder 里 需要记录 lastOrderId，提交的时候走加单接口
+              if (availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code') {
+                tempOrder.order_id = resourceState.lastOrderId;
               }
               if (!tempOrder.order_id) {
-                _context37.next = 86;
+                _context37.next = 74;
                 break;
               }
-              _context37.next = 81;
+              _context37.next = 69;
               return (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getOrderInfoByRemote(tempOrder.order_id);
-            case 81:
+            case 69:
               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) {
@@ -2991,14 +2896,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 = 86;
+                _context37.next = 74;
                 break;
               }
-              _context37.next = 86;
+              _context37.next = 74;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 86:
+            case 74:
               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 = isAdditionalOrderMode && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
+              historicalItems = hasOrderId && 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,
@@ -3008,13 +2913,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 90;
+              _context37.next = 78;
               return this.setItemRuleRuntimeConfig({
                 serviceType: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode,
-                submissionIndex: isAdditionalOrderMode ? 1 : 0,
+                submissionIndex: hasOrderId ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 90:
+            case 78:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -3036,18 +2941,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 95:
-              _context37.prev = 95;
+            case 83:
+              _context37.prev = 83;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 99:
+            case 87:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 95]]);
+        }, _callee37, this, [[3, 83]]);
       }));
       function checkResourceAvailable(_x19) {
         return _checkResourceAvailable.apply(this, arguments);
@@ -3309,113 +3214,15 @@ 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$otherParams17, _this$store$order9;
-        var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, 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));
-              allowAddItems = toBoolean((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17 = _this$otherParams17.dineInConfig) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17['sale.allow_add_items']);
-              result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
-              if (!(!result.matched || !result.order_id)) {
-                _context42.next = 17;
-                break;
-              }
-              this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
-                resourceId: normalizedResourceId,
-                resourceSelectType: resourceSelectType,
-                allowAddItems: allowAddItems
-              }));
-              return _context42.abrupt("return", result);
-            case 17:
-              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,
-                allowAddItems: allowAddItems
-              }));
-              return _context42.abrupt("return", result);
-            case 24:
-            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$otherParams18;
-      this.logMethodStart('checkAllowAddItems');
-      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.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$otherParams19;
+      var _this$otherParams17;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3429,9 +3236,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams20;
+      var _this$otherParams18;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.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

@@ -34,6 +34,7 @@ export interface ScanOrderOrderProductIdentity {
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
     product_option_item?: any[];
     product_bundle?: any[];
+    shop_id?: number | string;
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
@@ -185,7 +186,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
+export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -228,10 +229,6 @@ 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;
@@ -245,21 +242,6 @@ 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' | 'add_items_disabled' | 'invalid_order_id';
-export interface ScanOrderSyncAdditionalOrderResult {
-    matched: boolean;
-    order_id?: string;
-    reason?: ScanOrderSyncAdditionalOrderReason;
-}
 export interface ScanOrderResourceState extends ScanOrderAvailabilityInfo {
     relationId?: string;
     tableFormId?: string;