@pisell/pisellos 2.1.136 → 2.1.137

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

@@ -86,6 +86,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/dist/solution/ScanOrder/index.js

@@ -1247,7 +1247,50 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return _onCustomerLogin.apply(this, arguments);
       }
       return onCustomerLogin;
-    }() // ScanOrder 提交 payload enhancer：
+    }()
+  }, {
+    key: "findReservationRuleResource",
+    value: function findReservationRuleResource(formId) {
+      if (formId == null) return undefined;
+      var numericFormId = Number(formId);
+      if (!Number.isFinite(numericFormId) || numericFormId <= 0) return undefined;
+      var _iterator4 = _createForOfIteratorHelper(this.enabledReservationRuleProducts),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _product$product_reso;
+          var product = _step4.value;
+          var resources = product === null || product === void 0 || (_product$product_reso = product.product_resource) === null || _product$product_reso === void 0 ? void 0 : _product$product_reso.resources;
+          if (!Array.isArray(resources)) continue;
+          var matched = resources.find(function (resource) {
+            return Number(resource === null || resource === void 0 ? void 0 : resource.id) === numericFormId;
+          });
+          if (matched) return matched;
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      return undefined;
+    }
+  }, {
+    key: "buildScanOrderResourceMetadata",
+    value: function buildScanOrderResourceMetadata(params) {
+      var _ruleResource$title;
+      var resourceState = params.resourceState,
+        resourceName = params.resourceName;
+      var ruleResource = this.findReservationRuleResource(resourceState.tableFormId);
+      var combined = ruleResource === null || ruleResource === void 0 ? void 0 : ruleResource.combined_resource;
+      var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+      return {
+        form_name: (_ruleResource$title = ruleResource === null || ruleResource === void 0 ? void 0 : ruleResource.title) !== null && _ruleResource$title !== void 0 ? _ruleResource$title : '',
+        resource_name: resourceName,
+        combined_resource: isCombined ? combined : null
+      };
+    }
+
+    // ScanOrder 提交 payload enhancer：
     // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
     // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
     // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
@@ -1292,7 +1335,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
           capacity: resolveResourceCapacity(),
-          metadata: {}
+          metadata: _this5.buildScanOrderResourceMetadata({
+            resourceState: resourceState,
+            resourceName: mainField
+          })
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
         // 默认 resolveResourceCapacity（single 为桌台容量，其余多为 1）；有 collect_pax 时 value 优先用人数
@@ -1776,17 +1822,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 if (visited.has(value)) return;
                 visited.add(value);
                 if (Array.isArray(value)) {
-                  var _iterator4 = _createForOfIteratorHelper(value),
-                    _step4;
+                  var _iterator5 = _createForOfIteratorHelper(value),
+                    _step5;
                   try {
-                    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                      var item = _step4.value;
+                    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                      var item = _step5.value;
                       collectFromValue(item);
                     }
                   } catch (err) {
-                    _iterator4.e(err);
+                    _iterator5.e(err);
                   } finally {
-                    _iterator4.f();
+                    _iterator5.f();
                   }
                   return;
                 }
@@ -1947,7 +1993,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator5, _step5, _prefillItem$product_, _targetProduct$_origi, _targetProduct$_origi2, _targetProduct$_origi3, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _targetProduct$_origi, _targetProduct$_origi2, _targetProduct$_origi3, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -1992,15 +2038,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               productSourceMap = _context29.sent;
               tempOrder = this.ensureTempOrder();
               hasChanges = false;
-              _iterator5 = _createForOfIteratorHelper(prefillItems);
+              _iterator6 = _createForOfIteratorHelper(prefillItems);
               _context29.prev = 20;
-              _iterator5.s();
+              _iterator6.s();
             case 22:
-              if ((_step5 = _iterator5.n()).done) {
+              if ((_step6 = _iterator6.n()).done) {
                 _context29.next = 47;
                 break;
               }
-              prefillItem = _step5.value;
+              prefillItem = _step6.value;
               productId = Number(prefillItem.product_id);
               productVariantId = Number((_prefillItem$product_ = prefillItem.product_variant_id) !== null && _prefillItem$product_ !== void 0 ? _prefillItem$product_ : 0);
               targetQuantity = toNonNegativeInt(prefillItem.quantity);
@@ -2071,10 +2117,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 49:
               _context29.prev = 49;
               _context29.t0 = _context29["catch"](20);
-              _iterator5.e(_context29.t0);
+              _iterator6.e(_context29.t0);
             case 52:
               _context29.prev = 52;
-              _iterator5.f();
+              _iterator6.f();
               return _context29.finish(52);
             case 55:
               if (!hasChanges) {
@@ -2462,7 +2508,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkResourceAvailable",
     value: function () {
       var _checkResourceAvailable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId, hasOrderId) {
-        var _this$otherParams$bus, _this$otherParams10, _this$otherParams$cha, _this$otherParams11, _this$otherParams12, _this$otherParams12$g, _occupyDetail$form_re, _occupyDetail$form_re2, _this$otherParams13, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams14, businessCode, channel, openDataTarget, 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;
+        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 _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
@@ -2470,28 +2516,25 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceId: resourceId
               });
               _context36.prev = 1;
-              businessCode = String((_this$otherParams$bus = (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
-              channel = String((_this$otherParams$cha = (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
-              openDataTarget = businessCode && channel ? "".concat(businessCode, "+").concat(channel) : 'dine_in+scan_to_order';
-              _context36.next = 7;
-              return (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 || (_this$otherParams12$g = _this$otherParams12.getOpenData) === null || _this$otherParams12$g === void 0 ? void 0 : _this$otherParams12$g.call(_this$otherParams12, {
+              _context36.next = 4;
+              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: openDataTarget,
+                target: 'dine_in+scan_to_order',
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
               });
-            case 7:
+            case 4:
               openData = _context36.sent;
               if (!((openData === null || openData === void 0 ? void 0 : openData.status) === false)) {
-                _context36.next = 10;
+                _context36.next = 7;
                 break;
               }
               throw new Error((openData === null || openData === void 0 ? void 0 : openData.message) || '获取店铺配置失败');
-            case 10:
+            case 7:
               dineInConfig = (openData === null || openData === void 0 ? void 0 : openData.data) || {};
               this.otherParams.dineInConfig = dineInConfig;
-              _context36.next = 14;
+              _context36.next = 11;
               return this.syncItemRuleConfigsFromDineInConfig(dineInConfig);
-            case 14:
+            case 11:
               closedBehaviorValue = dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.closed_behavior'];
               closedMessage = (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.closed_message']) || (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.message']) || (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['basic.closed_message']);
               basicUnavailableMessage = (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['basic.unavailable_message']) || closedMessage;
@@ -2508,21 +2551,21 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 };
               }; // 1. 基础开关 basic.enable 关闭
               if (!((dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['basic.enable']) === false)) {
-                _context36.next = 21;
+                _context36.next = 18;
                 break;
               }
               return _context36.abrupt("return", makeShopClosed(basicUnavailableMessage));
-            case 21:
+            case 18:
               if (!toBoolean(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.paused'])) {
-                _context36.next = 24;
+                _context36.next = 21;
                 break;
               }
               if (!((dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.pause_behavior']) === 'hide_all')) {
-                _context36.next = 24;
+                _context36.next = 21;
                 break;
               }
               return _context36.abrupt("return", makeShopClosed(pauseMessage));
-            case 24:
+            case 21:
               // 3. 营业时间 operating_hours 闸门
               operatingHourIds = Array.isArray(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.operating_hours']) ? dineInConfig['availability.operating_hours'].map(function (id) {
                 return Number(id);
@@ -2538,27 +2581,27 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               if (!(outsideOperatingHours && closedBehaviorValue !== 'show_menu_disabled')) {
-                _context36.next = 29;
+                _context36.next = 26;
                 break;
               }
               return _context36.abrupt("return", makeShopClosed(closedMessage, closedBehaviorValue));
-            case 29:
+            case 26:
               // Step1: 先加载预约规则商品，拿到 enabledReservationRuleProducts 与容量附加信息
               // （resourceSelectType 需要基于这些商品 + 占用接口的 form_id 计算，故必须前置）
               tempOrder = this.ensureTempOrder();
               reservationLinkIds = collectLinkProductIdsFromReservationRules(dineInConfig['fulfillment.enabled_resource_rules']);
               if (!(reservationLinkIds.length === 0)) {
-                _context36.next = 35;
+                _context36.next = 32;
                 break;
               }
               this.enabledReservationRuleProducts = [];
-              _context36.next = 46;
+              _context36.next = 43;
               break;
-            case 35:
+            case 32:
               tempOrder.metadata = _objectSpread({}, tempOrder.metadata || {});
               delete tempOrder.metadata.table_occupancy_duration;
               reservationProductList = new ProductList("".concat(this.name, "_reservationEnabledRules"), this.defaultVersion);
-              _context36.next = 40;
+              _context36.next = 37;
               return reservationProductList.initialize(this.core, {
                 store: {
                   list: [],
@@ -2570,17 +2613,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   cacheId: this.cacheId
                 })
               });
-            case 40:
+            case 37:
               scheduleDate = dayjs().format('YYYY-MM-DD');
               scheduleDatetime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-              _context36.next = 44;
+              _context36.next = 41;
               return reservationProductList.loadProducts({
                 product_ids: reservationLinkIds,
                 schedule_date: scheduleDate,
                 schedule_datetime: scheduleDatetime,
                 cacheId: this.cacheId
               });
-            case 44:
+            case 41:
               loaded = _context36.sent;
               if (Array.isArray(loaded)) {
                 this.enabledReservationRuleProducts = loaded;
@@ -2605,10 +2648,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 });
               }
-            case 46:
-              _context36.next = 48;
+            case 43:
+              _context36.next = 45;
               return this.fetchResourceOccupyDetailByResourceId(resourceId);
-            case 48:
+            case 45:
               occupyDetail = _context36.sent;
               // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
@@ -2642,30 +2685,30 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               } : {}), this.store.resource.requestPaxMax !== undefined ? {
                 requestPaxMax: this.store.resource.requestPaxMax
               } : {});
-              tempOrder.relation_id = resourceId || ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.relation_id);
+              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')) {
-                _context36.next = 63;
+                _context36.next = 60;
                 break;
               }
-              _context36.next = 63;
+              _context36.next = 60;
               return this.addNewOrder();
-            case 63:
+            case 60:
               // 如果是加单模式，tempOrder 里 需要记录 lastOrderId，提交的时候走加单接口
               if (availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code') {
                 tempOrder.order_id = resourceState.lastOrderId;
               }
               if (!tempOrder.order_id) {
-                _context36.next = 72;
+                _context36.next = 69;
                 break;
               }
-              _context36.next = 67;
+              _context36.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 67:
+            case 64:
               res = _context36.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) {
@@ -2673,12 +2716,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) {
-                _context36.next = 72;
+                _context36.next = 69;
                 break;
               }
-              _context36.next = 72;
+              _context36.next = 69;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 72:
+            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;
@@ -2690,13 +2733,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context36.next = 76;
+              _context36.next = 73;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.businessCode,
+                serviceType: (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode,
                 submissionIndex: hasOrderId ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 76:
+            case 73:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -2718,18 +2761,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context36.abrupt("return", availabilityInfo);
-            case 81:
-              _context36.prev = 81;
+            case 78:
+              _context36.prev = 78;
               _context36.t0 = _context36["catch"](1);
               this.logMethodError('checkResourceAvailable', _context36.t0.message, {
                 resourceId: resourceId
               });
               throw _context36.t0;
-            case 85:
+            case 82:
             case "end":
               return _context36.stop();
           }
-        }, _callee36, this, [[1, 81]]);
+        }, _callee36, this, [[1, 78]]);
       }));
       function checkResourceAvailable(_x18, _x19) {
         return _checkResourceAvailable.apply(this, arguments);
@@ -2772,14 +2815,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
-        var _this$otherParams15;
+        var _this$otherParams13;
         var menu_list_ids, _this$store$products, res, formattedRes;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 || (_this$otherParams15 = _this$otherParams15.dineInConfig) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15['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);
               })) || [];
               _context38.prev = 2;
@@ -2982,9 +3025,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams16;
+      var _this$otherParams14;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.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'])
@@ -2998,9 +3041,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams17;
+      var _this$otherParams15;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.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';

package/dist/solution/VenueBooking/index.js

@@ -44,7 +44,7 @@ import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 import { extractResourceIds, buildResourceProductMap } from "./utils/resource";
 import { buildTimeSlotGrid, isBusinessHoursCrossDay, generateTimeLabels } from "./utils/timeSlot";
 import { buildDateRangeSummary } from "./utils/dateSummary";
-import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildPriceBreakdown } from "./utils/slotMerge";
+import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildVenueResourceMetadata, buildPriceBreakdown } from "./utils/slotMerge";
 import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
@@ -1627,7 +1627,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
                   relation_id: resourceId,
                   capacity: 1,
-                  metadata: {}
+                  metadata: buildVenueResourceMetadata({
+                    mapping: mapping,
+                    rawResource: rawResource
+                  })
                 };
                 if (childRawResources && childRawResources.length) {
                   resourceEntry.children = childRawResources.map(function (child) {

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

@@ -96,6 +96,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;

package/dist/solution/VenueBooking/utils/resource.js

@@ -93,6 +93,7 @@ export function buildResourceProductMap(products) {
               var mapping = {
                 productId: product.id,
                 productTitle: product.title,
+                formName: resource.title,
                 resourceName: resource.title,
                 formId: resource.id,
                 price: product.price || '0.00',

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -25,6 +25,10 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -89,6 +89,18 @@ export function buildPriceBreakdown(params) {
   }
   return entries;
 }
+export function buildVenueResourceMetadata(params) {
+  var _mapping$formName, _rawResource$main_fie;
+  var mapping = params.mapping,
+    rawResource = params.rawResource;
+  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
+  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+  return {
+    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
+    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
+    combined_resource: isCombined ? combined : null
+  };
+}
 export function buildVenueBookingEntry(params) {
   var _rawResource$form_id;
   var group = params.group,
@@ -109,7 +121,10 @@ export function buildVenueBookingEntry(params) {
     form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: {}
+    metadata: buildVenueResourceMetadata({
+      mapping: mapping,
+      rawResource: rawResource
+    })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

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

@@ -86,6 +86,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/lib/solution/ScanOrder/index.js

@@ -746,6 +746,34 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  findReservationRuleResource(formId) {
+    var _a;
+    if (formId == null)
+      return void 0;
+    const numericFormId = Number(formId);
+    if (!Number.isFinite(numericFormId) || numericFormId <= 0)
+      return void 0;
+    for (const product of this.enabledReservationRuleProducts) {
+      const resources = (_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources;
+      if (!Array.isArray(resources))
+        continue;
+      const matched = resources.find((resource) => Number(resource == null ? void 0 : resource.id) === numericFormId);
+      if (matched)
+        return matched;
+    }
+    return void 0;
+  }
+  buildScanOrderResourceMetadata(params) {
+    const { resourceState, resourceName } = params;
+    const ruleResource = this.findReservationRuleResource(resourceState.tableFormId);
+    const combined = ruleResource == null ? void 0 : ruleResource.combined_resource;
+    const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+    return {
+      form_name: (ruleResource == null ? void 0 : ruleResource.title) ?? "",
+      resource_name: resourceName,
+      combined_resource: isCombined ? combined : null
+    };
+  }
   // ScanOrder 提交 payload enhancer：
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
@@ -785,7 +813,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
         capacity: resolveResourceCapacity(),
-        metadata: {}
+        metadata: this.buildScanOrderResourceMetadata({
+          resourceState,
+          resourceName: mainField
+        })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
       const rawCollectPax = (_b = tempOrder.metadata) == null ? void 0 : _b.collect_pax;
@@ -1426,17 +1457,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId) {
-    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;
     this.logMethodStart("checkResourceAvailable", {
       resourceId
     });
     try {
-      const businessCode = String(((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? "").trim();
-      const channel = String(((_b = this.otherParams) == null ? void 0 : _b.channel) ?? "").trim();
-      const openDataTarget = businessCode && channel ? `${businessCode}+${channel}` : "dine_in+scan_to_order";
-      const openData = await ((_d = (_c = this.otherParams) == null ? void 0 : _c.getOpenData) == null ? void 0 : _d.call(_c, {
+      const openData = await ((_b = (_a = this.otherParams) == null ? void 0 : _a.getOpenData) == null ? void 0 : _b.call(_a, {
         scope: "board",
-        target: openDataTarget,
+        target: "dine_in+scan_to_order",
         section_code: ["basic", "fulfillment", "reservation", "sale", "menu", "availability", "workflow"]
       }));
       if ((openData == null ? void 0 : openData.status) === false) {
@@ -1563,16 +1591,16 @@ 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: (_c = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _c.policy,
+        partyroom_booking: (_d = occupyDetail == null ? void 0 : occupyDetail.form_record) == null ? void 0 : _d.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 = resourceId || ((_g = this.otherParams) == null ? void 0 : _g.relation_id);
+      tempOrder.relation_id = resourceId || ((_e = this.otherParams) == null ? void 0 : _e.relation_id);
       tempOrder.table_form_id = resourceState.tableFormId;
       tempOrder.resource_id = resourceId;
-      (_h = this.store.order) == null ? void 0 : _h.persistTempOrder();
+      (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
       if (availabilityInfo.mode === "idle") {
         await this.addNewOrder();
       }
@@ -1580,16 +1608,16 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         tempOrder.order_id = resourceState.lastOrderId;
       }
       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 ((_g = this.store.order) == null ? void 0 : _g.getOrderInfoByRemote(tempOrder.order_id));
+        const entryPaxNumber = (_k = (_j = (_i = (_h = res == null ? void 0 : res.data) == null ? void 0 : _h.bookings) == null ? void 0 : _i.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 : _j.metadata) == null ? void 0 : _k.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 lastOrderInfo = (_m = (_l = this.store.order) == null ? void 0 : _l.getLastOrderInfo) == null ? void 0 : _m.call(_l);
       const historicalItems = hasOrderId && 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;
@@ -1601,7 +1629,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_p = this.otherParams) == null ? void 0 : _p.businessCode,
+        serviceType: (_n = this.otherParams) == null ? void 0 : _n.businessCode,
         submissionIndex: hasOrderId ? 1 : 0,
         historicalItems
       });

package/lib/solution/VenueBooking/index.js

@@ -988,7 +988,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
         relation_id: resourceId,
         capacity: 1,
-        metadata: {}
+        metadata: (0, import_slotMerge.buildVenueResourceMetadata)({ mapping, rawResource })
       };
       if (childRawResources && childRawResources.length) {
         resourceEntry.children = childRawResources.map((child) => ({

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

@@ -96,6 +96,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;

package/lib/solution/VenueBooking/utils/resource.js

@@ -69,6 +69,7 @@ function buildResourceProductMap(products) {
         const mapping = {
           productId: product.id,
           productTitle: product.title,
+          formName: resource.title,
           resourceName: resource.title,
           formId: resource.id,
           price: product.price || "0.00",

package/lib/solution/VenueBooking/utils/slotMerge.d.ts

@@ -25,6 +25,10 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -32,6 +32,7 @@ __export(slotMerge_exports, {
   buildPriceBreakdown: () => buildPriceBreakdown,
   buildVenueBookingEntry: () => buildVenueBookingEntry,
   buildVenueIdentityKey: () => buildVenueIdentityKey,
+  buildVenueResourceMetadata: () => buildVenueResourceMetadata,
   expandMergedSlotToIndividual: () => expandMergedSlotToIndividual,
   mergeConsecutiveSlots: () => mergeConsecutiveSlots
 });
@@ -106,6 +107,16 @@ function buildPriceBreakdown(params) {
   }
   return entries;
 }
+function buildVenueResourceMetadata(params) {
+  const { mapping, rawResource } = params;
+  const combined = rawResource == null ? void 0 : rawResource.combined_resource;
+  const isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+  return {
+    form_name: mapping.formName ?? mapping.resourceName,
+    resource_name: (rawResource == null ? void 0 : rawResource.main_field) ?? mapping.resourceName,
+    combined_resource: isCombined ? combined : null
+  };
+}
 function buildVenueBookingEntry(params) {
   const { group, resourceId, mapping, rawResource, bookingUuid, productUid, childResources } = params;
   const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
@@ -119,7 +130,7 @@ function buildVenueBookingEntry(params) {
     form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: {}
+    metadata: buildVenueResourceMetadata({ mapping, rawResource })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map((child) => ({
@@ -220,6 +231,7 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   buildPriceBreakdown,
   buildVenueBookingEntry,
   buildVenueIdentityKey,
+  buildVenueResourceMetadata,
   expandMergedSlotToIndividual,
   mergeConsecutiveSlots
 });

package/package.json

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