@pisell/pisellos 0.0.504 → 0.0.506

package/dist/solution/ScanOrder/index.js

@@ -26,7 +26,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
 import { ScanOrderHooks } from "./types";
-import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, createEmptySummary, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityPaxBounds, normalizeEnabledItemRuleIds, normalizeOrderProduct, normalizeItemRuleStrategies, pickFirstDurationMinutesFromProducts, toNonNegativeInt, toNonNegativeNumber, toPriceString, toBoolean, toPositiveString } from "./utils";
+import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, computeResourceIsFull, createEmptySummary, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityPaxBounds, normalizeEnabledItemRuleIds, normalizeOrderProduct, normalizeItemRuleStrategies, pickFirstDurationMinutesFromProducts, toNonNegativeInt, toPriceString, toBoolean, toPositiveString } from "./utils";
 import { createModule } from "../BookingByStep/types";
 import { ProductList } from "../../modules/ProductList";
 import { ScheduleModule } from "../../modules/Schedule";
@@ -87,11 +87,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "serializeError",
     value: function serializeError(error) {
       if (error instanceof Error) {
-        return {
+        return JSON.stringify({
           name: error.name,
           message: error.message,
           stack: error.stack
-        };
+        });
       }
       return {
         message: String(error)
@@ -752,6 +752,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       return getSummary;
     }() // ScanOrder 提交 payload enhancer：
     // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
+    // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
     // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
     // - 追加一条 is_rule=true 的 rule product，与 booking 互相关联
   }, {
@@ -759,8 +760,21 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     value: function buildSubmitPayloadEnhancer() {
       var ruleProduct = this.enabledReservationRuleProducts[0];
       var resourceState = this.store.resource;
+      var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
+
+      // single 预约独占整张桌台，capacity 取 form_record.capacity；其他情况（multiple / capacity / undefined）占 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 num;
+          return 1;
+        }
+        return 1;
+      };
       return function (payload, _ref) {
-        var _tempOrder$resource_i, _ref2, _pickOriginal, _resourceState$table_, _resourceState$relati;
+        var _tempOrder$resource_i, _ref2, _pickOriginal, _resourceState$table_2, _resourceState$relati;
         var bookingUuid = _ref.bookingUuid,
           tempOrder = _ref.tempOrder;
         var resourceId = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId;
@@ -771,7 +785,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
           return undefined;
         };
-        var mainField = (_ref2 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_ = resourceState.table_form_record) === null || _resourceState$table_ === void 0 ? void 0 : _resourceState$table_.name)) !== null && _ref2 !== void 0 ? _ref2 : '';
+        var mainField = (_ref2 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_2 = resourceState.table_form_record) === null || _resourceState$table_2 === void 0 ? void 0 : _resourceState$table_2.name)) !== null && _ref2 !== void 0 ? _ref2 : '';
         var resourceEntry = resourceState && resourceId ? {
           relation_type: 'form',
           like_status: 'common',
@@ -779,13 +793,23 @@ 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: 1,
+          capacity: resolveResourceCapacity(),
           metadata: {}
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
+        var bookingCapacityValue = resolveResourceCapacity();
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {
-            appointment_status: 'started'
+            appointment_status: 'started',
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, booking.metadata || {}), resourceSelectType ? {
+              resource_select_type: resourceSelectType
+            } : {}), resourceSelectType ? {
+              capacity: [{
+                id: 0,
+                value: bookingCapacityValue,
+                name: ''
+              }]
+            } : {})
           }, idx === 0 && resourceEntry ? {
             resources: [resourceEntry]
           } : {}), idx === 0 && ruleProductUid ? {
@@ -1738,22 +1762,24 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "normalizeResourceState",
-    value: function normalizeResourceState(config, hasOrderId) {
-      var _this$otherParams8, _config$table_form_re;
-      var orderNumberPrefix = Array.isArray(config === null || config === void 0 ? void 0 : config.order_number_prefix) ? (config === null || config === void 0 ? void 0 : config.order_number_prefix) || [] : [];
-      var tableMaxNumber = Number((config === null || config === void 0 ? void 0 : config.table_max_number) || 1);
-      var orderCount = toNonNegativeNumber(config === null || config === void 0 ? void 0 : config.order_count);
-      var currentOrderId = toPositiveString(config === null || config === void 0 ? void 0 : config.order_id);
-      var lastOrderId = toPositiveString(config === null || config === void 0 ? void 0 : config.last_order_id);
-      var relationId = toPositiveString(config === null || config === void 0 ? void 0 : config.relation_id);
-      var tableFormId = toPositiveString(config === null || config === void 0 ? void 0 : config.table_form_id);
+    value: function normalizeResourceState(detail, resourceSelectType, hasOrderId) {
+      var _detail$form_record, _this$otherParams8, _detail$resource_capa, _detail$resource_capa2;
+      var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
+      var lastOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.last_order_id);
+      var relationId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_record_id);
+      var tableFormId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_id);
+      var formRecord = (_detail$form_record = detail === null || detail === void 0 ? void 0 : detail.form_record) !== null && _detail$form_record !== void 0 ? _detail$form_record : null;
       // 是否允许加餐
       var allowSnack = ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 || (_this$otherParams8 = _this$otherParams8.dineInConfig) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8['workflow.allow_add_items']) || false;
       // 开启同桌验证 - 本期没有这个配置，默认关掉
       var deskmateValid = false;
-      var isExclusive = tableMaxNumber > 0 ? tableMaxNumber <= 1 : false;
-      var isFull = tableMaxNumber > 0 ? orderCount >= tableMaxNumber : false;
-      var isBlock = tableMaxNumber === -1;
+      var isExclusive = resourceSelectType === 'single';
+      var isFull = computeResourceIsFull({
+        resourceSelectType: resourceSelectType,
+        lastOrderId: lastOrderId,
+        capacityList: (_detail$resource_capa = detail === null || detail === void 0 || (_detail$resource_capa2 = detail.resource_capacity) === null || _detail$resource_capa2 === void 0 || (_detail$resource_capa2 = _detail$resource_capa2[0]) === null || _detail$resource_capa2 === void 0 ? void 0 : _detail$resource_capa2.capacity_list) !== null && _detail$resource_capa !== void 0 ? _detail$resource_capa : [],
+        capacity: formRecord === null || formRecord === void 0 ? void 0 : formRecord.capacity
+      });
       var availabilityInfo = {
         mode: 'idle',
         deskmate_valid: deskmateValid
@@ -1782,33 +1808,19 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         }
       } else if (lastOrderId) {
         // 如果有其他人点的单
-        // TODO: 是否独占？如果非独占，其他人点的单应该不影响我下单
-        availabilityInfo = allowSnack ? {
-          mode: deskmateValid ? 'additional_order_with_code' : 'additional_order',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        } : {
-          mode: 'resource_busy',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        };
-      }
-      if (isBlock) {
-        availabilityInfo = {
-          mode: 'resource_block',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        };
+        // multiple 预约且容量仍有剩余时，其他人的单不影响当前用户下单，保持 idle 走正常下单流程
+        var canFallthroughToIdle = resourceSelectType === 'multiple' && !isFull;
+        if (!canFallthroughToIdle) {
+          availabilityInfo = {
+            mode: 'resource_busy',
+            order_id: '0',
+            relation_id: relationId,
+            table_form_id: tableFormId,
+            deskmate_valid: deskmateValid
+          };
+        }
       }
       return _objectSpread(_objectSpread({}, availabilityInfo), {}, {
-        tableMaxNumber: tableMaxNumber,
-        orderCount: orderCount,
         currentOrderId: currentOrderId,
         lastOrderId: lastOrderId,
         relationId: relationId,
@@ -1817,50 +1829,76 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         deskmateValid: deskmateValid,
         isExclusive: isExclusive,
         isFull: isFull,
-        orderNumberPrefix: orderNumberPrefix,
-        raw: config,
-        table_form_record: (_config$table_form_re = config === null || config === void 0 ? void 0 : config.table_form_record) !== null && _config$table_form_re !== void 0 ? _config$table_form_re : null
+        resourceSelectType: resourceSelectType,
+        raw: detail,
+        table_form_record: formRecord
+      });
+    }
+
+    // 从首个预约规则商品的 product_resource.resources 中，按 form_id 匹配返回 type
+  }, {
+    key: "resolveResourceSelectType",
+    value: function resolveResourceSelectType(formId) {
+      var _firstProduct$product;
+      var firstProduct = this.enabledReservationRuleProducts[0];
+      var resources = (firstProduct === null || firstProduct === void 0 || (_firstProduct$product = firstProduct.product_resource) === null || _firstProduct$product === void 0 ? void 0 : _firstProduct$product.resources) || [];
+      var numericFormId = Number(formId);
+      if (!Number.isFinite(numericFormId) || numericFormId <= 0) return undefined;
+      var matched = resources.find(function (r) {
+        return Number(r === null || r === void 0 ? void 0 : r.id) === numericFormId;
       });
+      return matched === null || matched === void 0 ? void 0 : matched.type;
     }
   }, {
-    key: "fetchTableConfigByResourceId",
+    key: "fetchResourceOccupyDetailByResourceId",
     value: function () {
-      var _fetchTableConfigByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(resourceId) {
-        var tableResourceId, response;
+      var _fetchResourceOccupyDetailByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(resourceId) {
+        var _this$otherParams9, _this$otherParams9$ge, _response$data$occupy, _response$data;
+        var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              tableResourceId = Number(resourceId);
-              if (!(!Number.isFinite(tableResourceId) || tableResourceId <= 0)) {
+              formRecordId = Number(resourceId);
+              if (!(!Number.isFinite(formRecordId) || formRecordId <= 0)) {
                 _context27.next = 3;
                 break;
               }
               throw new Error("[ScanOrder] \u975E\u6CD5\u684C\u53F0 resourceId: ".concat(resourceId));
             case 3:
-              _context27.next = 5;
-              return this.request.get('/order/dining/table/config', {
-                table_resource_id: tableResourceId,
-                with_table_form_info: 1
+              shopId = (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 || (_this$otherParams9$ge = _this$otherParams9.getStateData) === null || _this$otherParams9$ge === void 0 ? void 0 : _this$otherParams9$ge.call(_this$otherParams9, 'shop_id');
+              if (shopId) {
+                _context27.next = 6;
+                break;
+              }
+              throw new Error('[ScanOrder] 无法获取 shop_id');
+            case 6:
+              _context27.next = 8;
+              return this.request.get('/order/resource/occupy-detail', {
+                shop_id: shopId,
+                'form_record_ids[]': formRecordId,
+                with_resource_capacity_info: 1,
+                with_resource_order_info: 1,
+                with_resource_form_info: 1
               });
-            case 5:
+            case 8:
               response = _context27.sent;
               if (response !== null && response !== void 0 && response.status) {
-                _context27.next = 8;
+                _context27.next = 11;
                 break;
               }
-              throw new Error((response === null || response === void 0 ? void 0 : response.message) || '获取桌台配置失败');
-            case 8:
-              return _context27.abrupt("return", (response === null || response === void 0 ? void 0 : response.data) || null);
-            case 9:
+              throw new Error((response === null || response === void 0 ? void 0 : response.message) || '获取资源占用详情失败');
+            case 11:
+              return _context27.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 _context27.stop();
           }
         }, _callee27, this);
       }));
-      function fetchTableConfigByResourceId(_x9) {
-        return _fetchTableConfigByResourceId.apply(this, arguments);
+      function fetchResourceOccupyDetailByResourceId(_x9) {
+        return _fetchResourceOccupyDetailByResourceId.apply(this, arguments);
       }
-      return fetchTableConfigByResourceId;
+      return fetchResourceOccupyDetailByResourceId;
     }() // 检测当前链接是否可用
     // 通过 resource_id + 店铺配置
     // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
@@ -1868,7 +1906,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkResourceAvailable",
     value: function () {
       var _checkResourceAvailable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(resourceId, hasOrderId) {
-        var _this$otherParams9, _this$otherParams9$ge, _config$table_form_re2, _config$table_form_re3, _this$otherParams10, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams11, openData, dineInConfig, closedBehaviorValue, closedMessage, basicUnavailableMessage, pauseMessage, makeShopClosed, operatingHourIds, outsideOperatingHours, scheduleList, now, config, resourceState, availabilityInfo, tempOrder, reservationLinkIds, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, paxBounds, _this$store$order6, _res$data, res, entryPaxNumber, lastOrderInfo, historicalItems;
+        var _this$otherParams10, _this$otherParams10$g, _occupyDetail$form_re, _occupyDetail$form_re2, _this$otherParams11, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams12, openData, dineInConfig, closedBehaviorValue, closedMessage, basicUnavailableMessage, pauseMessage, makeShopClosed, operatingHourIds, outsideOperatingHours, scheduleList, now, tempOrder, reservationLinkIds, pendingRequestEntryPax, pendingRequestPaxMin, pendingRequestPaxMax, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, paxBounds, occupyDetail, resourceSelectType, resourceState, availabilityInfo, _this$store$order6, _res$data, res, entryPaxNumber, lastOrderInfo, historicalItems;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -1877,7 +1915,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               });
               _context28.prev = 1;
               _context28.next = 4;
-              return (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 || (_this$otherParams9$ge = _this$otherParams9.getOpenData) === null || _this$otherParams9$ge === void 0 ? void 0 : _this$otherParams9$ge.call(_this$otherParams9, {
+              return (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 || (_this$otherParams10$g = _this$otherParams10.getOpenData) === null || _this$otherParams10$g === void 0 ? void 0 : _this$otherParams10$g.call(_this$otherParams10, {
                 scope: 'board',
                 target: 'dine_in+scan_to_order',
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
@@ -1946,44 +1984,22 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               return _context28.abrupt("return", makeShopClosed(closedMessage, closedBehaviorValue));
             case 26:
-              _context28.next = 28;
-              return this.fetchTableConfigByResourceId(resourceId);
-            case 28:
-              config = _context28.sent;
-              resourceState = this.normalizeResourceState(config, hasOrderId);
-              this.store.resource = resourceState;
-              availabilityInfo = {
-                mode: resourceState.mode,
-                order_id: resourceState.order_id,
-                relation_id: resourceState.relationId,
-                table_form_id: resourceState.tableFormId,
-                deskmate_valid: resourceState.deskmate_valid,
-                table_form_record: resourceState.table_form_record,
-                policy: config === null || config === void 0 || (_config$table_form_re2 = config.table_form_record) === null || _config$table_form_re2 === void 0 ? void 0 : _config$table_form_re2.policy,
-                partyroom_booking: config === null || config === void 0 || (_config$table_form_re3 = config.table_form_record) === null || _config$table_form_re3 === void 0 ? void 0 : _config$table_form_re3.partyroom_booking
-              };
+              // Step1: 先加载预约规则商品，拿到 enabledReservationRuleProducts 与容量附加信息
+              // （resourceSelectType 需要基于这些商品 + 占用接口的 form_id 计算，故必须前置）
               tempOrder = this.ensureTempOrder();
-              tempOrder.relation_id = resourceId || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.relation_id);
-              tempOrder.table_form_id = resourceState.tableFormId;
-              tempOrder.resource_id = resourceId;
               reservationLinkIds = collectLinkProductIdsFromReservationRules(dineInConfig['fulfillment.enabled_resource_rules']);
               if (!(reservationLinkIds.length === 0)) {
-                _context28.next = 42;
+                _context28.next = 32;
                 break;
               }
               this.enabledReservationRuleProducts = [];
-              if (this.store.resource) {
-                delete this.store.resource.requestEntryPax;
-                delete this.store.resource.requestPaxMin;
-                delete this.store.resource.requestPaxMax;
-              }
-              _context28.next = 53;
+              _context28.next = 43;
               break;
-            case 42:
+            case 32:
               tempOrder.metadata = _objectSpread({}, tempOrder.metadata || {});
               delete tempOrder.metadata.table_occupancy_duration;
               reservationProductList = new ProductList("".concat(this.name, "_reservationEnabledRules"), this.defaultVersion);
-              _context28.next = 47;
+              _context28.next = 37;
               return reservationProductList.initialize(this.core, {
                 store: {
                   list: [],
@@ -1995,17 +2011,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   cacheId: this.cacheId
                 })
               });
-            case 47:
+            case 37:
               scheduleDate = dayjs().format('YYYY-MM-DD');
               scheduleDatetime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-              _context28.next = 51;
+              _context28.next = 41;
               return reservationProductList.loadProducts({
                 product_ids: reservationLinkIds,
                 schedule_date: scheduleDate,
                 schedule_datetime: scheduleDatetime,
                 cacheId: this.cacheId
               });
-            case 51:
+            case 41:
               loaded = _context28.sent;
               if (Array.isArray(loaded)) {
                 this.enabledReservationRuleProducts = loaded;
@@ -2014,35 +2030,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
                 }
                 if (hasCustomCapacityProduct(loaded)) {
-                  availabilityInfo.requestEntryPax = 1;
-                  if (this.store.resource) this.store.resource.requestEntryPax = 1;
-                  delete availabilityInfo.requestPaxMin;
-                  delete availabilityInfo.requestPaxMax;
-                  if (this.store.resource) {
-                    delete this.store.resource.requestPaxMin;
-                    delete this.store.resource.requestPaxMax;
-                  }
+                  pendingRequestEntryPax = 1;
                   paxBounds = pickFirstCustomCapacityPaxBounds(loaded);
-                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.min) !== undefined) {
-                    availabilityInfo.requestPaxMin = paxBounds.min;
-                    if (this.store.resource) this.store.resource.requestPaxMin = paxBounds.min;
-                  }
-                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.max) !== undefined) {
-                    availabilityInfo.requestPaxMax = paxBounds.max;
-                    if (this.store.resource) this.store.resource.requestPaxMax = paxBounds.max;
-                  }
-                } else if (this.store.resource) {
-                  delete this.store.resource.requestEntryPax;
-                  delete this.store.resource.requestPaxMin;
-                  delete this.store.resource.requestPaxMax;
+                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.min) !== undefined) pendingRequestPaxMin = paxBounds.min;
+                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.max) !== undefined) pendingRequestPaxMax = paxBounds.max;
                 }
               } else {
                 this.enabledReservationRuleProducts = [];
-                if (this.store.resource) {
-                  delete this.store.resource.requestEntryPax;
-                  delete this.store.resource.requestPaxMin;
-                  delete this.store.resource.requestPaxMax;
-                }
                 void this.addScanOrderLog({
                   level: 'error',
                   title: '[ScanOrder] enabled_reservation_rules product query failed',
@@ -2052,28 +2046,67 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 });
               }
-            case 53:
+            case 43:
+              _context28.next = 45;
+              return this.fetchResourceOccupyDetailByResourceId(resourceId);
+            case 45:
+              occupyDetail = _context28.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)); // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
+              resourceState = this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId);
+              this.store.resource = resourceState;
+
+              // Step5: 把预约规则商品阶段暂存的 requestEntryPax 等注入 store.resource
+              if (pendingRequestEntryPax !== undefined) {
+                this.store.resource.requestEntryPax = pendingRequestEntryPax;
+              }
+              if (pendingRequestPaxMin !== undefined) {
+                this.store.resource.requestPaxMin = pendingRequestPaxMin;
+              }
+              if (pendingRequestPaxMax !== undefined) {
+                this.store.resource.requestPaxMax = pendingRequestPaxMax;
+              }
+              availabilityInfo = _objectSpread(_objectSpread(_objectSpread({
+                mode: resourceState.mode,
+                order_id: resourceState.order_id,
+                relation_id: resourceState.relationId,
+                table_form_id: resourceState.tableFormId,
+                deskmate_valid: resourceState.deskmate_valid,
+                table_form_record: resourceState.table_form_record,
+                policy: occupyDetail === null || occupyDetail === void 0 || (_occupyDetail$form_re = occupyDetail.form_record) === null || _occupyDetail$form_re === void 0 ? void 0 : _occupyDetail$form_re.policy,
+                partyroom_booking: occupyDetail === null || occupyDetail === void 0 || (_occupyDetail$form_re2 = occupyDetail.form_record) === null || _occupyDetail$form_re2 === void 0 ? void 0 : _occupyDetail$form_re2.partyroom_booking
+              }, this.store.resource.requestEntryPax !== undefined ? {
+                requestEntryPax: this.store.resource.requestEntryPax
+              } : {}), this.store.resource.requestPaxMin !== undefined ? {
+                requestPaxMin: this.store.resource.requestPaxMin
+              } : {}), this.store.resource.requestPaxMax !== undefined ? {
+                requestPaxMax: this.store.resource.requestPaxMax
+              } : {});
+              tempOrder.relation_id = resourceId || ((_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.relation_id);
+              tempOrder.table_form_id = resourceState.tableFormId;
+              tempOrder.resource_id = resourceId;
               (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || _this$store$order5.persistTempOrder();
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context28.next = 57;
+                _context28.next = 60;
                 break;
               }
-              _context28.next = 57;
+              _context28.next = 60;
               return this.addNewOrder();
-            case 57:
+            case 60:
               // 如果是加单模式，tempOrder 里 需要记录 lastOrderId，提交的时候走加单接口
               if (availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code') {
                 tempOrder.order_id = resourceState.lastOrderId;
               }
               if (!tempOrder.order_id) {
-                _context28.next = 66;
+                _context28.next = 69;
                 break;
               }
-              _context28.next = 61;
+              _context28.next = 64;
               return (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getOrderInfoByRemote(tempOrder.order_id);
-            case 61:
+            case 64:
               res = _context28.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) {
@@ -2081,12 +2114,12 @@ 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) {
-                _context28.next = 66;
+                _context28.next = 69;
                 break;
               }
-              _context28.next = 66;
+              _context28.next = 69;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 66:
+            case 69:
               lastOrderInfo = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getLastOrderInfo) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7);
               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;
@@ -2098,13 +2131,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context28.next = 70;
+              _context28.next = 73;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode,
+                serviceType: (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode,
                 submissionIndex: hasOrderId ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 70:
+            case 73:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -2121,24 +2154,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 persistedRelationId: tempOrder.relation_id,
                 persistedResourceId: tempOrder.resource_id,
                 deskmateValid: availabilityInfo.deskmate_valid,
-                orderCount: resourceState.orderCount,
-                tableMaxNumber: resourceState.tableMaxNumber,
+                resourceSelectType: resourceState.resourceSelectType,
                 isExclusive: resourceState.isExclusive,
                 isFull: resourceState.isFull
               });
               return _context28.abrupt("return", availabilityInfo);
-            case 75:
-              _context28.prev = 75;
+            case 78:
+              _context28.prev = 78;
               _context28.t0 = _context28["catch"](1);
-              this.logMethodError('checkResourceAvailable', _context28.t0, {
+              this.logMethodError('checkResourceAvailable', _context28.t0.message, {
                 resourceId: resourceId
               });
               throw _context28.t0;
-            case 79:
+            case 82:
             case "end":
               return _context28.stop();
           }
-        }, _callee28, this, [[1, 75]]);
+        }, _callee28, this, [[1, 78]]);
       }));
       function checkResourceAvailable(_x10, _x11) {
         return _checkResourceAvailable.apply(this, arguments);
@@ -2181,14 +2213,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-        var _this$otherParams12;
+        var _this$otherParams13;
         var menu_list_ids, _this$store$products, res, formattedRes;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 || (_this$otherParams12 = _this$otherParams12.dineInConfig) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12['menu.associated_menus'].map(function (n) {
+              menu_list_ids = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13 = _this$otherParams13.dineInConfig) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
               _context30.prev = 2;
@@ -2209,7 +2241,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 11:
               _context30.prev = 11;
               _context30.t0 = _context30["catch"](2);
-              this.logMethodError('getProductList', _context30.t0);
+              this.logMethodError('getProductList', _context30.t0.message);
               throw _context30.t0;
             case 15:
             case "end":
@@ -2254,7 +2286,82 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
-    }()
+    }() // ─── UI 状态缓存（按 cacheId 分桶，sessionStorage） ───
+    //
+    // 用于物料层持久化 UI 层面的轻量状态（如当前步骤、gate 标记、登录回跳意图等）。
+    // 桶键：pisell.scanOrder.uiState:<cacheId>；内部以 JSON object 形式存储多个字段。
+    // 无 cacheId 时所有方法自动降级为 no-op，上层不用判空。
+  }, {
+    key: "getUIStateBucketKey",
+    value: function getUIStateBucketKey() {
+      if (!this.cacheId) return null;
+      return "".concat(ScanOrderImpl.UI_STATE_KEY_PREFIX).concat(this.cacheId);
+    }
+  }, {
+    key: "readUIStateBucket",
+    value: function readUIStateBucket() {
+      var _this$window;
+      var key = this.getUIStateBucketKey();
+      if (!key || !((_this$window = this.window) !== null && _this$window !== void 0 && _this$window.sessionStorage)) return {};
+      try {
+        var raw = this.window.sessionStorage.getItem(key) || '{}';
+        var parsed = JSON.parse(raw);
+        return parsed && _typeof(parsed) === 'object' ? parsed : {};
+      } catch (_unused) {
+        return {};
+      }
+    }
+  }, {
+    key: "writeUIStateBucket",
+    value: function writeUIStateBucket(bucket) {
+      var _this$window2;
+      var key = this.getUIStateBucketKey();
+      if (!key || !((_this$window2 = this.window) !== null && _this$window2 !== void 0 && _this$window2.sessionStorage)) return;
+      try {
+        this.window.sessionStorage.setItem(key, JSON.stringify(bucket));
+      } catch (error) {
+        console.warn('[ScanOrder] writeUIStateBucket failed', error);
+      }
+    }
+  }, {
+    key: "setUIState",
+    value: function setUIState(key, value) {
+      if (!this.getUIStateBucketKey()) return;
+      var bucket = this.readUIStateBucket();
+      bucket[key] = value;
+      this.writeUIStateBucket(bucket);
+    }
+  }, {
+    key: "getUIState",
+    value: function getUIState(key) {
+      if (!this.getUIStateBucketKey()) return undefined;
+      var bucket = this.readUIStateBucket();
+      return bucket[key];
+    }
+  }, {
+    key: "deleteUIState",
+    value: function deleteUIState(key) {
+      if (!this.getUIStateBucketKey()) return;
+      var bucket = this.readUIStateBucket();
+      if (key in bucket) {
+        delete bucket[key];
+        this.writeUIStateBucket(bucket);
+      }
+    }
+
+    // 整桶清空（用于扫新桌、提交成功、restoreOrder 等场景）
+  }, {
+    key: "clearUIState",
+    value: function clearUIState() {
+      var _this$window3;
+      var key = this.getUIStateBucketKey();
+      if (!key || !((_this$window3 = this.window) !== null && _this$window3 !== void 0 && _this$window3.sessionStorage)) return;
+      try {
+        this.window.sessionStorage.removeItem(key);
+      } catch (error) {
+        console.warn('[ScanOrder] clearUIState failed', error);
+      }
+    }
   }, {
     key: "setEntryPaxNumber",
     value: function () {
@@ -2309,9 +2416,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams13;
+      var _this$otherParams14;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -2325,9 +2432,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams14;
+      var _this$otherParams15;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';
@@ -2345,4 +2452,5 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }]);
   return ScanOrderImpl;
-}(BaseModule);
+}(BaseModule);
+_defineProperty(ScanOrderImpl, "UI_STATE_KEY_PREFIX", 'pisell.scanOrder.uiState:');