@pisell/pisellos 0.0.568 → 0.10.1

package/dist/solution/ScanOrder/index.js

@@ -26,23 +26,22 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { BaseModule } from "../../modules/BaseModule";
+import { BaseSalesImpl } from "../BaseSales";
 import { ScanOrderHooks } from "./types";
 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, findReservationRuleProductByResourceId, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityDimensionId, pickFirstCustomCapacityPaxBounds, normalizeEnabledItemRuleIds, normalizeOrderProduct, normalizeItemRuleStrategies, pickFirstDurationMinutesFromProducts, toNonNegativeInt, toPriceString, toBoolean, toPositiveString } from "./utils";
+import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, computeResourceIsFull, filterProductsForScanOrderMore, 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";
 import { getDateIsInSchedule } from "../../modules/Schedule/getDateIsInSchedule";
-import { composeLinePrice, createUuidV4, normalizeSubmitCollectPaxValue, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, buildSubmitPayload, createUuidV4, getProductSkuOptions, normalizeSubmitCollectPaxValue, sumOptionUnitPrice } from "../../modules/Order/utils";
 import dayjs from 'dayjs';
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
-export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
-  _inherits(ScanOrderImpl, _BaseModule);
+export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
+  _inherits(ScanOrderImpl, _BaseSalesImpl);
   var _super = _createSuper(ScanOrderImpl);
   function ScanOrderImpl(name, version) {
     var _this;
@@ -83,8 +82,6 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "customerLoginRefreshIdInFlight", null);
     return _this;
   }
-
-  /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
   _createClass(ScanOrderImpl, [{
     key: "getScanOrderLoggerContext",
     value: function getScanOrderLoggerContext() {
@@ -165,7 +162,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   payload: payload,
                   extra: extra
                 });
-              } else {}
+              } else {
+                console.log('[ScanOrder][log-fallback]', params.title, {
+                  payload: payload,
+                  extra: extra
+                });
+              }
               return _context.abrupt("return");
             case 6:
               _context.next = 8;
@@ -430,70 +432,42 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return refreshOrderMarketingAfterLogin;
     }()
+  }, {
+    key: "getRegisteredModuleNames",
+    value: function getRegisteredModuleNames() {
+      return ['scanOrderLogger', 'products', 'order', 'salesSummary', 'schedule'];
+    }
+  }, {
+    key: "createSubModule",
+    value: function createSubModule(moduleName) {
+      if (moduleName === 'scanOrderLogger') {
+        return createModule('scanOrderLogger', this.name);
+      }
+      return _get(_getPrototypeOf(ScanOrderImpl.prototype), "createSubModule", this).call(this, moduleName);
+    }
+
+    /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
   }, {
     key: "getCacheId",
     value: function getCacheId() {
       return this.cacheId;
     }
-  }, {
-    key: "destroyRegisteredChildModules",
-    value: function () {
-      var _destroyRegisteredChildModules = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var modules, _i3, _modules, mod;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              modules = [this.store.schedule, this.store.salesSummary, this.store.order, this.store.products, this.store.scanOrderLogger];
-              _i3 = 0, _modules = modules;
-            case 2:
-              if (!(_i3 < _modules.length)) {
-                _context6.next = 10;
-                break;
-              }
-              mod = _modules[_i3];
-              if (!(mod && typeof mod.destroy === 'function')) {
-                _context6.next = 7;
-                break;
-              }
-              _context6.next = 7;
-              return Promise.resolve(mod.destroy());
-            case 7:
-              _i3++;
-              _context6.next = 2;
-              break;
-            case 10:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this);
-      }));
-      function destroyRegisteredChildModules() {
-        return _destroyRegisteredChildModules.apply(this, arguments);
-      }
-      return destroyRegisteredChildModules;
-    }()
   }, {
     key: "initialize",
     value: function () {
-      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(core) {
-        var _options$otherParams,
-          _this$otherParams,
-          _this$otherParams2,
-          _this$otherParams3,
-          _this4 = this;
+      var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(core) {
+        var _options$otherParams, _this$otherParams, _this$otherParams2, _this$otherParams3;
         var options,
-          moduleArr,
-          scheduleModule,
+          _this$otherParams4,
+          _this$otherParams5,
           _this$store$order,
           _this$store$order2,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+          _args6 = arguments;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              options = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : {};
+              options = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : {};
               this.logMethodStart('initialize');
-              this.core = core;
-              this.initializeOptions = options || {};
               this.store = _objectSpread(_objectSpread({}, this.store), options.store);
               this.store.entryContext = ((_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.entryContext) || this.store.entryContext;
               this.store.status = 'initializing';
@@ -509,120 +483,76 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 passed: null,
                 failures: []
               };
-              this.window = core.getPlugin('window');
-              this.request = core.getPlugin('request');
-              if (this.window) {
-                _context7.next = 21;
-                break;
-              }
-              this.logMethodError('initialize', 'window plugin missing');
-              throw new Error('scanOrder解决方案需要 window 插件支持');
-            case 21:
-              if (this.request) {
-                _context7.next = 24;
-                break;
-              }
-              this.logMethodError('initialize', 'request plugin missing');
-              throw new Error('scanOrder解决方案需要 request 插件支持');
-            case 24:
-              moduleArr = ['scanOrderLogger', 'products', 'order', 'salesSummary'];
-              moduleArr.forEach(function (step) {
-                var targetModule = createModule(step, _this4.name);
-                if (targetModule) {
-                  var _this4$store$order, _this4$otherParams, _this4$otherParams2, _this4$otherParams3, _this4$otherParams4;
-                  _this4.store[step] = targetModule;
-                  var initialState = step === 'salesSummary' ? {
-                    summary: ((_this4$store$order = _this4.store.order) === null || _this4$store$order === void 0 || (_this4$store$order = _this4$store$order.getTempOrder()) === null || _this4$store$order === void 0 ? void 0 : _this4$store$order.summary) || createEmptySummary()
-                  } : {};
-                  var loggerProvider = ((_this4$otherParams = _this4.otherParams) === null || _this4$otherParams === void 0 ? void 0 : _this4$otherParams.scanOrderLoggerProvider) || 'feishu';
-                  var loggerConfig = ((_this4$otherParams2 = _this4.otherParams) === null || _this4$otherParams2 === void 0 ? void 0 : _this4$otherParams2.scanOrderLoggerConfig) || {
-                    feishu: {
-                      webhook: 'https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed',
-                      errorHook: 'https://open.feishu.cn/open-apis/bot/v2/hook/015b7c2a-dd3c-4c30-9898-ef0f5253111f'
-                    }
-                  };
-                  _this4.core.registerModule(targetModule, {
-                    initialState: initialState,
-                    otherParams: _objectSpread(_objectSpread({}, _this4.otherParams), {}, {
-                      fatherModule: _this4.name,
-                      openCache: (_this4$otherParams3 = _this4.otherParams) !== null && _this4$otherParams3 !== void 0 && _this4$otherParams3.cacheId ? true : false,
-                      cacheId: (_this4$otherParams4 = _this4.otherParams) === null || _this4$otherParams4 === void 0 ? void 0 : _this4$otherParams4.cacheId,
-                      salesSummaryModuleName: "".concat(_this4.name, "_salesSummary"),
-                      provider: loggerProvider,
-                      providerConfig: loggerConfig,
-                      context: _this4.getScanOrderLoggerContext()
-                    })
-                  });
-                } else {
-                  _this4.logMethodError('initialize', "module ".concat(step, " missing"));
-                  throw new Error("\u6A21\u5757 ".concat(step, " \u4E0D\u5B58\u5728"));
-                }
-              });
+              _context6.next = 16;
+              return _get(_getPrototypeOf(ScanOrderImpl.prototype), "initialize", this).call(this, core, options);
+            case 16:
               if (this.store.scanOrderLogger) {
+                this.store.scanOrderLogger.setProvider(((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.scanOrderLoggerProvider) || 'feishu');
+                this.store.scanOrderLogger.setProviderConfig(((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.scanOrderLoggerConfig) || {
+                  feishu: {
+                    webhook: 'https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed',
+                    errorHook: 'https://open.feishu.cn/open-apis/bot/v2/hook/015b7c2a-dd3c-4c30-9898-ef0f5253111f'
+                  }
+                });
                 this.store.scanOrderLogger.setContext(this.getScanOrderLoggerContext());
               }
-              scheduleModule = new ScheduleModule("".concat(this.name, "_schedule"));
-              this.store.schedule = scheduleModule;
-              this.core.registerModule(scheduleModule, {
-                otherParams: _objectSpread(_objectSpread({}, this.otherParams), {}, {
-                  fatherModule: this.name
-                })
-              });
               this.registerCustomerLoginListeners();
-              _context7.prev = 31;
-              _context7.next = 34;
+              console.log('[ScanOrder] 初始化开始');
+              _context6.prev = 19;
+              _context6.next = 22;
               return (_this$store$order = this.store.order) === null || _this$store$order === void 0 ? void 0 : _this$store$order.recalculateSummary({
                 createIfMissing: false
               });
-            case 34:
+            case 22:
               (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || _this$store$order2.persistTempOrder();
-              _context7.next = 37;
+              _context6.next = 25;
               return this.loadRuntimeConfigs();
-            case 37:
+            case 25:
               if (!this.store.schedule) {
-                _context7.next = 46;
+                _context6.next = 34;
                 break;
               }
-              _context7.prev = 38;
-              _context7.next = 41;
+              _context6.prev = 26;
+              _context6.next = 29;
               return this.store.schedule.loadAllSchedule();
-            case 41:
-              _context7.next = 46;
+            case 29:
+              _context6.next = 34;
               break;
-            case 43:
-              _context7.prev = 43;
-              _context7.t0 = _context7["catch"](38);
-              console.warn('[ScanOrder] loadAllSchedule 失败，operating_hours 判定将跳过', _context7.t0);
-            case 46:
-              _context7.next = 48;
+            case 31:
+              _context6.prev = 31;
+              _context6.t0 = _context6["catch"](26);
+              console.warn('[ScanOrder] loadAllSchedule 失败，operating_hours 判定将跳过', _context6.t0);
+            case 34:
+              _context6.next = 36;
               return this.refreshItemRuleQuantityLimits();
-            case 48:
+            case 36:
               this.store.status = 'ready';
-              _context7.next = 51;
+              console.log('[ScanOrder] 初始化完成');
+              _context6.next = 40;
               return this.core.effects.emit(ScanOrderHooks.onInited, {
                 status: this.store.status
               });
-            case 51:
+            case 40:
               this.logMethodSuccess('initialize', {
                 status: this.store.status
               });
-              _context7.next = 61;
+              _context6.next = 50;
               break;
-            case 54:
-              _context7.prev = 54;
-              _context7.t1 = _context7["catch"](31);
+            case 43:
+              _context6.prev = 43;
+              _context6.t1 = _context6["catch"](19);
               this.store.status = 'error';
-              this.store.error = _context7.t1 instanceof Error ? _context7.t1.message : '初始化失败';
-              console.error('[ScanOrder] 初始化失败', _context7.t1);
-              this.logMethodError('initialize', _context7.t1, {
+              this.store.error = _context6.t1 instanceof Error ? _context6.t1.message : '初始化失败';
+              console.error('[ScanOrder] 初始化失败', _context6.t1);
+              this.logMethodError('initialize', _context6.t1, {
                 status: this.store.status
               });
-              throw _context7.t1;
-            case 61:
+              throw _context6.t1;
+            case 50:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this, [[31, 54], [38, 43]]);
+        }, _callee6, this, [[19, 43], [26, 31]]);
       }));
       function initialize(_x5) {
         return _initialize.apply(this, arguments);
@@ -632,25 +562,23 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.logMethodStart('destroy');
               this.clearLoginEffectListeners();
-              _context8.next = 4;
+              _context7.next = 4;
               return this.core.effects.emit(ScanOrderHooks.onDestroy, {});
             case 4:
-              _context8.next = 6;
-              return this.destroyRegisteredChildModules();
-            case 6:
               _get(_getPrototypeOf(ScanOrderImpl.prototype), "destroy", this).call(this);
+              console.log('[ScanOrder] 已销毁');
               this.logMethodSuccess('destroy');
-            case 8:
+            case 7:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -660,32 +588,33 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "retryInit",
     value: function () {
-      var _retryInit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _retryInit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.logMethodStart('retryInit');
               // TODO: 细化重试策略（指数退避、最大重试次数）后替换当前实现
-              _context9.next = 3;
+              console.log('[ScanOrder] retryInit 调用');
+              _context8.next = 4;
               return this.core.effects.emit(ScanOrderHooks.onRetryInit, {});
-            case 3:
-              _context9.prev = 3;
-              _context9.next = 6;
+            case 4:
+              _context8.prev = 4;
+              _context8.next = 7;
               return this.initialize(this.core, this.initializeOptions);
-            case 6:
+            case 7:
               this.logMethodSuccess('retryInit');
-              _context9.next = 13;
+              _context8.next = 14;
               break;
-            case 9:
-              _context9.prev = 9;
-              _context9.t0 = _context9["catch"](3);
-              this.logMethodError('retryInit', _context9.t0);
-              throw _context9.t0;
-            case 13:
+            case 10:
+              _context8.prev = 10;
+              _context8.t0 = _context8["catch"](4);
+              this.logMethodError('retryInit', _context8.t0);
+              throw _context8.t0;
+            case 14:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this, [[3, 9]]);
+        }, _callee8, this, [[4, 10]]);
       }));
       function retryInit() {
         return _retryInit.apply(this, arguments);
@@ -695,41 +624,42 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "refresh",
     value: function () {
-      var _refresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _refresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               this.logMethodStart('refresh');
               // TODO: 接入真实刷新逻辑（资源重拉取、流程重建）后替换当前实现
-              _context10.prev = 1;
+              console.log('[ScanOrder] refresh 调用');
+              _context9.prev = 2;
               this.store.status = 'initializing';
-              _context10.next = 5;
+              _context9.next = 6;
               return this.loadRuntimeConfigs();
-            case 5:
-              _context10.next = 7;
+            case 6:
+              _context9.next = 8;
               return this.refreshItemRuleQuantityLimits();
-            case 7:
+            case 8:
               this.store.status = 'ready';
-              _context10.next = 10;
+              _context9.next = 11;
               return this.core.effects.emit(ScanOrderHooks.onRefresh, {
                 status: this.store.status
               });
-            case 10:
+            case 11:
               this.logMethodSuccess('refresh', {
                 status: this.store.status
               });
-              _context10.next = 17;
+              _context9.next = 18;
               break;
-            case 13:
-              _context10.prev = 13;
-              _context10.t0 = _context10["catch"](1);
-              this.logMethodError('refresh', _context10.t0);
-              throw _context10.t0;
-            case 17:
+            case 14:
+              _context9.prev = 14;
+              _context9.t0 = _context9["catch"](2);
+              this.logMethodError('refresh', _context9.t0);
+              throw _context9.t0;
+            case 18:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10, this, [[1, 13]]);
+        }, _callee9, this, [[2, 14]]);
       }));
       function refresh() {
         return _refresh.apply(this, arguments);
@@ -817,16 +747,27 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderNote",
     value: function updateTempOrderNote(note) {
+      var _this4 = this;
+      var sync = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       this.logMethodStart('updateTempOrderNote', {
         noteLength: String(note || '').length
       });
       try {
         if (!this.store.order) throw new Error('order 模块未初始化');
-        var result = this.store.order.updateTempOrderNote(note);
+        var result = this.store.order.updateTempOrderNote(note, sync);
+        if (result && typeof result.then === 'function') {
+          return result.then(function (nextNote) {
+            _this4.logMethodSuccess('updateTempOrderNote', {
+              noteLength: nextNote.length
+            });
+            return nextNote;
+          });
+        }
+        var nextNote = result;
         this.logMethodSuccess('updateTempOrderNote', {
-          noteLength: result.length
+          noteLength: nextNote.length
         });
-        return result;
+        return nextNote;
       } catch (error) {
         this.logMethodError('updateTempOrderNote', error);
         throw error;
@@ -842,12 +783,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         mode: mode
       });
       try {
-        var _this$otherParams4;
+        var _this$otherParams6;
         if (!this.store.order) throw new Error('order 模块未初始化');
         var tempOrder = this.store.order.ensureTempOrder();
         tempOrder.metadata = _objectSpread(_objectSpread({}, tempOrder.metadata || {}), {}, {
           shop_service_data: _objectSpread(_objectSpread({}, (tempOrder.metadata || {}).shop_service_data || {}), {}, {
-            service_type: ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) === 'dine_in' ? 'dine_in' : '',
+            service_type: ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) === 'dine_in' ? 'dine_in' : '',
             pickup_reference_mode: mode
           })
         });
@@ -884,8 +825,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       }
     }
   }, {
-    key: "ensureTempOrder",
-    value: function ensureTempOrder() {
+    key: "ensureScanOrderTempOrder",
+    value: function ensureScanOrderTempOrder() {
       if (!this.store.order) throw new Error('order 模块未初始化');
       return this.store.order.ensureTempOrder();
     }
@@ -894,37 +835,37 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addNewOrder",
     value: function () {
-      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               this.logMethodStart('addNewOrder');
-              _context11.prev = 1;
+              _context10.prev = 1;
               if (this.store.order) {
-                _context11.next = 4;
+                _context10.next = 4;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 4:
-              _context11.next = 6;
+              _context10.next = 6;
               return this.store.order.addNewOrder();
             case 6:
-              tempOrder = _context11.sent;
+              tempOrder = _context10.sent;
               this.logMethodSuccess('addNewOrder', {
                 productCount: tempOrder.products.length
               });
-              return _context11.abrupt("return", tempOrder);
+              return _context10.abrupt("return", tempOrder);
             case 11:
-              _context11.prev = 11;
-              _context11.t0 = _context11["catch"](1);
-              this.logMethodError('addNewOrder', _context11.t0);
-              throw _context11.t0;
+              _context10.prev = 11;
+              _context10.t0 = _context10["catch"](1);
+              this.logMethodError('addNewOrder', _context10.t0);
+              throw _context10.t0;
             case 15:
             case "end":
-              return _context11.stop();
+              return _context10.stop();
           }
-        }, _callee11, this, [[1, 11]]);
+        }, _callee10, this, [[1, 11]]);
       }));
       function addNewOrder() {
         return _addNewOrder.apply(this, arguments);
@@ -935,15 +876,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOrder",
     value: function () {
-      var _restoreOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _restoreOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.logMethodStart('restoreOrder');
-              _context12.prev = 1;
+              _context11.prev = 1;
               if (this.store.order) {
-                _context12.next = 4;
+                _context11.next = 4;
                 break;
               }
               throw new Error('scanOrder 解决方案需要 order 模块支持');
@@ -953,17 +894,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               this.enabledReservationRuleProducts = [];
               tempOrder = this.store.order.restoreOrder();
               this.logMethodSuccess('restoreOrder');
-              return _context12.abrupt("return", tempOrder);
+              return _context11.abrupt("return", tempOrder);
             case 12:
-              _context12.prev = 12;
-              _context12.t0 = _context12["catch"](1);
-              this.logMethodError('restoreOrder', _context12.t0);
-              throw _context12.t0;
+              _context11.prev = 12;
+              _context11.t0 = _context11["catch"](1);
+              this.logMethodError('restoreOrder', _context11.t0);
+              throw _context11.t0;
             case 16:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
-        }, _callee12, this, [[1, 12]]);
+        }, _callee11, this, [[1, 12]]);
       }));
       function restoreOrder() {
         return _restoreOrder.apply(this, arguments);
@@ -984,37 +925,37 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var summary;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               this.logMethodStart('getSummary');
-              _context13.prev = 1;
+              _context12.prev = 1;
               if (this.store.order) {
-                _context13.next = 4;
+                _context12.next = 4;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 4:
-              _context13.next = 6;
-              return this.store.order.getScanOrderSummary();
+              _context12.next = 6;
+              return this.store.order.getOrderSummary();
             case 6:
-              summary = _context13.sent;
+              summary = _context12.sent;
               this.logMethodSuccess('getSummary', {
                 totalAmount: summary.total_amount
               });
-              return _context13.abrupt("return", summary);
+              return _context12.abrupt("return", summary);
             case 11:
-              _context13.prev = 11;
-              _context13.t0 = _context13["catch"](1);
-              this.logMethodError('getSummary', _context13.t0);
-              throw _context13.t0;
+              _context12.prev = 11;
+              _context12.t0 = _context12["catch"](1);
+              this.logMethodError('getSummary', _context12.t0);
+              throw _context12.t0;
             case 15:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
-        }, _callee13, this, [[1, 11]]);
+        }, _callee12, this, [[1, 11]]);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -1030,30 +971,30 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scanCode",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(code, customerId) {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(code, customerId) {
         var raw;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               this.logMethodStart('scanCode', {
                 code: code
               });
-              _context14.prev = 1;
+              _context13.prev = 1;
               if (this.store.order) {
-                _context14.next = 4;
+                _context13.next = 4;
                 break;
               }
               throw new Error('order 模块未初始化');
             case 4:
-              _context14.next = 6;
+              _context13.next = 6;
               return this.store.order.scanCode(code, customerId);
             case 6:
-              raw = _context14.sent;
+              raw = _context13.sent;
               if (!raw.isAvailable) {
-                _context14.next = 11;
+                _context13.next = 11;
                 break;
               }
-              _context14.next = 10;
+              _context13.next = 10;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
@@ -1063,21 +1004,21 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               this.logMethodSuccess('scanCode', {
                 isAvailable: raw.isAvailable
               });
-              return _context14.abrupt("return", {
+              return _context13.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
                 unavailableReason: raw.unavailableReason
               });
             case 15:
-              _context14.prev = 15;
-              _context14.t0 = _context14["catch"](1);
-              this.logMethodError('scanCode', _context14.t0);
-              throw _context14.t0;
+              _context13.prev = 15;
+              _context13.t0 = _context13["catch"](1);
+              this.logMethodError('scanCode', _context13.t0);
+              throw _context13.t0;
             case 19:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
-        }, _callee14, this, [[1, 15]]);
+        }, _callee13, this, [[1, 15]]);
       }));
       function scanCode(_x6, _x7) {
         return _scanCode.apply(this, arguments);
@@ -1087,15 +1028,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDiscountSelected",
     value: function () {
-      var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
-        var _tempOrder$holder, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$_origin, _product$metadata$sou, _product$metadata, _product$metadata2, _product$original_pri, product, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
+        var _tempOrder$holder, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _origin, _product$metadata$sou, _product$metadata, _product$metadata2, _product$original_pri, product, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               this.logMethodStart('setDiscountSelected', params);
-              _context15.prev = 1;
+              _context14.prev = 1;
               if (this.store.order) {
-                _context15.next = 4;
+                _context14.next = 4;
                 break;
               }
               throw new Error('order 模块未初始化');
@@ -1115,7 +1056,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 form_record_id: tempOrder.holder.form_record_id
               }] : [];
               nextDiscountList = updated;
-              _context15.next = 14;
+              _context14.next = 14;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(updated);
             case 14:
               if (rulesModule) {
@@ -1164,19 +1105,19 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.id;
               }));
               _iterator3 = _createForOfIteratorHelper(tempOrder.products);
-              _context15.prev = 17;
+              _context14.prev = 17;
               _iterator3.s();
             case 19:
               if ((_step3 = _iterator3.n()).done) {
-                _context15.next = 33;
+                _context14.next = 33;
                 break;
               }
               product = _step3.value;
-              if (!((_product$_origin = product._origin) !== null && _product$_origin !== void 0 && _product$_origin.isManualDiscount)) {
-                _context15.next = 23;
+              if (!((_origin = product._origin) !== null && _origin !== void 0 && _origin.isManualDiscount)) {
+                _context14.next = 23;
                 break;
               }
-              return _context15.abrupt("continue", 31);
+              return _context14.abrupt("continue", 31);
             case 23:
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
@@ -1189,7 +1130,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + (pd.amount || 0);
               }, 0);
-              optionSum = sumOptionUnitPrice(product.product_option_item);
+              optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
               sourcePrice = (_product$metadata$sou = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1202,46 +1143,46 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.product_bundle
               });
             case 31:
-              _context15.next = 19;
+              _context14.next = 19;
               break;
             case 33:
-              _context15.next = 38;
+              _context14.next = 38;
               break;
             case 35:
-              _context15.prev = 35;
-              _context15.t0 = _context15["catch"](17);
-              _iterator3.e(_context15.t0);
+              _context14.prev = 35;
+              _context14.t0 = _context14["catch"](17);
+              _iterator3.e(_context14.t0);
             case 38:
-              _context15.prev = 38;
+              _context14.prev = 38;
               _iterator3.f();
-              return _context15.finish(38);
+              return _context14.finish(38);
             case 41:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context15.next = 44;
+              _context14.next = 44;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 44:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context15.next = 47;
+              _context14.next = 47;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
             case 47:
               this.store.order.persistTempOrder();
               this.logMethodSuccess('setDiscountSelected', params);
-              _context15.next = 55;
+              _context14.next = 55;
               break;
             case 51:
-              _context15.prev = 51;
-              _context15.t1 = _context15["catch"](1);
-              this.logMethodError('setDiscountSelected', _context15.t1);
-              throw _context15.t1;
+              _context14.prev = 51;
+              _context14.t1 = _context14["catch"](1);
+              this.logMethodError('setDiscountSelected', _context14.t1);
+              throw _context14.t1;
             case 55:
             case "end":
-              return _context15.stop();
+              return _context14.stop();
           }
-        }, _callee15, this, [[1, 51], [17, 35, 38, 41]]);
+        }, _callee14, this, [[1, 51], [17, 35, 38, 41]]);
       }));
       function setDiscountSelected(_x8) {
         return _setDiscountSelected.apply(this, arguments);
@@ -1251,15 +1192,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "onCustomerLogin",
     value: function () {
-      var _onCustomerLogin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _onCustomerLogin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               this.logMethodStart('onCustomerLogin', {
                 customerId: params.customerId
               });
-              _context16.prev = 1;
-              _context16.next = 4;
+              _context15.prev = 1;
+              _context15.next = 4;
               return this.refreshOrderMarketingAfterLogin({
                 customerId: params.customerId
               });
@@ -1267,18 +1208,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               this.logMethodSuccess('onCustomerLogin', {
                 customerId: params.customerId
               });
-              _context16.next = 11;
+              _context15.next = 11;
               break;
             case 7:
-              _context16.prev = 7;
-              _context16.t0 = _context16["catch"](1);
-              this.logMethodError('onCustomerLogin', _context16.t0);
-              throw _context16.t0;
+              _context15.prev = 7;
+              _context15.t0 = _context15["catch"](1);
+              this.logMethodError('onCustomerLogin', _context15.t0);
+              throw _context15.t0;
             case 11:
             case "end":
-              return _context16.stop();
+              return _context15.stop();
           }
-        }, _callee16, this, [[1, 7]]);
+        }, _callee15, this, [[1, 7]]);
       }));
       function onCustomerLogin(_x9) {
         return _onCustomerLogin.apply(this, arguments);
@@ -1329,11 +1270,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "prepareRetailAvailability",
     value: function () {
-      var _prepareRetailAvailability = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _this$store$order4, _this$otherParams5;
+      var _prepareRetailAvailability = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+        var _this$store$order4, _this$otherParams7;
         var tempOrder, hasOrderId, resourceId, reason, resourceState, availabilityInfo;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               tempOrder = params.tempOrder, hasOrderId = params.hasOrderId, resourceId = params.resourceId, reason = params.reason;
               this.enabledReservationRuleProducts = [];
@@ -1356,12 +1297,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               };
               this.store.resource = resourceState;
               (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 || _this$store$order4.persistTempOrder();
-              _context17.next = 15;
+              _context16.next = 15;
               return this.addNewOrder();
             case 15:
-              _context17.next = 17;
+              _context16.next = 17;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.businessCode,
+                serviceType: (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode,
                 submissionIndex: hasOrderId ? 1 : 0,
                 historicalItems: []
               });
@@ -1375,15 +1316,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 mode: availabilityInfo.mode,
                 retailMode: true,
                 retailReason: reason,
-                persistedRelationId: tempOrder.relation_id,
-                persistedResourceId: tempOrder.resource_id
+                relationId: resourceState.relationId,
+                persistedResourceId: resourceState.relationId
               });
-              return _context17.abrupt("return", availabilityInfo);
+              return _context16.abrupt("return", availabilityInfo);
             case 20:
             case "end":
-              return _context17.stop();
+              return _context16.stop();
           }
-        }, _callee17, this);
+        }, _callee16, this);
       }));
       function prepareRetailAvailability(_x10) {
         return _prepareRetailAvailability.apply(this, arguments);
@@ -1414,11 +1355,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return 1;
       };
       return function (payload, _ref3) {
-        var _ref4, _tempOrder$resource_i, _tempOrder$metadata, _ref5, _pickOriginal, _resourceState$table_2, _resourceState$relati, _pickFirstCustomCapac;
+        var _resourceState$relati, _tempOrder$metadata, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati2, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
           tempOrder = _ref3.tempOrder;
-        var resourceId = String((_ref4 = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId) !== null && _ref4 !== void 0 ? _ref4 : '').trim();
-        var hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && (tempOrder.relation_id || resourceState.relationId) && (tempOrder.table_form_id || resourceState.tableFormId));
+        var resourceId = String((_resourceState$relati = resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : '').trim();
+        var hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && resourceState.relationId && resourceState.tableFormId);
         if (!hasReservationBookingContext) {
           return _objectSpread(_objectSpread({}, payload), {}, {
             bookings: [],
@@ -1435,14 +1376,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
           return undefined;
         };
-        var mainField = (_ref5 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_2 = resourceState.table_form_record) === null || _resourceState$table_2 === void 0 ? void 0 : _resourceState$table_2.name)) !== null && _ref5 !== void 0 ? _ref5 : '';
+        var mainField = (_ref4 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_2 = resourceState.table_form_record) === null || _resourceState$table_2 === void 0 ? void 0 : _resourceState$table_2.name)) !== null && _ref4 !== void 0 ? _ref4 : '';
         var resourceEntry = resourceState && resourceId ? {
           relation_type: 'form',
           like_status: 'common',
           id: Number(resourceId),
           main_field: mainField,
           form_id: resourceState.tableFormId,
-          relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
+          relation_id: (_resourceState$relati2 = resourceState.relationId) !== null && _resourceState$relati2 !== void 0 ? _resourceState$relati2 : resourceId,
           capacity: bookingCapacityValue,
           metadata: _this5.buildScanOrderResourceMetadata({
             resourceState: resourceState,
@@ -1479,9 +1420,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var nextProducts = _toConsumableArray(payload.products || []);
         // 加餐（已有 order_id）走 scanOrderMore，原单已含 booking 规则行，勿再追加虚拟规则商品
         if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
-          var _ruleProduct$price, _ref6, _ruleProduct$original, _ruleProduct$is_gst;
+          var _ruleProduct$price, _ref5, _ruleProduct$original, _ruleProduct$is_gst;
           var sellingPrice = String((_ruleProduct$price = ruleProduct.price) !== null && _ruleProduct$price !== void 0 ? _ruleProduct$price : '0.00');
-          var originalPrice = String((_ref6 = (_ruleProduct$original = ruleProduct.original_price) !== null && _ruleProduct$original !== void 0 ? _ruleProduct$original : ruleProduct.price) !== null && _ref6 !== void 0 ? _ref6 : '0.00');
+          var originalPrice = String((_ref5 = (_ruleProduct$original = ruleProduct.original_price) !== null && _ruleProduct$original !== void 0 ? _ruleProduct$original : ruleProduct.price) !== null && _ref5 !== void 0 ? _ref5 : '0.00');
           nextProducts.push({
             product_id: ruleProduct.id,
             product_variant_id: 0,
@@ -1490,7 +1431,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             original_price: originalPrice,
             payment_price: sellingPrice,
             is_charge_tax: (_ruleProduct$is_gst = ruleProduct.is_gst) !== null && _ruleProduct$is_gst !== void 0 ? _ruleProduct$is_gst : 0,
-            product_option_item: [],
+            product_sku: {
+              option: []
+            },
             discount_list: [],
             product_bundle: [],
             booking_uid: bookingUuid,
@@ -1507,11 +1450,89 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         });
       };
     }
+  }, {
+    key: "isScanOrderMoreMode",
+    value: function isScanOrderMoreMode(tempOrder) {
+      var _this$store$resource, _this$store$entryCont;
+      var mode = (_this$store$resource = this.store.resource) === null || _this$store$resource === void 0 ? void 0 : _this$store$resource.mode;
+      return Boolean(tempOrder.order_id && (mode === 'additional_order' || mode === 'additional_order_with_code' || ((_this$store$entryCont = this.store.entryContext) === null || _this$store$entryCont === void 0 ? void 0 : _this$store$entryCont.mode) === 'append'));
+    }
+  }, {
+    key: "submitScanOrderMore",
+    value: function () {
+      var _submitScanOrderMore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
+        var _this$otherParams8, _this$otherParams9, _this$otherParams10, _this$otherParams11, _this$otherParams12;
+        var tempOrder, enhancePayload, latestSummary, payload, products, orderId, result;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
+            case 0:
+              if (this.request) {
+                _context17.next = 2;
+                break;
+              }
+              throw new Error('scanOrder解决方案需要 request 插件支持');
+            case 2:
+              if (this.store.order) {
+                _context17.next = 4;
+                break;
+              }
+              throw new Error('scanOrder解决方案需要 order 模块支持');
+            case 4:
+              tempOrder = params.tempOrder, enhancePayload = params.enhancePayload;
+              _context17.next = 7;
+              return this.store.order.recalculateSummary({
+                createIfMissing: true
+              });
+            case 7:
+              latestSummary = _context17.sent;
+              payload = buildSubmitPayload({
+                tempOrder: tempOrder,
+                cacheId: this.cacheId,
+                platform: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.platform,
+                businessCode: ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.businessCode) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.business_code),
+                channel: (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.channel,
+                type: (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.type,
+                summary: latestSummary,
+                enhance: enhancePayload
+              });
+              products = filterProductsForScanOrderMore(payload.products);
+              orderId = tempOrder.order_id;
+              _context17.next = 13;
+              return this.request.put("/order/order/product/".concat(orderId), {
+                products: products,
+                request_unique_idempotency_token: payload.request_unique_idempotency_token
+              }, {
+                customToast: function customToast() {}
+              });
+            case 13:
+              result = _context17.sent;
+              if (!((result === null || result === void 0 ? void 0 : result.code) === 200 && !(result !== null && result !== void 0 && result.data))) {
+                _context17.next = 16;
+                break;
+              }
+              return _context17.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
+                data: {
+                  order_id: orderId
+                }
+              }));
+            case 16:
+              return _context17.abrupt("return", result);
+            case 17:
+            case "end":
+              return _context17.stop();
+          }
+        }, _callee17, this);
+      }));
+      function submitScanOrderMore(_x11) {
+        return _submitScanOrderMore.apply(this, arguments);
+      }
+      return submitScanOrderMore;
+    }()
   }, {
     key: "submitScanOrder",
     value: function () {
       var _submitScanOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        var _this$store$resource, _this$otherParams6, _this$otherParams7, _this$otherParams8, _this$otherParams9, _tempOrder$products, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
+        var _this$store$resource2, _tempOrder$products, pax, tempOrderForSubmit, resourceTableName, enhancePayload, result, tempOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1526,9 +1547,14 @@ 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;
+              resourceTableName = (_this$store$resource2 = this.store.resource) === null || _this$store$resource2 === void 0 || (_this$store$resource2 = _this$store$resource2.table_form_record) === null || _this$store$resource2 === void 0 ? void 0 : _this$store$resource2.name;
               if (resourceTableName && _typeof(resourceTableName) === 'object') {
                 tempOrderForSubmit.table_number = resourceTableName;
               } else {
@@ -1536,32 +1562,43 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               this.store.order.persistTempOrder();
               enhancePayload = this.buildSubmitPayloadEnhancer();
-              _context18.next = 14;
-              return this.store.order.submitTempOrder({
-                cacheId: this.cacheId,
-                platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
-                businessCode: (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode,
-                channel: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.channel,
-                type: (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.type,
+              if (!this.isScanOrderMoreMode(tempOrderForSubmit)) {
+                _context18.next = 21;
+                break;
+              }
+              _context18.next = 18;
+              return this.submitScanOrderMore({
+                tempOrder: tempOrderForSubmit,
                 enhancePayload: enhancePayload
               });
-            case 14:
-              result = _context18.sent;
+            case 18:
+              _context18.t0 = _context18.sent;
+              _context18.next = 24;
+              break;
+            case 21:
+              _context18.next = 23;
+              return this.submitSalesOrder({
+                enhancePayload: enhancePayload
+              });
+            case 23:
+              _context18.t0 = _context18.sent;
+            case 24:
+              result = _context18.t0;
               tempOrder = this.store.order.getTempOrder();
               this.logMethodSuccess('submitScanOrder', {
                 productCount: (tempOrder === null || tempOrder === void 0 || (_tempOrder$products = tempOrder.products) === null || _tempOrder$products === void 0 ? void 0 : _tempOrder$products.length) || 0
               });
               return _context18.abrupt("return", result);
-            case 20:
-              _context18.prev = 20;
-              _context18.t0 = _context18["catch"](1);
-              this.logMethodError('submitScanOrder', _context18.t0);
-              throw _context18.t0;
-            case 24:
+            case 30:
+              _context18.prev = 30;
+              _context18.t1 = _context18["catch"](1);
+              this.logMethodError('submitScanOrder', _context18.t1);
+              throw _context18.t1;
+            case 34:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[1, 20]]);
+        }, _callee18, this, [[1, 30]]);
       }));
       function submitScanOrder() {
         return _submitScanOrder.apply(this, arguments);
@@ -1612,20 +1649,20 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee19, this, [[1, 15]]);
       }));
-      function addProductToOrder(_x11) {
+      function addProductToOrder(_x12) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
     }()
   }, {
-    key: "updateProductInOrder",
+    key: "updateOrderProduct",
     value: function () {
-      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
+      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var products;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              this.logMethodStart('updateProductInOrder', {
+              this.logMethodStart('updateOrderProduct', {
                 product_id: params.product_id,
                 product_variant_id: params.product_variant_id
               });
@@ -1637,7 +1674,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('order 模块未初始化');
             case 4:
               _context20.next = 6;
-              return this.store.order.updateProductInOrder(params);
+              return this.store.order.updateOrderProduct(params);
             case 6:
               products = _context20.sent;
               _context20.next = 9;
@@ -1646,14 +1683,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               _context20.next = 11;
               return this.refreshCartValidationPassed();
             case 11:
-              this.logMethodSuccess('updateProductInOrder', {
+              this.logMethodSuccess('updateOrderProduct', {
                 productCount: products.length
               });
               return _context20.abrupt("return", products);
             case 15:
               _context20.prev = 15;
               _context20.t0 = _context20["catch"](1);
-              this.logMethodError('updateProductInOrder', _context20.t0);
+              this.logMethodError('updateOrderProduct', _context20.t0);
               throw _context20.t0;
             case 19:
             case "end":
@@ -1661,10 +1698,10 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee20, this, [[1, 15]]);
       }));
-      function updateProductInOrder(_x12) {
-        return _updateProductInOrder.apply(this, arguments);
+      function updateOrderProduct(_x13) {
+        return _updateOrderProduct.apply(this, arguments);
       }
-      return updateProductInOrder;
+      return updateOrderProduct;
     }()
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
@@ -1691,12 +1728,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               };
               if (identity.identity_key !== undefined) params.identity_key = identity.identity_key;
-              if (identity.product_option_item !== undefined) {
-                params.product_option_item = identity.product_option_item;
+              if (identity.product_sku !== undefined) {
+                params.product_sku = identity.product_sku;
               }
               if (identity.product_bundle !== undefined) params.product_bundle = identity.product_bundle;
               _context21.next = 8;
-              return this.updateProductInOrder(params);
+              return this.updateOrderProduct(params);
             case 8:
               products = _context21.sent;
               this.logMethodSuccess('setOrderProductLineNote', {
@@ -1714,7 +1751,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee21, this, [[1, 13]]);
       }));
-      function setOrderProductLineNote(_x13, _x14) {
+      function setOrderProductLineNote(_x14, _x15) {
         return _setOrderProductLineNote.apply(this, arguments);
       }
       return setOrderProductLineNote;
@@ -1763,7 +1800,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee22, this, [[1, 15]]);
       }));
-      function removeProductFromOrder(_x15) {
+      function removeProductFromOrder(_x16) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -1840,7 +1877,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this);
       }));
-      function syncItemRuleConfigsFromDineInConfig(_x16) {
+      function syncItemRuleConfigsFromDineInConfig(_x17) {
         return _syncItemRuleConfigsFromDineInConfig.apply(this, arguments);
       }
       return syncItemRuleConfigsFromDineInConfig;
@@ -1897,7 +1934,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee25, this, [[3, 13]]);
       }));
-      function fetchItemRuleConfigsByModelIds(_x17) {
+      function fetchItemRuleConfigsByModelIds(_x18) {
         return _fetchItemRuleConfigsByModelIds.apply(this, arguments);
       }
       return fetchItemRuleConfigsByModelIds;
@@ -1947,16 +1984,16 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 var rawProductId = (_node$product_id = node.product_id) !== null && _node$product_id !== void 0 ? _node$product_id : node.id;
                 var productId = Number(rawProductId);
                 if (Number.isFinite(productId) && productId > 0) {
-                  var _ref7, _node$product_variant;
-                  var productVariantId = Number((_ref7 = (_node$product_variant = node.product_variant_id) !== null && _node$product_variant !== void 0 ? _node$product_variant : node.variant_id) !== null && _ref7 !== void 0 ? _ref7 : 0);
+                  var _ref6, _node$product_variant;
+                  var productVariantId = Number((_ref6 = (_node$product_variant = node.product_variant_id) !== null && _node$product_variant !== void 0 ? _node$product_variant : node.variant_id) !== null && _ref6 !== void 0 ? _ref6 : 0);
                   var normalizedVariantId = Number.isNaN(productVariantId) ? 0 : productVariantId;
                   var key = buildProductKey(productId, normalizedVariantId);
                   if (!sourceMap.has(key)) {
                     sourceMap.set(key, node);
                   }
                 }
-                for (var _i4 = 0, _Object$values = Object.values(node); _i4 < _Object$values.length; _i4++) {
-                  var childValue = _Object$values[_i4];
+                for (var _i3 = 0, _Object$values = Object.values(node); _i3 < _Object$values.length; _i3++) {
+                  var childValue = _Object$values[_i3];
                   if (childValue && _typeof(childValue) === 'object') {
                     collectFromValue(childValue);
                   }
@@ -2069,7 +2106,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               return _context29.abrupt("return", []);
             case 7:
               businessData = buildItemRuleBusinessData({
-                tempOrder: this.ensureTempOrder(),
+                tempOrder: this.ensureScanOrderTempOrder(),
                 runtimeConfig: this.getItemRuleRuntimeConfig(),
                 itemRuleConfigs: this.itemRuleConfigs
               });
@@ -2100,7 +2137,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-        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;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _origin2, _origin3, _origin4, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2127,7 +2164,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               return _context30.abrupt("return");
             case 9:
               businessData = buildItemRuleBusinessData({
-                tempOrder: this.ensureTempOrder(),
+                tempOrder: this.ensureScanOrderTempOrder(),
                 runtimeConfig: this.getItemRuleRuntimeConfig(),
                 itemRuleConfigs: this.itemRuleConfigs
               });
@@ -2143,7 +2180,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               return this.buildPrefillProductSourceMap();
             case 16:
               productSourceMap = _context30.sent;
-              tempOrder = this.ensureTempOrder();
+              tempOrder = this.ensureScanOrderTempOrder();
               hasChanges = false;
               _iterator6 = _createForOfIteratorHelper(prefillItems);
               _context30.prev = 20;
@@ -2210,7 +2247,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 _origin: sourceItem ? _objectSpread(_objectSpread({}, targetProduct._origin || {}), sourceItem) : targetProduct._origin
               });
               hasQuantityChanged = delta > 0;
-              hasOriginChanged = Boolean(sourceItem && (!targetProduct._origin || ((_targetProduct$_origi = targetProduct._origin) === null || _targetProduct$_origi === void 0 ? void 0 : _targetProduct$_origi.name) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name) || ((_targetProduct$_origi2 = targetProduct._origin) === null || _targetProduct$_origi2 === void 0 ? void 0 : _targetProduct$_origi2.title) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || ((_targetProduct$_origi3 = targetProduct._origin) === null || _targetProduct$_origi3 === void 0 ? void 0 : _targetProduct$_origi3.price) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price)));
+              hasOriginChanged = Boolean(sourceItem && (!targetProduct._origin || ((_origin2 = targetProduct._origin) === null || _origin2 === void 0 ? void 0 : _origin2.name) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name) || ((_origin3 = targetProduct._origin) === null || _origin3 === void 0 ? void 0 : _origin3.title) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || ((_origin4 = targetProduct._origin) === null || _origin4 === void 0 ? void 0 : _origin4.price) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price)));
               if (hasQuantityChanged || hasOriginChanged) {
                 tempOrder.products[productIndex] = nextProduct;
                 hasChanges = true;
@@ -2318,7 +2355,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 5:
               businessData = buildItemRuleBusinessData({
-                tempOrder: this.ensureTempOrder(),
+                tempOrder: this.ensureScanOrderTempOrder(),
                 runtimeConfig: this.getItemRuleRuntimeConfig(),
                 itemRuleConfigs: this.itemRuleConfigs
               });
@@ -2472,14 +2509,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceState",
     value: function normalizeResourceState(detail, resourceSelectType, hasOrderId) {
-      var _detail$form_record, _this$otherParams10, _detail$resource_capa, _detail$resource_capa2;
+      var _detail$form_record, _this$otherParams13, _detail$resource_capa, _detail$resource_capa2;
       var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
       var lastOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.last_order_id);
       var relationId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_record_id);
       var tableFormId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_id);
       var formRecord = (_detail$form_record = detail === null || detail === void 0 ? void 0 : detail.form_record) !== null && _detail$form_record !== void 0 ? _detail$form_record : null;
       // 是否允许加餐
-      var allowSnack = ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 || (_this$otherParams10 = _this$otherParams10.dineInConfig) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10['sale.allow_add_items']) || false;
+      var allowSnack = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13 = _this$otherParams13.dineInConfig) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13['sale.allow_add_items']) || false;
       // 开启同桌验证 - 本期没有这个配置，默认关掉
       var deskmateValid = false;
       var isExclusive = resourceSelectType === 'single';
@@ -2562,7 +2599,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "fetchResourceOccupyDetailsByResourceId",
     value: function () {
       var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
-        var _this$otherParams11, _this$otherParams11$g, _response$data$occupy, _response$data;
+        var _this$otherParams14, _this$otherParams14$g, _response$data$occupy, _response$data;
         var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -2574,7 +2611,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("[ScanOrder] \u975E\u6CD5\u684C\u53F0 resourceId: ".concat(resourceId));
             case 3:
-              shopId = (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 || (_this$otherParams11$g = _this$otherParams11.getStateData) === null || _this$otherParams11$g === void 0 ? void 0 : _this$otherParams11$g.call(_this$otherParams11, 'shop_id');
+              shopId = (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14$g = _this$otherParams14.getStateData) === null || _this$otherParams14$g === void 0 ? void 0 : _this$otherParams14$g.call(_this$otherParams14, 'shop_id');
               if (shopId) {
                 _context36.next = 6;
                 break;
@@ -2604,7 +2641,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function fetchResourceOccupyDetailsByResourceId(_x18) {
+      function fetchResourceOccupyDetailsByResourceId(_x19) {
         return _fetchResourceOccupyDetailsByResourceId.apply(this, arguments);
       }
       return fetchResourceOccupyDetailsByResourceId;
@@ -2668,19 +2705,20 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var hasOrderId,
           normalizedResourceId,
           _this$otherParams$bus,
-          _this$otherParams12,
+          _this$otherParams15,
           _this$otherParams$cha,
-          _this$otherParams13,
-          _this$otherParams14,
-          _this$otherParams14$g,
+          _this$otherParams16,
+          _this$otherParams17,
+          _this$otherParams17$g,
           _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
-          _this$otherParams15,
           _this$store$order6,
           _this$store$order7,
           _this$store$order7$ge,
-          _this$otherParams16,
+          _this$otherParams18,
+          _this$store$resource3,
+          _this$store$resource4,
           businessCode,
           channel,
           openDataTarget,
@@ -2709,6 +2747,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           occupancyMinutes,
           paxBounds,
           error,
+          _occupancyMinutes,
+          _paxBounds,
+          _error,
           occupyDetails,
           occupyDetail,
           resourceSelectType,
@@ -2733,11 +2774,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 resourceId: normalizedResourceId
               });
               _context37.prev = 3;
-              businessCode = String((_this$otherParams$bus = (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
-              channel = String((_this$otherParams$cha = (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
+              businessCode = String((_this$otherParams$bus = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
+              channel = String((_this$otherParams$cha = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
               openDataTarget = businessCode && channel ? "".concat(businessCode, "+").concat(channel) : 'dine_in+scan_to_order';
               _context37.next = 9;
-              return (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14$g = _this$otherParams14.getOpenData) === null || _this$otherParams14$g === void 0 ? void 0 : _this$otherParams14$g.call(_this$otherParams14, {
+              return (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17$g = _this$otherParams17.getOpenData) === null || _this$otherParams17$g === void 0 ? void 0 : _this$otherParams17$g.call(_this$otherParams17, {
                 scope: 'board',
                 target: openDataTarget,
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
@@ -2808,7 +2849,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 31:
               // Step1: 先加载预约规则商品，拿到 enabledReservationRuleProducts 与容量附加信息
               // （resourceSelectType 需要基于这些商品 + 占用接口的 form_id 计算，故必须前置）
-              tempOrder = this.ensureTempOrder();
+              tempOrder = this.ensureScanOrderTempOrder();
               reservationLinkIds = collectLinkProductIdsFromReservationRules(dineInConfig['fulfillment.enabled_resource_rules']);
               if (!(!normalizedResourceId || reservationLinkIds.length === 0)) {
                 _context37.next = 37;
@@ -2875,6 +2916,29 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   scheduleDatetime: scheduleDatetime,
                   cacheId: this.cacheId
                 });
+                if (Array.isArray(loaded)) {
+                  this.enabledReservationRuleProducts = loaded;
+                  _occupancyMinutes = pickFirstDurationMinutesFromProducts(loaded);
+                  if (_occupancyMinutes !== undefined) {
+                    tempOrder.metadata.table_occupancy_duration = _occupancyMinutes;
+                  }
+                  if (hasCustomCapacityProduct(loaded)) {
+                    pendingRequestEntryPax = 1;
+                    _paxBounds = pickFirstCustomCapacityPaxBounds(loaded);
+                    if ((_paxBounds === null || _paxBounds === void 0 ? void 0 : _paxBounds.min) !== undefined) pendingRequestPaxMin = _paxBounds.min;
+                    if ((_paxBounds === null || _paxBounds === void 0 ? void 0 : _paxBounds.max) !== undefined) pendingRequestPaxMax = _paxBounds.max;
+                  }
+                } else {
+                  this.enabledReservationRuleProducts = [];
+                  _error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
+                  this.logMethodError('loadReservationRuleProducts', _error, {
+                    resourceId: resourceId,
+                    reservationLinkIds: reservationLinkIds,
+                    scheduleDate: scheduleDate,
+                    scheduleDatetime: scheduleDatetime,
+                    cacheId: this.cacheId
+                  });
+                }
               }
 
               // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
@@ -2951,19 +3015,16 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               } : {}), this.store.resource.requestPaxMax !== undefined ? {
                 requestPaxMax: this.store.resource.requestPaxMax
               } : {});
-              tempOrder.relation_id = normalizedResourceId || ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.relation_id);
-              tempOrder.table_form_id = resourceState.tableFormId;
-              tempOrder.resource_id = normalizedResourceId;
               (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || _this$store$order6.persistTempOrder();
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 76;
+                _context37.next = 73;
                 break;
               }
-              _context37.next = 76;
+              _context37.next = 73;
               return this.addNewOrder();
-            case 76:
+            case 73:
               isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
               if (isAdditionalOrderMode) {
                 tempOrder.order_id = additionalOrderId;
@@ -2979,13 +3040,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 82;
+              _context37.next = 79;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode,
+                serviceType: (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 82:
+            case 79:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -2999,28 +3060,28 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: availabilityInfo.order_id,
                 relationId: availabilityInfo.relation_id,
                 tableFormId: availabilityInfo.table_form_id,
-                persistedRelationId: tempOrder.relation_id,
-                persistedResourceId: tempOrder.resource_id,
+                persistedRelationId: (_this$store$resource3 = this.store.resource) === null || _this$store$resource3 === void 0 ? void 0 : _this$store$resource3.relationId,
+                persistedResourceId: (_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.relationId,
                 deskmateValid: availabilityInfo.deskmate_valid,
                 resourceSelectType: resourceState.resourceSelectType,
                 isExclusive: resourceState.isExclusive,
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 87:
-              _context37.prev = 87;
+            case 84:
+              _context37.prev = 84;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 91:
+            case 88:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 87]]);
+        }, _callee37, this, [[3, 84]]);
       }));
-      function checkResourceAvailable(_x19) {
+      function checkResourceAvailable(_x20) {
         return _checkResourceAvailable.apply(this, arguments);
       }
       return checkResourceAvailable;
@@ -3029,18 +3090,25 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "restorePreviousOrderData",
     value: function () {
       var _restorePreviousOrderData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
-        var tempOrder, _this$store$order8, _res$data, res, entryPaxNumber;
+        var orderModule, tempOrder, _res$data, res, entryPaxNumber;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              tempOrder = this.ensureTempOrder();
+              orderModule = this.store.order;
+              if (orderModule) {
+                _context38.next = 3;
+                break;
+              }
+              return _context38.abrupt("return");
+            case 3:
+              tempOrder = orderModule.ensureTempOrder();
               if (!tempOrder.order_id) {
-                _context38.next = 9;
+                _context38.next = 12;
                 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:
+              _context38.next = 7;
+              return orderModule.getOrderInfo(tempOrder.order_id);
+            case 7:
               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) {
@@ -3048,12 +3116,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) {
-                _context38.next = 9;
+                _context38.next = 12;
                 break;
               }
-              _context38.next = 9;
+              _context38.next = 12;
               return this.setEntryPaxNumber(entryPaxNumber);
-            case 9:
+            case 12:
             case "end":
               return _context38.stop();
           }
@@ -3100,31 +3168,32 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
-        var _this$otherParams17;
-        var menu_list_ids, res, productList, formattedRes;
+        var _this$otherParams19;
+        var associatedMenus, menu_list_ids, res, productList, formattedRes;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17 = _this$otherParams17.dineInConfig) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17['menu.associated_menus'].map(function (n) {
+              associatedMenus = (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 || (_this$otherParams19 = _this$otherParams19.dineInConfig) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19['menu.associated_menus'];
+              menu_list_ids = associatedMenus.map(function (n) {
                 return Number(n.value);
-              })) || [];
-              _context40.prev = 2;
+              }) || [];
+              _context40.prev = 3;
               if (this.store.products) {
-                _context40.next = 5;
+                _context40.next = 6;
                 break;
               }
               throw new Error('products 模块未初始化');
-            case 5:
-              _context40.next = 7;
+            case 6:
+              _context40.next = 8;
               return this.store.products.loadProducts({
                 menu_list_ids: menu_list_ids,
                 cacheId: this.cacheId,
                 schedule_date: dayjs().format('YYYY-MM-DD'),
                 schedule_datetime: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
-            case 7:
+            case 8:
               res = _context40.sent;
               productList = this.assertProductListLoaded('getProductList', res, {
                 menu_list_ids: menu_list_ids,
@@ -3135,9 +3204,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 menuCount: menu_list_ids.length
               });
               return _context40.abrupt("return", formattedRes);
-            case 14:
-              _context40.prev = 14;
-              _context40.t0 = _context40["catch"](2);
+            case 15:
+              _context40.prev = 15;
+              _context40.t0 = _context40["catch"](3);
               if (!(_context40.t0 !== null && _context40.t0 !== void 0 && _context40.t0.__scanOrderLogged)) {
                 this.logMethodError('getProductList', _context40.t0, {
                   menu_list_ids: menu_list_ids,
@@ -3145,11 +3214,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               throw _context40.t0;
-            case 18:
+            case 19:
             case "end":
               return _context40.stop();
           }
-        }, _callee40, this, [[2, 14]]);
+        }, _callee40, this, [[3, 15]]);
       }));
       function getProductList() {
         return _getProductList.apply(this, arguments);
@@ -3165,14 +3234,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
-        var _ref9,
-          _ref9$cover,
+        var _ref8,
+          _ref8$cover,
           cover,
           _args41 = arguments;
         return _regeneratorRuntime().wrap(function _callee41$(_context41) {
           while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _ref9 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref9$cover = _ref9.cover, cover = _ref9$cover === void 0 ? false : _ref9$cover;
+              _ref8 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref8$cover = _ref8.cover, cover = _ref8$cover === void 0 ? false : _ref8$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3184,7 +3253,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function setOtherParams(_x20) {
+      function setOtherParams(_x21) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -3309,7 +3378,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function setEntryPaxNumber(_x21) {
+      function setEntryPaxNumber(_x22) {
         return _setEntryPaxNumber.apply(this, arguments);
       }
       return setEntryPaxNumber;
@@ -3323,18 +3392,24 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncAdditionalOrderFromResource",
     value: function () {
       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$otherParams18, _this$store$order9;
+        var _ref9, _ref10, _ref11, _this$store$resource5, _this$store$resource6, _occupyDetails$2, _this$store$resource7, _this$otherParams20, _this$store$order8;
         var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, result;
         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();
+              if (this.store.order) {
+                _context43.next = 2;
+                break;
+              }
+              throw new Error('order 模块未初始化');
+            case 2:
+              tempOrder = this.store.order.ensureTempOrder();
+              normalizedResourceId = String((_ref9 = (_ref10 = (_ref11 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.relationId) !== null && _ref10 !== void 0 ? _ref10 : (_this$store$resource6 = this.store.resource) === null || _this$store$resource6 === void 0 ? void 0 : _this$store$resource6.relation_id) !== null && _ref9 !== void 0 ? _ref9 : '').trim();
               this.logMethodStart('syncAdditionalOrderFromResource', {
                 resourceId: normalizedResourceId
               });
               if (normalizedResourceId) {
-                _context43.next = 7;
+                _context43.next = 9;
                 break;
               }
               _result = {
@@ -3343,17 +3418,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               };
               this.logMethodSuccess('syncAdditionalOrderFromResource', _result);
               return _context43.abrupt("return", _result);
-            case 7:
-              _context43.next = 9;
-              return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
             case 9:
+              _context43.next = 11;
+              return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
+            case 11:
               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$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 || (_this$otherParams18 = _this$otherParams18.dineInConfig) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18['sale.allow_add_items']);
+              resourceSelectType = ((_this$store$resource7 = this.store.resource) === null || _this$store$resource7 === void 0 ? void 0 : _this$store$resource7.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
+              allowAddItems = toBoolean((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 || (_this$otherParams20 = _this$otherParams20.dineInConfig) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20['sale.allow_add_items']);
               result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(!result.matched || !result.order_id)) {
-                _context43.next = 17;
+                _context43.next = 19;
                 break;
               }
               this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
@@ -3362,25 +3437,25 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 allowAddItems: allowAddItems
               }));
               return _context43.abrupt("return", result);
-            case 17:
+            case 19:
               tempOrder.order_id = result.order_id;
               tempOrder.resource_id = normalizedResourceId;
               tempOrder.relation_id = toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_record_id) || normalizedResourceId || tempOrder.relation_id;
               tempOrder.table_form_id = toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id) || tempOrder.table_form_id;
-              (_this$store$order9 = this.store.order) === null || _this$store$order9 === void 0 || _this$store$order9.persistTempOrder();
+              (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 || _this$store$order8.persistTempOrder();
               this.logMethodSuccess('syncAdditionalOrderFromResource', _objectSpread(_objectSpread({}, result), {}, {
                 resourceId: normalizedResourceId,
                 resourceSelectType: resourceSelectType,
                 allowAddItems: allowAddItems
               }));
               return _context43.abrupt("return", result);
-            case 24:
+            case 26:
             case "end":
               return _context43.stop();
           }
         }, _callee43, this);
       }));
-      function syncAdditionalOrderFromResource(_x22) {
+      function syncAdditionalOrderFromResource(_x23) {
         return _syncAdditionalOrderFromResource.apply(this, arguments);
       }
       return syncAdditionalOrderFromResource;
@@ -3389,9 +3464,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getReservationResourceSelectType",
     value: function getReservationResourceSelectType() {
-      var _this$store$resource5;
+      var _this$store$resource8;
       this.logMethodStart('getReservationResourceSelectType');
-      var resourceSelectType = (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.resourceSelectType;
+      var resourceSelectType = (_this$store$resource8 = this.store.resource) === null || _this$store$resource8 === void 0 ? void 0 : _this$store$resource8.resourceSelectType;
       var result = _objectSpread(_objectSpread({}, resourceSelectType ? {
         resourceSelectType: resourceSelectType
       } : {}), {}, {
@@ -3408,9 +3483,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkAllowAddItems",
     value: function checkAllowAddItems() {
-      var _this$otherParams19;
+      var _this$otherParams21;
       this.logMethodStart('checkAllowAddItems');
-      var dineInConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.dineInConfig) || {};
       var result = {
         enabled: toBoolean(dineInConfig['sale.allow_add_items'])
       };
@@ -3423,9 +3498,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams20;
+      var _this$otherParams22;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3439,9 +3514,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams21;
+      var _this$otherParams23;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';
@@ -3459,6 +3534,6 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }]);
   return ScanOrderImpl;
-}(BaseModule);
+}(BaseSalesImpl);
 _defineProperty(ScanOrderImpl, "PISELL1_LOGIN_SUCCESS", 'pisell1.login.success');
 _defineProperty(ScanOrderImpl, "UI_STATE_KEY_PREFIX", 'pisell.scanOrder.uiState:');