@pisell/pisellos 0.0.554 → 0.0.556

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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;
 
-      // 无 collect_pax 时的资源占用兜底：single 独占整张桌台，其余模式占 1 个容量位。
-      var resolveResourceCapacity = function resolveResourceCapacity() {
+      // ScanOrder 的 booking 容量只由预约规则决定：single 占用整张桌台，multiple 占用 1 个容量位。
+      var resolveBookingCapacityValue = function resolveBookingCapacityValue() {
         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;
+          if (Number.isFinite(num) && num > 0) return Math.max(1, Math.floor(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 hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
-        var resourceCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
+        var hasExplicitCollectPax = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
+        var bookingCapacityValue = resolveBookingCapacityValue();
         var pickOriginal = function pickOriginal(value) {
           if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
             var original = value.original;
@@ -1452,21 +1452,25 @@ 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: resourceCapacityValue,
+          capacity: bookingCapacityValue,
           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({}, booking.metadata || {}), resourceSelectType ? {
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, metadata), resourceSelectType ? {
               resource_select_type: resourceSelectType
             } : {}), resourceSelectType ? {
               capacity: [{
@@ -1516,7 +1520,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, pax, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
+        var _this$store$resource, _this$otherParams5, _this$otherParams6, _this$otherParams7, _this$otherParams8, _tempOrder$products, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1531,12 +1535,7 @@ 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') {
@@ -1546,7 +1545,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               this.store.order.persistTempOrder();
               enhancePayload = this.buildSubmitPayloadEnhancer();
-              _context18.next = 17;
+              _context18.next = 14;
               return this.store.order.submitTempOrder({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform,
@@ -1555,23 +1554,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 17:
+            case 14:
               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 23:
-              _context18.prev = 23;
+            case 20:
+              _context18.prev = 20;
               _context18.t0 = _context18["catch"](1);
               this.logMethodError('submitScanOrder', _context18.t0);
               throw _context18.t0;
-            case 27:
+            case 24:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[1, 23]]);
+        }, _callee18, this, [[1, 20]]);
       }));
       function submitScanOrder() {
         return _submitScanOrder.apply(this, arguments);
@@ -2621,7 +2620,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "resolveAdditionalOrderFromOccupyDetail",
-    value: function resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType) {
+    value: function resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType, allowAddItems) {
       var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
       if (currentOrderId) {
         return {
@@ -2629,15 +2628,27 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           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'
         };
       }
-      var orderListIds = (Array.isArray(detail === null || detail === void 0 ? void 0 : detail.order_list) ? (detail === null || detail === void 0 ? void 0 : detail.order_list) || [] : []).map(function (order) {
-        return toPositiveString(order === null || order === void 0 ? void 0 : order.id);
-      }).filter(Boolean);
+      if (!orderListIds.length) {
+        return {
+          matched: false,
+          reason: 'no_order'
+        };
+      }
+      if (!allowAddItems) {
+        return {
+          matched: false,
+          reason: 'add_items_disabled'
+        };
+      }
       if (orderListIds.length === 1) {
         return {
           matched: true,
@@ -2708,6 +2719,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           occupyDetails,
           occupyDetail,
           resourceSelectType,
+          allowAddItems,
           additionalOrderResult,
           _occupyDetail$order_l,
           multipleOrdersState,
@@ -2882,9 +2894,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               occupyDetail = (_occupyDetails$ = occupyDetails[0]) !== null && _occupyDetails$ !== void 0 ? _occupyDetails$ : null; // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
               resourceSelectType = this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
-              additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType);
+              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 = 60;
+                _context37.next = 61;
                 break;
               }
               multipleOrdersState = _objectSpread(_objectSpread({}, this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId)), {}, {
@@ -2905,13 +2918,19 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceSelectType: resourceSelectType
               });
               return _context37.abrupt("return", _availabilityInfo);
-            case 60:
+            case 61:
               // 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;
 
@@ -2948,23 +2967,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 75;
+                _context37.next = 76;
                 break;
               }
-              _context37.next = 75;
+              _context37.next = 76;
               return this.addNewOrder();
-            case 75:
+            case 76:
               isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
               if (isAdditionalOrderMode) {
                 tempOrder.order_id = additionalOrderId;
               }
               if (!tempOrder.order_id) {
-                _context37.next = 85;
+                _context37.next = 86;
                 break;
               }
-              _context37.next = 80;
+              _context37.next = 81;
               return (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getOrderInfoByRemote(tempOrder.order_id);
-            case 80:
+            case 81:
               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) {
@@ -2972,12 +2991,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) {
-                _context37.next = 85;
+                _context37.next = 86;
                 break;
               }
-              _context37.next = 85;
+              _context37.next = 86;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 85:
+            case 86:
               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) {
                 if (typeof (p === null || p === void 0 ? void 0 : p.product_id) !== 'number') return acc;
@@ -2989,13 +3008,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 89;
+              _context37.next = 90;
               return this.setItemRuleRuntimeConfig({
                 serviceType: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 89:
+            case 90:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -3017,18 +3036,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 94:
-              _context37.prev = 94;
+            case 95:
+              _context37.prev = 95;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 98:
+            case 99:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 94]]);
+        }, _callee37, this, [[3, 95]]);
       }));
       function checkResourceAvailable(_x19) {
         return _checkResourceAvailable.apply(this, arguments);
@@ -3294,8 +3313,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncAdditionalOrderFromResource",
     value: function () {
       var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(resourceId) {
-        var _ref10, _ref11, _ref12, _this$store$resource2, _this$store$resource3, _occupyDetails$2, _this$store$resource4, _this$store$order9;
-        var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, result;
+        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:
@@ -3321,17 +3340,19 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               occupyDetails = _context42.sent;
               occupyDetail = (_occupyDetails$2 = occupyDetails[0]) !== null && _occupyDetails$2 !== void 0 ? _occupyDetails$2 : null;
               resourceSelectType = ((_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
-              result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType);
+              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 = 16;
+                _context42.next = 17;
                 break;
               }
               this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
                 resourceId: normalizedResourceId,
-                resourceSelectType: resourceSelectType
+                resourceSelectType: resourceSelectType,
+                allowAddItems: allowAddItems
               }));
               return _context42.abrupt("return", result);
-            case 16:
+            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;
@@ -3339,10 +3360,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               (_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
+                resourceSelectType: resourceSelectType,
+                allowAddItems: allowAddItems
               }));
               return _context42.abrupt("return", result);
-            case 23:
+            case 24:
             case "end":
               return _context42.stop();
           }
@@ -3376,9 +3398,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkAllowAddItems",
     value: function checkAllowAddItems() {
-      var _this$otherParams17;
+      var _this$otherParams18;
       this.logMethodStart('checkAllowAddItems');
-      var dineInConfig = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.dineInConfig) || {};
       var result = {
         enabled: toBoolean(dineInConfig['sale.allow_add_items'])
       };
@@ -3391,9 +3413,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams18;
+      var _this$otherParams19;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3407,9 +3429,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams19;
+      var _this$otherParams20;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.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

@@ -255,7 +255,7 @@ export interface ScanOrderReservationResourceSelectInfo {
 export interface ScanOrderAllowAddItemsInfo {
     enabled: boolean;
 }
-export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'invalid_order_id';
+export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
 export interface ScanOrderSyncAdditionalOrderResult {
     matched: boolean;
     order_id?: string;

package/lib/solution/ScanOrder/index.js

@@ -867,13 +867,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const ruleProduct = this.enabledReservationRuleProducts[0];
     const resourceState = this.store.resource;
     const resourceSelectType = resourceState == null ? void 0 : resourceState.resourceSelectType;
-    const resolveResourceCapacity = () => {
+    const resolveBookingCapacityValue = () => {
       var _a;
       if (resourceSelectType === "single") {
         const raw = (_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.capacity;
         const num = Number(raw);
         if (Number.isFinite(num) && num > 0)
-          return num;
+          return Math.max(1, Math.floor(num));
         return 1;
       }
       return 1;
@@ -892,8 +892,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         };
       }
       const rawCollectPax = (_a = tempOrder.metadata) == null ? void 0 : _a.collect_pax;
-      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
-      const resourceCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
+      const hasExplicitCollectPax = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const bookingCapacityValue = resolveBookingCapacityValue();
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
           const original = value.original;
@@ -909,35 +909,42 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: resourceCapacityValue,
+        capacity: bookingCapacityValue,
         metadata: this.buildScanOrderResourceMetadata({
           resourceState,
           resourceName: mainField
         })
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
-      const bookingCapacityValue = resourceCapacityValue;
       const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
-      const nextBookings = (payload.bookings || []).map((booking, idx) => ({
-        ...booking,
-        number: bookingCapacityValue,
-        appointment_status: "started",
-        metadata: {
-          ...booking.metadata || {},
-          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
-          ...resourceSelectType ? {
-            capacity: [
-              {
-                id: bookingCapacityDimensionId,
-                value: bookingCapacityValue,
-                name: ""
-              }
-            ]
-          } : {}
-        },
-        ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
-        ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
-      }));
+      const nextBookings = (payload.bookings || []).map((booking, idx) => {
+        const metadata = { ...booking.metadata || {} };
+        if (hasExplicitCollectPax) {
+          metadata.collect_pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax);
+        } else {
+          delete metadata.collect_pax;
+        }
+        return {
+          ...booking,
+          number: bookingCapacityValue,
+          appointment_status: "started",
+          metadata: {
+            ...metadata,
+            ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
+            ...resourceSelectType ? {
+              capacity: [
+                {
+                  id: bookingCapacityDimensionId,
+                  value: bookingCapacityValue,
+                  name: ""
+                }
+              ]
+            } : {}
+          },
+          ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
+          ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
+        };
+      });
       const nextProducts = [...payload.products || []];
       if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
         const sellingPrice = String(ruleProduct.price ?? "0.00");
@@ -974,10 +981,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (!this.store.order) {
         throw new Error("scanOrder解决方案需要 order 模块支持");
       }
-      const pax = (0, import_utils2.normalizeSubmitCollectPaxValue)(this.store.entryPaxNumber);
-      this.store.entryPaxNumber = pax;
       const tempOrderForSubmit = this.store.order.ensureTempOrder();
-      tempOrderForSubmit.metadata = { ...tempOrderForSubmit.metadata, collect_pax: pax };
       tempOrderForSubmit.delivery_type = "shop_service";
       const resourceTableName = (_b = (_a = this.store.resource) == null ? void 0 : _a.table_form_record) == null ? void 0 : _b.name;
       if (resourceTableName && typeof resourceTableName === "object") {
@@ -1549,7 +1553,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     }
     return ((_c = response == null ? void 0 : response.data) == null ? void 0 : _c.occupy_details) ?? [];
   }
-  resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType) {
+  resolveAdditionalOrderFromOccupyDetail(detail, resourceSelectType, allowAddItems) {
     const currentOrderId = (0, import_utils.toPositiveString)(detail == null ? void 0 : detail.order_id);
     if (currentOrderId) {
       return {
@@ -1557,13 +1561,25 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         order_id: currentOrderId
       };
     }
+    const orderListIds = (Array.isArray(detail == null ? void 0 : detail.order_list) ? (detail == null ? void 0 : detail.order_list) || [] : []).map((order) => (0, import_utils.toPositiveString)(order == null ? void 0 : order.id)).filter(Boolean);
     if (resourceSelectType !== "single") {
       return {
         matched: false,
         reason: "no_order"
       };
     }
-    const orderListIds = (Array.isArray(detail == null ? void 0 : detail.order_list) ? (detail == null ? void 0 : detail.order_list) || [] : []).map((order) => (0, import_utils.toPositiveString)(order == null ? void 0 : order.id)).filter(Boolean);
+    if (!orderListIds.length) {
+      return {
+        matched: false,
+        reason: "no_order"
+      };
+    }
+    if (!allowAddItems) {
+      return {
+        matched: false,
+        reason: "add_items_disabled"
+      };
+    }
     if (orderListIds.length === 1) {
       return {
         matched: true,
@@ -1706,9 +1722,11 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       const resourceSelectType = this.resolveResourceSelectType(
         (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id)
       );
+      const allowAddItems = (0, import_utils.toBoolean)(dineInConfig == null ? void 0 : dineInConfig["sale.allow_add_items"]);
       const additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(
         occupyDetail,
-        resourceSelectType
+        resourceSelectType,
+        allowAddItems
       );
       if (additionalOrderResult.reason === "multiple_orders") {
         const multipleOrdersState = {
@@ -1740,6 +1758,12 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (additionalOrderId) {
         resourceState.mode = "additional_order";
         resourceState.order_id = additionalOrderId;
+      } else if (additionalOrderResult.reason === "add_items_disabled") {
+        resourceState.mode = "resource_busy";
+        resourceState.order_id = "0";
+      } else if (resourceSelectType === "multiple" && resourceState.isFull) {
+        resourceState.mode = "resource_busy";
+        resourceState.order_id = "0";
       }
       this.store.resource = resourceState;
       if (pendingRequestEntryPax !== void 0) {
@@ -1972,7 +1996,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     return this.store.entryPaxNumber;
   }
   async syncAdditionalOrderFromResource(resourceId) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const tempOrder = this.ensureTempOrder();
     const normalizedResourceId = String(
       resourceId ?? tempOrder.resource_id ?? ((_a = this.store.resource) == null ? void 0 : _a.relationId) ?? ((_b = this.store.resource) == null ? void 0 : _b.relation_id) ?? ""
@@ -1991,15 +2015,20 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
     const occupyDetail = occupyDetails[0] ?? null;
     const resourceSelectType = ((_c = this.store.resource) == null ? void 0 : _c.resourceSelectType) || this.resolveResourceSelectType((0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id));
+    const allowAddItems = (0, import_utils.toBoolean)(
+      (_e = (_d = this.otherParams) == null ? void 0 : _d.dineInConfig) == null ? void 0 : _e["sale.allow_add_items"]
+    );
     const result = this.resolveAdditionalOrderFromOccupyDetail(
       occupyDetail,
-      resourceSelectType
+      resourceSelectType,
+      allowAddItems
     );
     if (!result.matched || !result.order_id) {
       this.logMethodSuccess("syncAdditionalOrderFromResource", {
         ...result,
         resourceId: normalizedResourceId,
-        resourceSelectType
+        resourceSelectType,
+        allowAddItems
       });
       return result;
     }
@@ -2007,11 +2036,12 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     tempOrder.resource_id = normalizedResourceId;
     tempOrder.relation_id = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_record_id) || normalizedResourceId || tempOrder.relation_id;
     tempOrder.table_form_id = (0, import_utils.toPositiveString)(occupyDetail == null ? void 0 : occupyDetail.form_id) || tempOrder.table_form_id;
-    (_d = this.store.order) == null ? void 0 : _d.persistTempOrder();
+    (_f = this.store.order) == null ? void 0 : _f.persistTempOrder();
     this.logMethodSuccess("syncAdditionalOrderFromResource", {
       ...result,
       resourceId: normalizedResourceId,
-      resourceSelectType
+      resourceSelectType,
+      allowAddItems
     });
     return result;
   }

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

@@ -255,7 +255,7 @@ export interface ScanOrderReservationResourceSelectInfo {
 export interface ScanOrderAllowAddItemsInfo {
     enabled: boolean;
 }
-export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'invalid_order_id';
+export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
 export interface ScanOrderSyncAdditionalOrderResult {
     matched: boolean;
     order_id?: string;

package/package.json

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