@pisell/pisellos 0.0.556 → 0.0.557

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

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

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

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

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

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -121,6 +121,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private fetchResourceOccupyDetailsByResourceId;
     private resolveAdditionalOrderFromOccupyDetail;
     checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';

package/dist/solution/ScanOrder/index.js

@@ -32,7 +32,7 @@ import { OrderModule } from "../../modules/Order";
 import { AccountHooks } from "../../modules/Account/types";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
-import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, computeResourceIsFull, createEmptySummary, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityDimensionId, pickFirstCustomCapacityPaxBounds, normalizeEnabledItemRuleIds, normalizeOrderProduct, normalizeItemRuleStrategies, pickFirstDurationMinutesFromProducts, toNonNegativeInt, toPriceString, toBoolean, toPositiveString } from "./utils";
+import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, computeResourceIsFull, createEmptySummary, findReservationRuleProductByResourceId, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityDimensionId, 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";
@@ -2687,8 +2687,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           _occupyDetail$form_re2,
           _this$otherParams14,
           _this$store$order6,
-          _this$store$order8,
-          _this$store$order8$ge,
+          _this$store$order7,
+          _this$store$order7$ge,
           _this$otherParams15,
           businessCode,
           channel,
@@ -2713,6 +2713,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           scheduleDate,
           scheduleDatetime,
           loaded,
+          matchedRuleProduct,
+          ruleProductsForResource,
           occupancyMinutes,
           paxBounds,
           error,
@@ -2728,10 +2730,6 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           additionalOrderId,
           availabilityInfo,
           isAdditionalOrderMode,
-          _this$store$order7,
-          _res$data,
-          res,
-          entryPaxNumber,
           lastOrderInfo,
           historicalItems,
           _args37 = arguments;
@@ -2863,14 +2861,16 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 46:
               loaded = _context37.sent;
               if (Array.isArray(loaded)) {
-                this.enabledReservationRuleProducts = loaded;
-                occupancyMinutes = pickFirstDurationMinutesFromProducts(loaded);
+                matchedRuleProduct = findReservationRuleProductByResourceId(loaded, normalizedResourceId);
+                ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+                this.enabledReservationRuleProducts = ruleProductsForResource;
+                occupancyMinutes = pickFirstDurationMinutesFromProducts(ruleProductsForResource);
                 if (occupancyMinutes !== undefined) {
                   tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
                 }
-                if (hasCustomCapacityProduct(loaded)) {
+                if (hasCustomCapacityProduct(ruleProductsForResource)) {
                   pendingRequestEntryPax = 1;
-                  paxBounds = pickFirstCustomCapacityPaxBounds(loaded);
+                  paxBounds = pickFirstCustomCapacityPaxBounds(ruleProductsForResource);
                   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;
                 }
@@ -2977,27 +2977,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               if (isAdditionalOrderMode) {
                 tempOrder.order_id = additionalOrderId;
               }
-              if (!tempOrder.order_id) {
-                _context37.next = 86;
-                break;
-              }
-              _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 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) {
-                var _p$metadata;
-                return (_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.collect_pax;
-              })) === null || _res$data === void 0 || (_res$data = _res$data.metadata) === null || _res$data === void 0 ? void 0 : _res$data.collect_pax;
-              if (!entryPaxNumber) {
-                _context37.next = 86;
-                break;
-              }
-              _context37.next = 86;
-              return this.setEntryPaxNumber(entryPaxNumber);
-            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);
+              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 = isAdditionalOrderMode && Array.isArray(lastOrderInfo === null || lastOrderInfo === void 0 ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce(function (acc, p) {
                 if (typeof (p === null || p === void 0 ? void 0 : p.product_id) !== 'number') return acc;
                 acc.push(_objectSpread({
@@ -3008,13 +2988,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 90;
+              _context37.next = 82;
               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 90:
+            case 82:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -3036,31 +3016,70 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 95:
-              _context37.prev = 95;
+            case 87:
+              _context37.prev = 87;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 99:
+            case 91:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 95]]);
+        }, _callee37, this, [[3, 87]]);
       }));
       function checkResourceAvailable(_x19) {
         return _checkResourceAvailable.apply(this, arguments);
       }
       return checkResourceAvailable;
+    }() // 恢复之前订单的数据，读取 entrypax
+  }, {
+    key: "restorePreviousOrderData",
+    value: function () {
+      var _restorePreviousOrderData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
+        var tempOrder, _this$store$order8, _res$data, res, entryPaxNumber;
+        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              if (!tempOrder.order_id) {
+                _context38.next = 9;
+                break;
+              }
+              _context38.next = 4;
+              return (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getOrderInfoByRemote(tempOrder.order_id);
+            case 4:
+              res = _context38.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) {
+                var _p$metadata;
+                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) {
+                _context38.next = 9;
+                break;
+              }
+              _context38.next = 9;
+              return this.setEntryPaxNumber(entryPaxNumber);
+            case 9:
+            case "end":
+              return _context38.stop();
+          }
+        }, _callee38, this);
+      }));
+      function restorePreviousOrderData() {
+        return _restorePreviousOrderData.apply(this, arguments);
+      }
+      return restorePreviousOrderData;
     }() // 如果是加单的情况，提供返回当前订单相关信息的能力
   }, {
     key: "getAdditionalOrderInfo",
     value: function () {
-      var _getAdditionalOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
+      var _getAdditionalOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
         var result;
-        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               this.logMethodStart('getAdditionalOrderInfo');
               result = {
@@ -3074,12 +3093,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: result.orderId,
                 orderStatus: result.orderStatus
               });
-              return _context38.abrupt("return", result);
+              return _context39.abrupt("return", result);
             case 4:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee38, this);
+        }, _callee39, this);
       }));
       function getAdditionalOrderInfo() {
         return _getAdditionalOrderInfo.apply(this, arguments);
@@ -3089,25 +3108,25 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductList",
     value: function () {
-      var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
+      var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
         var _this$otherParams16;
         var menu_list_ids, res, productList, formattedRes;
-        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
               menu_list_ids = ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 || (_this$otherParams16 = _this$otherParams16.dineInConfig) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
-              _context39.prev = 2;
+              _context40.prev = 2;
               if (this.store.products) {
-                _context39.next = 5;
+                _context40.next = 5;
                 break;
               }
               throw new Error('products 模块未初始化');
             case 5:
-              _context39.next = 7;
+              _context40.next = 7;
               return this.store.products.loadProducts({
                 menu_list_ids: menu_list_ids,
                 cacheId: this.cacheId,
@@ -3115,7 +3134,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_datetime: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
             case 7:
-              res = _context39.sent;
+              res = _context40.sent;
               productList = this.assertProductListLoaded('getProductList', res, {
                 menu_list_ids: menu_list_ids,
                 cacheId: this.cacheId
@@ -3124,22 +3143,22 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               this.logMethodSuccess('getProductList', {
                 menuCount: menu_list_ids.length
               });
-              return _context39.abrupt("return", formattedRes);
+              return _context40.abrupt("return", formattedRes);
             case 14:
-              _context39.prev = 14;
-              _context39.t0 = _context39["catch"](2);
-              if (!(_context39.t0 !== null && _context39.t0 !== void 0 && _context39.t0.__scanOrderLogged)) {
-                this.logMethodError('getProductList', _context39.t0, {
+              _context40.prev = 14;
+              _context40.t0 = _context40["catch"](2);
+              if (!(_context40.t0 !== null && _context40.t0 !== void 0 && _context40.t0.__scanOrderLogged)) {
+                this.logMethodError('getProductList', _context40.t0, {
                   menu_list_ids: menu_list_ids,
                   cacheId: this.cacheId
                 });
               }
-              throw _context39.t0;
+              throw _context40.t0;
             case 18:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee39, this, [[2, 14]]);
+        }, _callee40, this, [[2, 14]]);
       }));
       function getProductList() {
         return _getProductList.apply(this, arguments);
@@ -3154,15 +3173,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
         var _ref9,
           _ref9$cover,
           cover,
-          _args40 = arguments;
-        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+          _args41 = arguments;
+        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _ref9 = _args40.length > 1 && _args40[1] !== undefined ? _args40[1] : {}, _ref9$cover = _ref9.cover, cover = _ref9$cover === void 0 ? false : _ref9$cover;
+              _ref9 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref9$cover = _ref9.cover, cover = _ref9$cover === void 0 ? false : _ref9$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3170,9 +3189,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context40.stop();
+              return _context41.stop();
           }
-        }, _callee40, this);
+        }, _callee41, this);
       }));
       function setOtherParams(_x20) {
         return _setOtherParams.apply(this, arguments);
@@ -3264,10 +3283,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setEntryPaxNumber",
     value: function () {
-      var _setEntryPaxNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(number) {
+      var _setEntryPaxNumber = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(number) {
         var pax, t;
-        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
               pax = normalizeSubmitCollectPaxValue(number);
               this.store.entryPaxNumber = pax;
@@ -3288,16 +3307,16 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.itemRulePrefillApplied = false;
-              _context41.next = 7;
+              _context42.next = 7;
               return this.refreshItemRuleQuantityLimits();
             case 7:
-              _context41.next = 9;
+              _context42.next = 9;
               return this.refreshCartValidationPassed();
             case 9:
             case "end":
-              return _context41.stop();
+              return _context42.stop();
           }
-        }, _callee41, this);
+        }, _callee42, this);
       }));
       function setEntryPaxNumber(_x21) {
         return _setEntryPaxNumber.apply(this, arguments);
@@ -3312,11 +3331,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncAdditionalOrderFromResource",
     value: function () {
-      var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(resourceId) {
+      var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(resourceId) {
         var _ref10, _ref11, _ref12, _this$store$resource2, _this$store$resource3, _occupyDetails$2, _this$store$resource4, _this$otherParams17, _this$store$order9;
         var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, result;
-        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
-          while (1) switch (_context42.prev = _context42.next) {
+        return _regeneratorRuntime().wrap(function _callee43$(_context43) {
+          while (1) switch (_context43.prev = _context43.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               normalizedResourceId = String((_ref10 = (_ref11 = (_ref12 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref12 !== void 0 ? _ref12 : (_this$store$resource2 = this.store.resource) === null || _this$store$resource2 === void 0 ? void 0 : _this$store$resource2.relationId) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource3 = this.store.resource) === null || _this$store$resource3 === void 0 ? void 0 : _this$store$resource3.relation_id) !== null && _ref10 !== void 0 ? _ref10 : '').trim();
@@ -3324,7 +3343,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceId: normalizedResourceId
               });
               if (normalizedResourceId) {
-                _context42.next = 7;
+                _context43.next = 7;
                 break;
               }
               _result = {
@@ -3332,18 +3351,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 reason: 'missing_resource_id'
               };
               this.logMethodSuccess('syncAdditionalOrderFromResource', _result);
-              return _context42.abrupt("return", _result);
+              return _context43.abrupt("return", _result);
             case 7:
-              _context42.next = 9;
+              _context43.next = 9;
               return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
             case 9:
-              occupyDetails = _context42.sent;
+              occupyDetails = _context43.sent;
               occupyDetail = (_occupyDetails$2 = occupyDetails[0]) !== null && _occupyDetails$2 !== void 0 ? _occupyDetails$2 : null;
               resourceSelectType = ((_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
               allowAddItems = toBoolean((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17 = _this$otherParams17.dineInConfig) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17['sale.allow_add_items']);
               result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(!result.matched || !result.order_id)) {
-                _context42.next = 17;
+                _context43.next = 17;
                 break;
               }
               this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
@@ -3351,7 +3370,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceSelectType: resourceSelectType,
                 allowAddItems: allowAddItems
               }));
-              return _context42.abrupt("return", result);
+              return _context43.abrupt("return", result);
             case 17:
               tempOrder.order_id = result.order_id;
               tempOrder.resource_id = normalizedResourceId;
@@ -3363,12 +3382,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceSelectType: resourceSelectType,
                 allowAddItems: allowAddItems
               }));
-              return _context42.abrupt("return", result);
+              return _context43.abrupt("return", result);
             case 24:
             case "end":
-              return _context42.stop();
+              return _context43.stop();
           }
-        }, _callee42, this);
+        }, _callee43, this);
       }));
       function syncAdditionalOrderFromResource(_x22) {
         return _syncAdditionalOrderFromResource.apply(this, arguments);

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

@@ -134,6 +134,11 @@ export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderPro
  * 从 reservation.enabled_reservation_rules 中收集 type=link 的商品 id。
  */
 export declare function collectLinkProductIdsFromReservationRules(rules: unknown): number[];
+/**
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
+ */
+export declare function findReservationRuleProductByResourceId(products: ProductData[], resourceId: string | number | null | undefined): ProductData | undefined;
 /**
  * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
  */

package/dist/solution/ScanOrder/utils.js

@@ -629,23 +629,55 @@ export function collectLinkProductIdsFromReservationRules(rules) {
 }
 
 /**
- * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
  */
-export function pickFirstDurationMinutesFromProducts(products) {
+export function findReservationRuleProductByResourceId(products, resourceId) {
+  var numericResourceId = Number(resourceId);
+  if (!Number.isFinite(numericResourceId) || numericResourceId <= 0) return undefined;
   var _iterator7 = _createForOfIteratorHelper(products),
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _product$duration;
+      var _product$product_reso;
       var product = _step7.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 hasMatchedResource = resources.some(function (resource) {
+        var defaultResources = Array.isArray(resource === null || resource === void 0 ? void 0 : resource.default_resource) ? resource.default_resource : [];
+        var optionalResources = Array.isArray(resource === null || resource === void 0 ? void 0 : resource.optional_resource) ? resource.optional_resource : [];
+        return [].concat(_toConsumableArray(defaultResources), _toConsumableArray(optionalResources)).some(function (id) {
+          return Number(id) === numericResourceId;
+        });
+      });
+      if (hasMatchedResource) return product;
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  return undefined;
+}
+
+/**
+ * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
+ */
+export function pickFirstDurationMinutesFromProducts(products) {
+  var _iterator8 = _createForOfIteratorHelper(products),
+    _step8;
+  try {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var _product$duration;
+      var product = _step8.value;
       var value = product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.value;
       var n = Number(value);
       if (Number.isFinite(n) && n > 0) return Math.floor(n);
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator7.f();
+    _iterator8.f();
   }
   return undefined;
 }
@@ -675,11 +707,11 @@ export function computeResourceIsFull(params) {
   if (!Number.isFinite(totalCapacity) || totalCapacity <= 0) return false;
   var now = dayjs();
   var occupied = 0;
-  var _iterator8 = _createForOfIteratorHelper(capacityList || []),
-    _step8;
+  var _iterator9 = _createForOfIteratorHelper(capacityList || []),
+    _step9;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var slot = _step8.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var slot = _step9.value;
       var start = dayjs(slot === null || slot === void 0 ? void 0 : slot.start_at);
       var end = dayjs(slot === null || slot === void 0 ? void 0 : slot.end_at);
       if (!start.isValid() || !end.isValid()) continue;
@@ -689,9 +721,9 @@ export function computeResourceIsFull(params) {
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator8.f();
+    _iterator9.f();
   }
   return occupied >= totalCapacity;
 }
@@ -701,11 +733,11 @@ export function computeResourceIsFull(params) {
  * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
  */
 export function pickFirstCustomCapacityPaxBounds(products) {
-  var _iterator9 = _createForOfIteratorHelper(products),
-    _step9;
+  var _iterator10 = _createForOfIteratorHelper(products),
+    _step10;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var p = _step9.value;
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var p = _step10.value;
       var cap = p === null || p === void 0 ? void 0 : p.capacity;
       if (!cap || cap.type !== 'custom') continue;
       if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
@@ -724,9 +756,9 @@ export function pickFirstCustomCapacityPaxBounds(products) {
       if (out.min !== undefined || out.max !== undefined) return out;
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator9.f();
+    _iterator10.f();
   }
   return undefined;
 }
@@ -736,11 +768,11 @@ export function pickFirstCustomCapacityPaxBounds(products) {
  * 无匹配时返回 `undefined`，调用方应回退为 `0`。
  */
 export function pickFirstCustomCapacityDimensionId(products) {
-  var _iterator10 = _createForOfIteratorHelper(products),
-    _step10;
+  var _iterator11 = _createForOfIteratorHelper(products),
+    _step11;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var p = _step10.value;
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      var p = _step11.value;
       var cap = p === null || p === void 0 ? void 0 : p.capacity;
       if (!cap || cap.type !== 'custom') continue;
       if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
@@ -756,9 +788,9 @@ export function pickFirstCustomCapacityDimensionId(products) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator11.e(err);
   } finally {
-    _iterator10.f();
+    _iterator11.f();
   }
   return undefined;
 }

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

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

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

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

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

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -121,6 +121,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private fetchResourceOccupyDetailsByResourceId;
     private resolveAdditionalOrderFromOccupyDetail;
     checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';

package/lib/solution/ScanOrder/index.js

@@ -1601,7 +1601,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   // 通过 resource_id + 店铺配置
   // hasOrderId 表示 url 上是否有 orderid，如果是的话，后续的流程会走加单
   async checkResourceAvailable(resourceId, hasOrderId = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const normalizedResourceId = String(resourceId ?? "").trim();
     this.logMethodStart("checkResourceAvailable", {
       resourceId: normalizedResourceId
@@ -1693,14 +1693,19 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId
       });
       if (Array.isArray(loaded)) {
-        this.enabledReservationRuleProducts = loaded;
-        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(loaded);
+        const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
+          loaded,
+          normalizedResourceId
+        );
+        const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+        this.enabledReservationRuleProducts = ruleProductsForResource;
+        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
         if (occupancyMinutes !== void 0) {
           tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
         }
-        if ((0, import_utils.hasCustomCapacityProduct)(loaded)) {
+        if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
           pendingRequestEntryPax = 1;
-          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(loaded);
+          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
           if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
             pendingRequestPaxMin = paxBounds.min;
           if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
@@ -1799,17 +1804,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       if (isAdditionalOrderMode) {
         tempOrder.order_id = additionalOrderId;
       }
-      if (tempOrder.order_id) {
-        const res = await ((_j = this.store.order) == null ? void 0 : _j.getOrderInfoByRemote(tempOrder.order_id));
-        const entryPaxNumber = (_n = (_m = (_l = (_k = res == null ? void 0 : res.data) == null ? void 0 : _k.bookings) == null ? void 0 : _l.find((p) => {
-          var _a2;
-          return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
-        })) == null ? void 0 : _m.metadata) == null ? void 0 : _n.collect_pax;
-        if (entryPaxNumber) {
-          await this.setEntryPaxNumber(entryPaxNumber);
-        }
-      }
-      const lastOrderInfo = (_p = (_o = this.store.order) == null ? void 0 : _o.getLastOrderInfo) == null ? void 0 : _p.call(_o);
+      const lastOrderInfo = (_k = (_j = this.store.order) == null ? void 0 : _j.getLastOrderInfo) == null ? void 0 : _k.call(_j);
       const historicalItems = isAdditionalOrderMode && Array.isArray(lastOrderInfo == null ? void 0 : lastOrderInfo.products) ? lastOrderInfo.products.reduce((acc, p) => {
         if (typeof (p == null ? void 0 : p.product_id) !== "number")
           return acc;
@@ -1821,7 +1816,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         return acc;
       }, []) : [];
       await this.setItemRuleRuntimeConfig({
-        serviceType: (_q = this.otherParams) == null ? void 0 : _q.businessCode,
+        serviceType: (_l = this.otherParams) == null ? void 0 : _l.businessCode,
         submissionIndex: isAdditionalOrderMode ? 1 : 0,
         historicalItems
       });
@@ -1851,6 +1846,21 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  // 恢复之前订单的数据，读取 entrypax
+  async restorePreviousOrderData() {
+    var _a, _b, _c, _d, _e;
+    const tempOrder = this.ensureTempOrder();
+    if (tempOrder.order_id) {
+      const res = await ((_a = this.store.order) == null ? void 0 : _a.getOrderInfoByRemote(tempOrder.order_id));
+      const entryPaxNumber = (_e = (_d = (_c = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.find((p) => {
+        var _a2;
+        return (_a2 = p.metadata) == null ? void 0 : _a2.collect_pax;
+      })) == null ? void 0 : _d.metadata) == null ? void 0 : _e.collect_pax;
+      if (entryPaxNumber) {
+        await this.setEntryPaxNumber(entryPaxNumber);
+      }
+    }
+  }
   // 如果是加单的情况，提供返回当前订单相关信息的能力
   async getAdditionalOrderInfo() {
     this.logMethodStart("getAdditionalOrderInfo");

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

@@ -134,6 +134,11 @@ export declare function normalizeOrderProduct(product: Partial<ScanOrderOrderPro
  * 从 reservation.enabled_reservation_rules 中收集 type=link 的商品 id。
  */
 export declare function collectLinkProductIdsFromReservationRules(rules: unknown): number[];
+/**
+ * 找到第一个归属指定桌台的预约规则商品。
+ * 归属判断基于商品资源中的 default_resource / optional_resource。
+ */
+export declare function findReservationRuleProductByResourceId(products: ProductData[], resourceId: string | number | null | undefined): ProductData | undefined;
 /**
  * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
  */

package/lib/solution/ScanOrder/utils.js

@@ -39,6 +39,7 @@ __export(utils_exports, {
   computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
   extractStrategyModelIdsFromTableConfig: () => extractStrategyModelIdsFromTableConfig,
+  findReservationRuleProductByResourceId: () => findReservationRuleProductByResourceId,
   getProductIdentityIndex: () => getProductIdentityIndex,
   getSafeProductNum: () => getSafeProductNum,
   getTopLevelProductId: () => getTopLevelProductId,
@@ -510,6 +511,27 @@ function collectLinkProductIdsFromReservationRules(rules) {
   }
   return [...new Set(ids)];
 }
+function findReservationRuleProductByResourceId(products, resourceId) {
+  var _a;
+  const numericResourceId = Number(resourceId);
+  if (!Number.isFinite(numericResourceId) || numericResourceId <= 0)
+    return void 0;
+  for (const product of products) {
+    const resources = (_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources;
+    if (!Array.isArray(resources))
+      continue;
+    const hasMatchedResource = resources.some((resource) => {
+      const defaultResources = Array.isArray(resource == null ? void 0 : resource.default_resource) ? resource.default_resource : [];
+      const optionalResources = Array.isArray(resource == null ? void 0 : resource.optional_resource) ? resource.optional_resource : [];
+      return [...defaultResources, ...optionalResources].some(
+        (id) => Number(id) === numericResourceId
+      );
+    });
+    if (hasMatchedResource)
+      return product;
+  }
+  return void 0;
+}
 function pickFirstDurationMinutesFromProducts(products) {
   var _a;
   for (const product of products) {
@@ -613,6 +635,7 @@ function pickFirstCustomCapacityDimensionId(products) {
   computeResourceIsFull,
   createEmptySummary,
   extractStrategyModelIdsFromTableConfig,
+  findReservationRuleProductByResourceId,
   getProductIdentityIndex,
   getSafeProductNum,
   getTopLevelProductId,

package/package.json

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