@pisell/pisellos 2.3.53 → 2.3.55

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

package/dist/solution/BookingByStep/utils/capacity.js

@@ -23,11 +23,27 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
     product_bundle = _ref.product_bundle;
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
+      var _window;
       var id = d.bundle_product_id;
       var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id || item.product_id === variantId;
+        return item.product_id == id || item.product_id == variantId;
       });
+      if (!item && (_window = window) !== null && _window !== void 0 && _window.sendWarningLog) {
+        window.sendWarningLog({
+          title: '未找到套餐 capacity 配置',
+          content: [{
+            key: 'product_id',
+            value: id
+          }, {
+            key: 'variant_id',
+            value: variantId
+          }, {
+            key: 'package',
+            value: JSON.stringify((capacity === null || capacity === void 0 ? void 0 : capacity.package) || [])
+          }]
+        });
+      }
       return {
         id: id,
         value: item ? d.num || 0 : 0,

package/dist/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -91,8 +91,14 @@ export function findFastestAvailableResource(_ref2) {
     _ref2$currentCapacity = _ref2.currentCapacity,
     currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
     _ref2$countMap = _ref2.countMap,
-    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap,
+    targetDate = _ref2.targetDate,
+    _ref2$durationMinutes = _ref2.durationMinutes,
+    durationMinutes = _ref2$durationMinutes === void 0 ? 30 : _ref2$durationMinutes;
   var currentTime = dayjs();
+  var resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  var targetDay = targetDate ? dayjs(targetDate) : currentTime;
+  var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   var fastestTime = null;
   var fastestResources = [];
   console.log('[TimeslotUtils] 查找最快可用资源:', {
@@ -108,17 +114,18 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
-        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
-        return isToday && isStillWorking;
+      // 获取资源在目标日期且还在工作时间内的时间段
+      var targetDayTimes = _resource.times.filter(function (time) {
+        var isSameTargetDay = dayjs(time.start_at).isSame(targetDay, 'day');
+        if (!isSameTargetDay) return false;
+        if (!isTargetDayToday) return true;
+        return dayjs(time.end_at).isAfter(currentTime);
       });
-      if (todayTimes.length === 0) {
+      if (targetDayTimes.length === 0) {
         console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+      var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
         _step4;
       try {
         var _loop = function _loop() {
@@ -128,7 +135,7 @@ export function findFastestAvailableResource(_ref2) {
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
-            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
             console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
@@ -165,7 +172,7 @@ export function findFastestAvailableResource(_ref2) {
                 // 检查资源类型和容量
                 if (_resource.resourceType === 'single' || (_resource.capacity || 1) === 1) {
                   // 单人预约资源：检查时间冲突
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     // 有冲突，使用事件结束时间
                     finalAvailableTime = _eventEnd;
                     console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
@@ -177,7 +184,7 @@ export function findFastestAvailableResource(_ref2) {
                   var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
@@ -194,7 +201,7 @@ export function findFastestAvailableResource(_ref2) {
             } finally {
               _iterator5.f();
             }
-            if (finalAvailableTime.isAfter(workEndTime)) {
+            if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
               console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }

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

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -445,7 +445,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -1901,7 +1901,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       var localSearch = function localSearch(v) {
         return _this5.store.products.findProductsByCodeOrBarcode(v);
       };
-      var scanCallback = handleGlobalScan(this.request, localSearch);
+      var scanCallback = handleGlobalScan(this.request, localSearch, this.getSubmitOrderSalesChannel());
       var safeCallback = function safeCallback(d) {
         try {
           callback(d);
@@ -2395,7 +2395,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               localSearch = function localSearch(v) {
                 return _this6.store.products.findProductsByCodeOrBarcode(v);
               };
-              scanCallback = handleGlobalScan(this.request, localSearch);
+              scanCallback = handleGlobalScan(this.request, localSearch, this.getSubmitOrderSalesChannel());
               _context28.next = 9;
               return scanCallback({
                 type: 'nativeScanner',

package/dist/solution/BookingTicket/utils/scan/handleScan.d.ts

@@ -2,9 +2,11 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;

package/dist/solution/BookingTicket/utils/scan/handleScan.js

@@ -1,4 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -150,16 +156,18 @@ var handleScanFn = function handleScanFn(getRequestList, localSearch) {
 /**
  * 处理全局扫码
  * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export var handleGlobalScan = function handleGlobalScan(request, localSearch) {
+export var handleGlobalScan = function handleGlobalScan(request, localSearch, channel) {
   var getRequestList = function getRequestList(value) {
     var requestList = [];
     // 如果value是已WL开头的，则认为是钱包识别码
     if (value.startsWith('WL')) {
       requestList = [searchWallet(request, value)];
     } else {
-      requestList = [searchOrder(request, value), searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)];
+      requestList = [].concat(_toConsumableArray(channel === 'kiosk' ? [] : [searchOrder(request, value)]), [searchWalletPass(request, value), searchWallet(request, value), searchProduct(request, value)]);
     }
     return requestList;
   };

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

@@ -1,8 +1,9 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
-import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import { BaseSalesImpl } from '../BaseSales';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderState, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult } from './types';
 import type { UpdateOrderProductParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
@@ -15,16 +16,16 @@ interface ScanOrderItemRuleRuntimeConfig {
     submissionIndex?: number;
     custom?: Record<string, any>;
 }
-export declare class ScanOrderImpl extends BaseModule implements Module {
+export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     isSolution: boolean;
-    private initializeOptions;
-    private store;
-    private otherParams;
-    private cacheId;
-    private window;
-    private request;
+    protected initializeOptions: ModuleOptions;
+    protected store: ScanOrderState;
+    protected otherParams: Record<string, any>;
+    protected cacheId: string | undefined;
+    window: WindowPlugin;
+    request: RequestPlugin;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -53,9 +54,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private registerCustomerLoginListeners;
     private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
+    protected getRegisteredModuleNames(): readonly string[];
+    protected createSubModule(moduleName: string): Module | null;
     /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
     getCacheId(): string | undefined;
-    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -71,12 +73,14 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    updateTempOrderNote(note: string, sync: true): Promise<string>;
+    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
-        service_type: 'dine_in';
+        service_type: 'dine_in' | '';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
     setPickupRef(buzzer: string): string;
-    private ensureTempOrder;
+    private ensureScanOrderTempOrder;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
@@ -92,7 +96,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     private findReservationRuleResource;
     private buildScanOrderResourceMetadata;
+    private prepareRetailAvailability;
     private buildSubmitPayloadEnhancer;
+    private isScanOrderMoreMode;
+    private submitScanOrderMore;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -117,8 +124,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
     private resolveResourceSelectType;
-    private fetchResourceOccupyDetailByResourceId;
-    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
+    private fetchResourceOccupyDetailsByResourceId;
+    private resolveAdditionalOrderFromOccupyDetail;
+    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';
@@ -141,6 +150,9 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     clearUIState(): void;
     setEntryPaxNumber(number: number): Promise<void>;
     getEntryPaxNumber(): number | null;
+    syncAdditionalOrderFromResource(resourceId?: string | null): Promise<ScanOrderSyncAdditionalOrderResult>;
+    getReservationResourceSelectType(): ScanOrderReservationResourceSelectInfo;
+    checkAllowAddItems(): ScanOrderAllowAddItemsInfo;
     getFulfillmentModes(): {
         enablePickup: boolean;
         enableTableService: boolean;