@pisell/pisellos 0.0.505 → 0.0.507

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

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

package/dist/modules/ScanOrderLogger/providers/feishu.js

@@ -2,94 +2,202 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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); }); }; }
-function safeStringify(payload) {
-  if (payload === undefined || payload === null) return '';
+var DEFAULT_THROTTLE_MS = 3000;
+var pendingQueue = [];
+var flushTimer = null;
+var cachedProviderConfig;
+function safeStringify(value) {
+  if (value === undefined || value === null) return '';
+  if (typeof value === 'string') return value;
+  if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+    return String(value);
+  }
   try {
-    return JSON.stringify(payload);
+    return JSON.stringify(value);
   } catch (error) {
     return "[unserializable: ".concat(String(error), "]");
   }
 }
-function createFeishuMessageContent(contentArr) {
-  return JSON.stringify(contentArr.map(function (item) {
-    return [{
-      tag: 'text',
-      text: "".concat(item.key, ": ")
-    }, {
-      tag: 'text',
-      text: item.value
-    }];
+function isWebhookUsable(webhook) {
+  if (!webhook) return false;
+  if (webhook.includes('REPLACE_ME')) return false;
+  return true;
+}
+function buildRecordSegments(record) {
+  var context = record.context || {};
+  return [[{
+    tag: 'text',
+    text: "[".concat(record.level, "] ").concat(record.timestamp, " ").concat(record.title, "\n")
+  }], [{
+    tag: 'text',
+    text: "\u7F13\u5B58\u6807\u8BC6: ".concat(safeStringify(context.cacheId), "\n")
+  }], [{
+    tag: 'text',
+    text: "\u65E5\u5FD7\u6765\u6E90: ".concat(safeStringify(context), "\n")
+  }], [{
+    tag: 'text',
+    text: "\u65E5\u5FD7\u5185\u5BB9: ".concat(safeStringify(record.payload), "\n")
+  }], [{
+    tag: 'text',
+    text: "\u6269\u5C55\u4FE1\u606F: ".concat(safeStringify(record.extra), "\n")
+  }], [{
+    tag: 'text',
+    text: '------\n'
+  }]];
+}
+function buildFeishuBody(records) {
+  var title = records.length === 1 ? records[0].title : "ScanOrder \u65E5\u5FD7\u6279\u91CF (".concat(records.length, " \u6761)");
+  var content = [];
+  records.forEach(function (record) {
+    buildRecordSegments(record).forEach(function (segment) {
+      return content.push(segment);
+    });
+  });
+  return JSON.stringify({
+    msg_type: 'post',
+    content: JSON.stringify({
+      post: {
+        zh_cn: {
+          title: title,
+          content: content
+        }
+      }
+    })
+  });
+}
+function postToFeishu(_x, _x2) {
+  return _postToFeishu.apply(this, arguments);
+}
+function _postToFeishu() {
+  _postToFeishu = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(webhook, body) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return fetch(webhook, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            body: body
+          });
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _postToFeishu.apply(this, arguments);
+}
+function flushQueue() {
+  return _flushQueue.apply(this, arguments);
+}
+function _flushQueue() {
+  _flushQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _cachedProviderConfig;
+    var records, webhook;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          flushTimer = null;
+          if (pendingQueue.length) {
+            _context3.next = 3;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 3:
+          records = pendingQueue.splice(0, pendingQueue.length);
+          webhook = (_cachedProviderConfig = cachedProviderConfig) === null || _cachedProviderConfig === void 0 || (_cachedProviderConfig = _cachedProviderConfig.feishu) === null || _cachedProviderConfig === void 0 ? void 0 : _cachedProviderConfig.webhook;
+          if (isWebhookUsable(webhook)) {
+            _context3.next = 7;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 7:
+          if (!(typeof fetch !== 'function')) {
+            _context3.next = 10;
+            break;
+          }
+          console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志批量上报');
+          return _context3.abrupt("return");
+        case 10:
+          _context3.prev = 10;
+          _context3.next = 13;
+          return postToFeishu(webhook, buildFeishuBody(records));
+        case 13:
+          _context3.next = 18;
+          break;
+        case 15:
+          _context3.prev = 15;
+          _context3.t0 = _context3["catch"](10);
+          console.warn('[ScanOrderLogger] Feishu 批量上报失败', _context3.t0);
+        case 18:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[10, 15]]);
   }));
+  return _flushQueue.apply(this, arguments);
 }
 export var feishuLoggerProvider = {
   send: function send(payload) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _payload$providerConf;
-      var webhook, record, contentArr, contentStr;
+      var _payload$providerConf, _payload$providerConf2, _payload$providerConf3;
+      var webhook, throttleMs;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            cachedProviderConfig = payload.providerConfig;
             webhook = (_payload$providerConf = payload.providerConfig) === null || _payload$providerConf === void 0 || (_payload$providerConf = _payload$providerConf.feishu) === null || _payload$providerConf === void 0 ? void 0 : _payload$providerConf.webhook;
-            if (!(webhook && webhook.includes('REPLACE_ME'))) {
-              _context.next = 3;
+            if (webhook) {
+              _context.next = 5;
               break;
             }
+            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
             return _context.abrupt("return");
-          case 3:
-            if (webhook) {
-              _context.next = 6;
+          case 5:
+            if (isWebhookUsable(webhook)) {
+              _context.next = 7;
               break;
             }
-            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
             return _context.abrupt("return");
-          case 6:
+          case 7:
             if (!(typeof fetch !== 'function')) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
             console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报');
             return _context.abrupt("return");
-          case 9:
-            record = payload.record;
-            contentArr = [{
-              key: '日志级别',
-              value: record.level
-            }, {
-              key: '日志时间',
-              value: record.timestamp
-            }, {
-              key: '日志标题',
-              value: record.title
-            }, {
-              key: '缓存标识',
-              value: record.context.cacheId || ''
-            }, {
-              key: '日志来源',
-              value: safeStringify(record.context)
-            }, {
-              key: '日志内容',
-              value: safeStringify(record.payload)
-            }, {
-              key: '扩展信息',
-              value: safeStringify(record.extra)
-            }];
-            contentStr = createFeishuMessageContent(contentArr);
-            _context.next = 14;
-            return fetch(webhook, {
-              headers: {
-                'Content-Type': 'application/json'
-              },
-              method: 'POST',
-              body: JSON.stringify({
-                msg_type: 'post',
-                content: "{\"post\":{\"zh_cn\":{\"title\":\"".concat(record.title, "\",\"content\":").concat(contentStr, "}}}")
-              })
-            });
-          case 14:
+          case 10:
+            throttleMs = (_payload$providerConf2 = (_payload$providerConf3 = payload.providerConfig) === null || _payload$providerConf3 === void 0 || (_payload$providerConf3 = _payload$providerConf3.feishu) === null || _payload$providerConf3 === void 0 ? void 0 : _payload$providerConf3.throttleMs) !== null && _payload$providerConf2 !== void 0 ? _payload$providerConf2 : DEFAULT_THROTTLE_MS;
+            if (!(throttleMs <= 0)) {
+              _context.next = 21;
+              break;
+            }
+            _context.prev = 12;
+            _context.next = 15;
+            return postToFeishu(webhook, buildFeishuBody([payload.record]));
+          case 15:
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](12);
+            console.warn('[ScanOrderLogger] Feishu 日志上报失败', _context.t0);
+          case 20:
+            return _context.abrupt("return");
+          case 21:
+            pendingQueue.push(payload.record);
+            if (!flushTimer) {
+              flushTimer = setTimeout(function () {
+                void flushQueue();
+              }, throttleMs);
+            }
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[12, 17]]);
     }))();
   }
 };

package/dist/modules/ScanOrderLogger/types.d.ts

@@ -2,6 +2,12 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    /**
+     * 节流窗口毫秒数，默认 3000ms
+     * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送
+     * - <=0：关闭节流，保持每条日志立即单独发送
+     */
+    throttleMs?: number;
 }
 export interface ScanOrderLoggerProviderGrafanaConfig {
     endpoint?: string;

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

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

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

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

package/dist/solution/ScanOrder/index.js

@@ -87,11 +87,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "serializeError",
     value: function serializeError(error) {
       if (error instanceof Error) {
-        return {
+        return JSON.stringify({
           name: error.name,
           message: error.message,
           stack: error.stack
-        };
+        });
       }
       return {
         message: String(error)
@@ -761,8 +761,20 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var ruleProduct = this.enabledReservationRuleProducts[0];
       var resourceState = this.store.resource;
       var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
+
+      // single 预约独占整张桌台，capacity 取 form_record.capacity；其他情况（multiple / capacity / undefined）占 1 个容量位
+      var resolveResourceCapacity = function resolveResourceCapacity() {
+        if (resourceSelectType === 'single') {
+          var _resourceState$table_;
+          var raw = resourceState === null || resourceState === void 0 || (_resourceState$table_ = resourceState.table_form_record) === null || _resourceState$table_ === void 0 ? void 0 : _resourceState$table_.capacity;
+          var num = Number(raw);
+          if (Number.isFinite(num) && num > 0) return num;
+          return 1;
+        }
+        return 1;
+      };
       return function (payload, _ref) {
-        var _tempOrder$resource_i, _ref2, _pickOriginal, _resourceState$table_, _resourceState$relati;
+        var _tempOrder$resource_i, _ref2, _pickOriginal, _resourceState$table_2, _resourceState$relati;
         var bookingUuid = _ref.bookingUuid,
           tempOrder = _ref.tempOrder;
         var resourceId = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId;
@@ -773,7 +785,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
           return undefined;
         };
-        var mainField = (_ref2 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_ = resourceState.table_form_record) === null || _resourceState$table_ === void 0 ? void 0 : _resourceState$table_.name)) !== null && _ref2 !== void 0 ? _ref2 : '';
+        var mainField = (_ref2 = (_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 && _ref2 !== void 0 ? _ref2 : '';
         var resourceEntry = resourceState && resourceId ? {
           relation_type: 'form',
           like_status: 'common',
@@ -781,15 +793,22 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           main_field: mainField,
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
-          capacity: 1,
+          capacity: resolveResourceCapacity(),
           metadata: {}
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
+        var bookingCapacityValue = resolveResourceCapacity();
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {
             appointment_status: 'started',
-            metadata: _objectSpread(_objectSpread({}, booking.metadata || {}), resourceSelectType ? {
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, booking.metadata || {}), resourceSelectType ? {
               resource_select_type: resourceSelectType
+            } : {}), resourceSelectType ? {
+              capacity: [{
+                id: 0,
+                value: bookingCapacityValue,
+                name: ''
+              }]
             } : {})
           }, idx === 0 && resourceEntry ? {
             resources: [resourceEntry]
@@ -1789,20 +1808,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         }
       } else if (lastOrderId) {
         // 如果有其他人点的单
-        // TODO: 是否独占？如果非独占，其他人点的单应该不影响我下单
-        availabilityInfo = allowSnack ? {
-          mode: deskmateValid ? 'additional_order_with_code' : 'additional_order',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        } : {
-          mode: 'resource_busy',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        };
+        // multiple 预约且容量仍有剩余时，其他人的单不影响当前用户下单，保持 idle 走正常下单流程
+        var canFallthroughToIdle = resourceSelectType === 'multiple' && !isFull;
+        if (!canFallthroughToIdle) {
+          availabilityInfo = {
+            mode: 'resource_busy',
+            order_id: '0',
+            relation_id: relationId,
+            table_form_id: tableFormId,
+            deskmate_valid: deskmateValid
+          };
+        }
       }
       return _objectSpread(_objectSpread({}, availabilityInfo), {}, {
         currentOrderId: currentOrderId,
@@ -2146,7 +2162,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 78:
               _context28.prev = 78;
               _context28.t0 = _context28["catch"](1);
-              this.logMethodError('checkResourceAvailable', _context28.t0, {
+              this.logMethodError('checkResourceAvailable', _context28.t0.message, {
                 resourceId: resourceId
               });
               throw _context28.t0;
@@ -2225,7 +2241,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 11:
               _context30.prev = 11;
               _context30.t0 = _context30["catch"](2);
-              this.logMethodError('getProductList', _context30.t0);
+              this.logMethodError('getProductList', _context30.t0.message);
               throw _context30.t0;
             case 15:
             case "end":

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

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

package/lib/modules/ScanOrderLogger/providers/feishu.js

@@ -22,58 +22,124 @@ __export(feishu_exports, {
   feishuLoggerProvider: () => feishuLoggerProvider
 });
 module.exports = __toCommonJS(feishu_exports);
-function safeStringify(payload) {
-  if (payload === void 0 || payload === null)
+var DEFAULT_THROTTLE_MS = 3e3;
+var pendingQueue = [];
+var flushTimer = null;
+var cachedProviderConfig;
+function safeStringify(value) {
+  if (value === void 0 || value === null)
     return "";
+  if (typeof value === "string")
+    return value;
+  if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
+    return String(value);
+  }
   try {
-    return JSON.stringify(payload);
+    return JSON.stringify(value);
   } catch (error) {
     return `[unserializable: ${String(error)}]`;
   }
 }
-function createFeishuMessageContent(contentArr) {
-  return JSON.stringify(
-    contentArr.map((item) => [
-      { tag: "text", text: `${item.key}: ` },
-      { tag: "text", text: item.value }
-    ])
-  );
+function isWebhookUsable(webhook) {
+  if (!webhook)
+    return false;
+  if (webhook.includes("REPLACE_ME"))
+    return false;
+  return true;
+}
+function buildRecordSegments(record) {
+  const context = record.context || {};
+  return [
+    [{ tag: "text", text: `[${record.level}] ${record.timestamp} ${record.title}
+` }],
+    [{ tag: "text", text: `缓存标识: ${safeStringify(context.cacheId)}
+` }],
+    [{ tag: "text", text: `日志来源: ${safeStringify(context)}
+` }],
+    [{ tag: "text", text: `日志内容: ${safeStringify(record.payload)}
+` }],
+    [{ tag: "text", text: `扩展信息: ${safeStringify(record.extra)}
+` }],
+    [{ tag: "text", text: "------\n" }]
+  ];
+}
+function buildFeishuBody(records) {
+  const title = records.length === 1 ? records[0].title : `ScanOrder 日志批量 (${records.length} 条)`;
+  const content = [];
+  records.forEach((record) => {
+    buildRecordSegments(record).forEach((segment) => content.push(segment));
+  });
+  return JSON.stringify({
+    msg_type: "post",
+    content: JSON.stringify({
+      post: {
+        zh_cn: {
+          title,
+          content
+        }
+      }
+    })
+  });
+}
+async function postToFeishu(webhook, body) {
+  await fetch(webhook, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body
+  });
+}
+async function flushQueue() {
+  var _a;
+  flushTimer = null;
+  if (!pendingQueue.length)
+    return;
+  const records = pendingQueue.splice(0, pendingQueue.length);
+  const webhook = (_a = cachedProviderConfig == null ? void 0 : cachedProviderConfig.feishu) == null ? void 0 : _a.webhook;
+  if (!isWebhookUsable(webhook)) {
+    return;
+  }
+  if (typeof fetch !== "function") {
+    console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志批量上报");
+    return;
+  }
+  try {
+    await postToFeishu(webhook, buildFeishuBody(records));
+  } catch (error) {
+    console.warn("[ScanOrderLogger] Feishu 批量上报失败", error);
+  }
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b;
+    var _a, _b, _c, _d;
+    cachedProviderConfig = payload.providerConfig;
     const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
-    if (webhook && webhook.includes("REPLACE_ME"))
-      return;
     if (!webhook) {
       console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
       return;
     }
+    if (!isWebhookUsable(webhook))
+      return;
     if (typeof fetch !== "function") {
       console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
       return;
     }
-    const { record } = payload;
-    const contentArr = [
-      { key: "日志级别", value: record.level },
-      { key: "日志时间", value: record.timestamp },
-      { key: "日志标题", value: record.title },
-      { key: "缓存标识", value: record.context.cacheId || "" },
-      { key: "日志来源", value: safeStringify(record.context) },
-      { key: "日志内容", value: safeStringify(record.payload) },
-      { key: "扩展信息", value: safeStringify(record.extra) }
-    ];
-    const contentStr = createFeishuMessageContent(contentArr);
-    await fetch(webhook, {
-      headers: {
-        "Content-Type": "application/json"
-      },
-      method: "POST",
-      body: JSON.stringify({
-        msg_type: "post",
-        content: `{"post":{"zh_cn":{"title":"${record.title}","content":${contentStr}}}}`
-      })
-    });
+    const throttleMs = ((_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    if (throttleMs <= 0) {
+      try {
+        await postToFeishu(webhook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu 日志上报失败", error);
+      }
+      return;
+    }
+    pendingQueue.push(payload.record);
+    if (!flushTimer) {
+      flushTimer = setTimeout(() => {
+        void flushQueue();
+      }, throttleMs);
+    }
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/modules/ScanOrderLogger/types.d.ts

@@ -2,6 +2,12 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    /**
+     * 节流窗口毫秒数，默认 3000ms
+     * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送
+     * - <=0：关闭节流，保持每条日志立即单独发送
+     */
+    throttleMs?: number;
 }
 export interface ScanOrderLoggerProviderGrafanaConfig {
     endpoint?: string;

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

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

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

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

package/lib/solution/ScanOrder/index.js

@@ -84,11 +84,11 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
   serializeError(error) {
     if (error instanceof Error) {
-      return {
+      return JSON.stringify({
         name: error.name,
         message: error.message,
         stack: error.stack
-      };
+      });
     }
     return {
       message: String(error)
@@ -503,6 +503,17 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const ruleProduct = this.enabledReservationRuleProducts[0];
     const resourceState = this.store.resource;
     const resourceSelectType = resourceState == null ? void 0 : resourceState.resourceSelectType;
+    const resolveResourceCapacity = () => {
+      var _a;
+      if (resourceSelectType === "single") {
+        const raw = (_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.capacity;
+        const num = Number(raw);
+        if (Number.isFinite(num) && num > 0)
+          return num;
+        return 1;
+      }
+      return 1;
+    };
     return (payload, { bookingUuid, tempOrder }) => {
       var _a;
       const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
@@ -521,16 +532,18 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: 1,
+        capacity: resolveResourceCapacity(),
         metadata: {}
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
+      const bookingCapacityValue = resolveResourceCapacity();
       const nextBookings = (payload.bookings || []).map((booking, idx) => ({
         ...booking,
         appointment_status: "started",
         metadata: {
           ...booking.metadata || {},
-          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {}
+          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
+          ...resourceSelectType ? { capacity: [{ id: 0, value: bookingCapacityValue, name: "" }] } : {}
         },
         ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
         ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
@@ -1054,19 +1067,16 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         };
       }
     } else if (lastOrderId) {
-      availabilityInfo = allowSnack ? {
-        mode: deskmateValid ? "additional_order_with_code" : "additional_order",
-        order_id: lastOrderId,
-        relation_id: relationId,
-        table_form_id: tableFormId,
-        deskmate_valid: deskmateValid
-      } : {
-        mode: "resource_busy",
-        order_id: lastOrderId,
-        relation_id: relationId,
-        table_form_id: tableFormId,
-        deskmate_valid: deskmateValid
-      };
+      const canFallthroughToIdle = resourceSelectType === "multiple" && !isFull;
+      if (!canFallthroughToIdle) {
+        availabilityInfo = {
+          mode: "resource_busy",
+          order_id: "0",
+          relation_id: relationId,
+          table_form_id: tableFormId,
+          deskmate_valid: deskmateValid
+        };
+      }
     }
     return {
       ...availabilityInfo,
@@ -1319,7 +1329,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       });
       return availabilityInfo;
     } catch (error) {
-      this.logMethodError("checkResourceAvailable", error, {
+      this.logMethodError("checkResourceAvailable", error.message, {
         resourceId
       });
       throw error;
@@ -1362,7 +1372,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       });
       return formattedRes;
     } catch (error) {
-      this.logMethodError("getProductList", error);
+      this.logMethodError("getProductList", error.message);
       throw error;
     }
   }

package/package.json

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