@pisell/pisellos 2.1.138 → 2.1.140

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

@@ -142,62 +142,80 @@ function _flushQueue() {
 export var feishuLoggerProvider = {
   send: function send(payload) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _payload$providerConf, _payload$providerConf2, _payload$providerConf3;
-      var webhook, throttleMs;
+      var _payload$providerConf, _payload$providerConf2, _payload$providerConf3, _payload$providerConf4;
+      var webhook, errorHook, 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) {
-              _context.next = 5;
+            errorHook = (_payload$providerConf2 = payload.providerConfig) === null || _payload$providerConf2 === void 0 || (_payload$providerConf2 = _payload$providerConf2.feishu) === null || _payload$providerConf2 === void 0 ? void 0 : _payload$providerConf2.errorHook;
+            if (!(typeof fetch !== 'function')) {
+              _context.next = 6;
               break;
             }
-            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
+            console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报');
             return _context.abrupt("return");
-          case 5:
-            if (isWebhookUsable(webhook)) {
-              _context.next = 7;
+          case 6:
+            if (!(payload.record.level === 'error' && isWebhookUsable(errorHook))) {
+              _context.next = 16;
               break;
             }
+            _context.prev = 7;
+            _context.next = 10;
+            return postToFeishu(errorHook, buildFeishuBody([payload.record]));
+          case 10:
+            _context.next = 15;
+            break;
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](7);
+            console.warn('[ScanOrderLogger] Feishu errorHook 上报失败', _context.t0);
+          case 15:
             return _context.abrupt("return");
-          case 7:
-            if (!(typeof fetch !== 'function')) {
-              _context.next = 10;
+          case 16:
+            if (webhook) {
+              _context.next = 19;
               break;
             }
-            console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报');
+            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
             return _context.abrupt("return");
-          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)) {
+          case 19:
+            if (isWebhookUsable(webhook)) {
               _context.next = 21;
               break;
             }
-            _context.prev = 12;
-            _context.next = 15;
+            return _context.abrupt("return");
+          case 21:
+            throttleMs = (_payload$providerConf3 = (_payload$providerConf4 = payload.providerConfig) === null || _payload$providerConf4 === void 0 || (_payload$providerConf4 = _payload$providerConf4.feishu) === null || _payload$providerConf4 === void 0 ? void 0 : _payload$providerConf4.throttleMs) !== null && _payload$providerConf3 !== void 0 ? _payload$providerConf3 : DEFAULT_THROTTLE_MS;
+            if (!(throttleMs <= 0)) {
+              _context.next = 32;
+              break;
+            }
+            _context.prev = 23;
+            _context.next = 26;
             return postToFeishu(webhook, buildFeishuBody([payload.record]));
-          case 15:
-            _context.next = 20;
+          case 26:
+            _context.next = 31;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](12);
-            console.warn('[ScanOrderLogger] Feishu 日志上报失败', _context.t0);
-          case 20:
+          case 28:
+            _context.prev = 28;
+            _context.t1 = _context["catch"](23);
+            console.warn('[ScanOrderLogger] Feishu 日志上报失败', _context.t1);
+          case 31:
             return _context.abrupt("return");
-          case 21:
+          case 32:
             pendingQueue.push(payload.record);
             if (!flushTimer) {
               flushTimer = setTimeout(function () {
                 void flushQueue();
               }, throttleMs);
             }
-          case 23:
+          case 34:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[12, 17]]);
+      }, _callee, null, [[7, 12], [23, 28]]);
     }))();
   }
 };

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

@@ -2,6 +2,7 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    errorHook?: string;
     /**
      * 节流窗口毫秒数，默认 3000ms
      * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送

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

@@ -310,7 +310,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 | 4 | 3 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/ScanOrder/index.js

@@ -497,7 +497,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                   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'
+                      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, {

package/dist/solution/VenueBooking/index.js

@@ -503,7 +503,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   } : {};
                   var loggerProvider = ((_this4$otherParams = _this4.otherParams) === null || _this4$otherParams === void 0 ? void 0 : _this4$otherParams.loggerProvider) || 'feishu';
                   var loggerConfig = ((_this4$otherParams2 = _this4.otherParams) === null || _this4$otherParams2 === void 0 ? void 0 : _this4$otherParams2.loggerConfig) || {
-                    feishu: {}
+                    feishu: {
+                      webhook: 'https://open.feishu.cn/open-apis/bot/v2/hook/8f069b14-9d39-4728-8f78-b56f393bfde8',
+                      errorHook: 'https://open.feishu.cn/open-apis/bot/v2/hook/bdefae5e-f233-4705-8688-946887d9543d'
+                    }
                   };
                   _this4.core.registerModule(targetModule, {
                     initialState: initialState,
@@ -828,24 +831,28 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('addonProducts 模块未初始化');
             case 6:
+              _context11.next = 8;
+              return this.loadOpenDataConfig();
+            case 8:
               associatedMenus = ((_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 || (_this$otherParams7 = _this$otherParams7.openData) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7['menu.associated_menus']) || [];
               if (associatedMenus.length) {
-                _context11.next = 9;
+                _context11.next = 12;
                 break;
               }
+              this.logMethodError('loadAllProducts', new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置'));
               throw new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置');
-            case 9:
+            case 12:
               menuListIds = associatedMenus.map(function (n) {
                 return Number(n.value);
               });
-              _context11.next = 12;
+              _context11.next = 15;
               return this.store.venueProducts.loadProducts({
                 menu_list_ids: menuListIds,
                 cacheId: this.cacheId,
                 schedule_date: dayjs().format('YYYY-MM-DD'),
                 schedule_datetime: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
-            case 12:
+            case 15:
               allProducts = _context11.sent;
               list = Array.isArray(allProducts) ? allProducts : [];
               venueList = list.filter(function (p) {
@@ -873,16 +880,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 venueProducts: venueList,
                 addonProducts: addonList
               });
-            case 25:
-              _context11.prev = 25;
+            case 28:
+              _context11.prev = 28;
               _context11.t0 = _context11["catch"](1);
               this.logMethodError('loadAllProducts', _context11.t0);
               throw _context11.t0;
-            case 29:
+            case 32:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[1, 25]]);
+        }, _callee11, this, [[1, 28]]);
       }));
       function _doLoadAllProducts() {
         return _doLoadAllProducts2.apply(this, arguments);
@@ -2593,8 +2600,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadOpenDataConfig",
     value: function () {
       var _loadOpenDataConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _this11 = this;
-        var lastFetchedAt, cachedData;
+        var lastFetchedAt, cachedData, openDataConfig;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -2614,27 +2620,35 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               return _context29.abrupt("return", cachedData);
             case 7:
               if (!this.loadOpenDataConfigInFlight) {
-                _context29.next = 9;
+                _context29.next = 11;
                 break;
               }
-              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
-            case 9:
+              _context29.next = 10;
+              return this.loadOpenDataConfigInFlight;
+            case 10:
+              return _context29.abrupt("return", _context29.sent);
+            case 11:
               this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
                 scope: 'board',
                 target: 'venue_booking+online_store',
                 section_code: [].concat(OPEN_DATA_SECTION_CODES)
-              }).then(function (openDataConfig) {
-                _this11.otherParams.openData = openDataConfig;
-                return openDataConfig;
-              }).finally(function () {
-                _this11.loadOpenDataConfigInFlight = null;
               });
-              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
-            case 11:
+              _context29.prev = 12;
+              _context29.next = 15;
+              return this.loadOpenDataConfigInFlight;
+            case 15:
+              openDataConfig = _context29.sent;
+              this.otherParams.openData = openDataConfig;
+              return _context29.abrupt("return", openDataConfig);
+            case 18:
+              _context29.prev = 18;
+              this.loadOpenDataConfigInFlight = null;
+              return _context29.finish(18);
+            case 21:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this);
+        }, _callee29, this, [[12,, 18, 21]]);
       }));
       function loadOpenDataConfig() {
         return _loadOpenDataConfig.apply(this, arguments);
@@ -2814,7 +2828,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "ensureItemRuleConfigsLoaded",
     value: function () {
       var _ensureItemRuleConfigsLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
-        var _this12 = this;
+        var _this11 = this;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
@@ -2835,19 +2849,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee33$(_context33) {
                   while (1) switch (_context33.prev = _context33.next) {
                     case 0:
-                      runtimeConfig = _this12.getItemRuleRuntimeConfig();
+                      runtimeConfig = _this11.getItemRuleRuntimeConfig();
                       staticConfigs = normalizeItemRuleStrategies(runtimeConfig.strategyConfigs);
                       if (!(staticConfigs.length > 0)) {
                         _context33.next = 6;
                         break;
                       }
-                      _this12.itemRuleConfigs = staticConfigs;
-                      _this12.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
-                      return _context33.abrupt("return", _this12.itemRuleConfigs);
+                      _this11.itemRuleConfigs = staticConfigs;
+                      _this11.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
+                      return _context33.abrupt("return", _this11.itemRuleConfigs);
                     case 6:
-                      _this12.itemRuleConfigs = [];
-                      _this12.itemRuleEvaluator.setStrategyConfigs([]);
-                      return _context33.abrupt("return", _this12.itemRuleConfigs);
+                      _this11.itemRuleConfigs = [];
+                      _this11.itemRuleEvaluator.setStrategyConfigs([]);
+                      return _context33.abrupt("return", _this11.itemRuleConfigs);
                     case 9:
                     case "end":
                       return _context33.stop();

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

@@ -112,20 +112,29 @@ async function flushQueue() {
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     cachedProviderConfig = payload.providerConfig;
     const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
+    const errorHook = (_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.errorHook;
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
+      return;
+    }
+    if (payload.record.level === "error" && isWebhookUsable(errorHook)) {
+      try {
+        await postToFeishu(errorHook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu errorHook 上报失败", error);
+      }
+      return;
+    }
     if (!webhook) {
       console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
       return;
     }
     if (!isWebhookUsable(webhook))
       return;
-    if (typeof fetch !== "function") {
-      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
-      return;
-    }
-    const throttleMs = ((_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    const throttleMs = ((_f = (_e = payload.providerConfig) == null ? void 0 : _e.feishu) == null ? void 0 : _f.throttleMs) ?? DEFAULT_THROTTLE_MS;
     if (throttleMs <= 0) {
       try {
         await postToFeishu(webhook, buildFeishuBody([payload.record]));

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

@@ -2,6 +2,7 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    errorHook?: string;
     /**
      * 节流窗口毫秒数，默认 3000ms
      * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送

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

@@ -310,7 +310,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 | 4 | 3 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/ScanOrder/index.js

@@ -324,7 +324,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         const loggerProvider = ((_c2 = this.otherParams) == null ? void 0 : _c2.scanOrderLoggerProvider) || "feishu";
         const loggerConfig = ((_d2 = this.otherParams) == null ? void 0 : _d2.scanOrderLoggerConfig) || {
           feishu: {
-            webhook: "https://open.feishu.cn/open-apis/bot/v2/hook/216b3fe6-af98-424e-8706-f0471241a7ed"
+            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.core.registerModule(targetModule, {

package/lib/solution/VenueBooking/index.js

@@ -345,7 +345,10 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         } : {};
         const loggerProvider = ((_c2 = this.otherParams) == null ? void 0 : _c2.loggerProvider) || "feishu";
         const loggerConfig = ((_d2 = this.otherParams) == null ? void 0 : _d2.loggerConfig) || {
-          feishu: {}
+          feishu: {
+            webhook: "https://open.feishu.cn/open-apis/bot/v2/hook/8f069b14-9d39-4728-8f78-b56f393bfde8",
+            errorHook: "https://open.feishu.cn/open-apis/bot/v2/hook/bdefae5e-f233-4705-8688-946887d9543d"
+          }
         };
         this.core.registerModule(targetModule, {
           initialState,
@@ -523,8 +526,10 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         throw new Error("venueProducts 模块未初始化");
       if (!this.store.addonProducts)
         throw new Error("addonProducts 模块未初始化");
+      await this.loadOpenDataConfig();
       const associatedMenus = ((_b = (_a = this.otherParams) == null ? void 0 : _a.openData) == null ? void 0 : _b["menu.associated_menus"]) || [];
       if (!associatedMenus.length) {
+        this.logMethodError("loadAllProducts", new Error("未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置"));
         throw new Error("未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置");
       }
       const menuListIds = associatedMenus.map((n) => Number(n.value));
@@ -1529,18 +1534,19 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       return cachedData;
     }
     if (this.loadOpenDataConfigInFlight)
-      return this.loadOpenDataConfigInFlight;
+      return await this.loadOpenDataConfigInFlight;
     this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
       scope: "board",
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
-    }).then((openDataConfig) => {
+    });
+    try {
+      const openDataConfig = await this.loadOpenDataConfigInFlight;
       this.otherParams.openData = openDataConfig;
       return openDataConfig;
-    }).finally(() => {
+    } finally {
       this.loadOpenDataConfigInFlight = null;
-    });
-    return this.loadOpenDataConfigInFlight;
+    }
   }
   async loadRuntimeConfigs() {
     await this.loadOpenDataConfig();

package/package.json

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