@pisell/pisellos 2.1.140 → 2.1.141

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

@@ -11,10 +11,12 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
+    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }

package/dist/modules/ScanOrderLogger/index.js

@@ -46,6 +46,7 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'scanOrderLogger');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "window", void 0);
     return _this;
   }
   _createClass(ScanOrderLoggerModule, [{
@@ -64,6 +65,7 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
               options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
               this.core = core;
               this.store = options.store;
+              this.window = core.getPlugin('window') || undefined;
               provider = ((_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.provider) || 'feishu';
               providerConfig = ((_options$otherParams2 = options.otherParams) === null || _options$otherParams2 === void 0 ? void 0 : _options$otherParams2.providerConfig) || {};
               context = ((_options$otherParams3 = options.otherParams) === null || _options$otherParams3 === void 0 ? void 0 : _options$otherParams3.context) || {};
@@ -73,7 +75,7 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
                 grafana: _objectSpread(_objectSpread({}, defaultProviderConfig.grafana), providerConfig.grafana || {})
               });
               this.store.context = context;
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -102,16 +104,27 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
         grafana: _objectSpread(_objectSpread({}, this.store.providerConfig.grafana || {}), providerConfig.grafana || {})
       });
     }
+  }, {
+    key: "getCurrentHost",
+    value: function getCurrentHost() {
+      var _this$window;
+      var host = (_this$window = this.window) === null || _this$window === void 0 || (_this$window = _this$window.location) === null || _this$window === void 0 ? void 0 : _this$window.host;
+      if (typeof host === 'string' && host.length > 0) return host;
+      return undefined;
+    }
   }, {
     key: "buildRecord",
     value: function buildRecord(params) {
+      var host = this.getCurrentHost();
       return {
         level: params.level || 'info',
         title: params.title,
         timestamp: params.timestamp || dayjs().format('YYYY-MM-DD HH:mm:ss'),
         payload: params.payload || {},
         extra: params.extra || {},
-        context: this.store.context || {}
+        context: _objectSpread(_objectSpread({}, this.store.context || {}), host ? {
+          host: host
+        } : {})
       };
     }
   }, {

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 | 2 | 1 | 4 | 3 | 5 | 6;
+        weekNum: 0 | 1 | 4 | 2 | 3 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -5,6 +5,7 @@ import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 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';
 export * from './types';
 interface ScanOrderItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -41,6 +42,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private logMethodStart;
     private logMethodSuccess;
     private logMethodError;
+    private assertProductListLoaded;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
@@ -122,7 +124,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         orderAmount: number;
         orderItems: any[];
     }>;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<ProductData[]>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;

package/dist/solution/ScanOrder/index.js

@@ -192,6 +192,16 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         })
       });
     }
+  }, {
+    key: "assertProductListLoaded",
+    value: function assertProductListLoaded(method, result) {
+      var payload = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      if (Array.isArray(result)) return result;
+      var error = result instanceof Error ? result : new Error('商品列表接口返回异常');
+      this.logMethodError(method, error, payload);
+      error.__scanOrderLogged = true;
+      throw error;
+    }
   }, {
     key: "addLog",
     value: function () {
@@ -2509,7 +2519,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkResourceAvailable",
     value: function () {
       var _checkResourceAvailable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId, hasOrderId) {
-        var _this$otherParams$bus, _this$otherParams10, _this$otherParams$cha, _this$otherParams11, _this$otherParams12, _this$otherParams12$g, _occupyDetail$form_re, _occupyDetail$form_re2, _this$otherParams13, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams14, businessCode, channel, openDataTarget, openData, dineInConfig, closedBehaviorValue, closedMessage, basicUnavailableMessage, pauseMessage, makeShopClosed, operatingHourIds, outsideOperatingHours, scheduleList, now, tempOrder, reservationLinkIds, pendingRequestEntryPax, pendingRequestPaxMin, pendingRequestPaxMax, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, paxBounds, occupyDetail, resourceSelectType, resourceState, availabilityInfo, _this$store$order6, _res$data, res, entryPaxNumber, lastOrderInfo, historicalItems;
+        var _this$otherParams$bus, _this$otherParams10, _this$otherParams$cha, _this$otherParams11, _this$otherParams12, _this$otherParams12$g, _occupyDetail$form_re, _occupyDetail$form_re2, _this$otherParams13, _this$store$order5, _this$store$order7, _this$store$order7$ge, _this$otherParams14, businessCode, channel, openDataTarget, openData, dineInConfig, closedBehaviorValue, closedMessage, basicUnavailableMessage, pauseMessage, makeShopClosed, operatingHourIds, outsideOperatingHours, scheduleList, now, tempOrder, reservationLinkIds, pendingRequestEntryPax, pendingRequestPaxMin, pendingRequestPaxMax, reservationProductList, scheduleDate, scheduleDatetime, loaded, occupancyMinutes, paxBounds, error, occupyDetail, resourceSelectType, resourceState, availabilityInfo, _this$store$order6, _res$data, res, entryPaxNumber, lastOrderInfo, historicalItems;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
@@ -2643,13 +2653,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               } else {
                 this.enabledReservationRuleProducts = [];
-                void this.addScanOrderLog({
-                  level: 'error',
-                  title: '[ScanOrder] enabled_reservation_rules product query failed',
-                  payload: {
-                    linkIds: reservationLinkIds,
-                    error: this.serializeError(loaded)
-                  }
+                error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
+                this.logMethodError('loadReservationRuleProducts', error, {
+                  resourceId: resourceId,
+                  reservationLinkIds: reservationLinkIds,
+                  scheduleDate: scheduleDate,
+                  scheduleDatetime: scheduleDatetime,
+                  cacheId: this.cacheId
                 });
               }
             case 46:
@@ -2820,7 +2830,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
         var _this$otherParams15;
-        var menu_list_ids, _this$store$products, res, formattedRes;
+        var menu_list_ids, res, productList, formattedRes;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
@@ -2830,30 +2840,45 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 return Number(n.value);
               })) || [];
               _context38.prev = 2;
-              _context38.next = 5;
-              return (_this$store$products = this.store.products) === null || _this$store$products === void 0 ? void 0 : _this$store$products.loadProducts({
+              if (this.store.products) {
+                _context38.next = 5;
+                break;
+              }
+              throw new Error('products 模块未初始化');
+            case 5:
+              _context38.next = 7;
+              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 5:
+            case 7:
               res = _context38.sent;
-              formattedRes = attachItemRuleLimitsToTopLevelProducts(res, this.store.itemRuleQuantityLimits || []);
+              productList = this.assertProductListLoaded('getProductList', res, {
+                menu_list_ids: menu_list_ids,
+                cacheId: this.cacheId
+              });
+              formattedRes = attachItemRuleLimitsToTopLevelProducts(productList, this.store.itemRuleQuantityLimits || []);
               this.logMethodSuccess('getProductList', {
                 menuCount: menu_list_ids.length
               });
               return _context38.abrupt("return", formattedRes);
-            case 11:
-              _context38.prev = 11;
+            case 14:
+              _context38.prev = 14;
               _context38.t0 = _context38["catch"](2);
-              this.logMethodError('getProductList', _context38.t0.message);
+              if (!(_context38.t0 !== null && _context38.t0 !== void 0 && _context38.t0.__scanOrderLogged)) {
+                this.logMethodError('getProductList', _context38.t0, {
+                  menu_list_ids: menu_list_ids,
+                  cacheId: this.cacheId
+                });
+              }
               throw _context38.t0;
-            case 15:
+            case 18:
             case "end":
               return _context38.stop();
           }
-        }, _callee38, this, [[2, 11]]);
+        }, _callee38, this, [[2, 14]]);
       }));
       function getProductList() {
         return _getProductList.apply(this, arguments);

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

@@ -11,10 +11,12 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
+    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }

package/lib/modules/ScanOrderLogger/index.js

@@ -60,6 +60,7 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store;
+    this.window = core.getPlugin("window") || void 0;
     const provider = ((_a = options.otherParams) == null ? void 0 : _a.provider) || "feishu";
     const providerConfig = ((_b = options.otherParams) == null ? void 0 : _b.providerConfig) || {};
     const context = ((_c = options.otherParams) == null ? void 0 : _c.context) || {};
@@ -101,14 +102,25 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
       }
     };
   }
+  getCurrentHost() {
+    var _a, _b;
+    const host = (_b = (_a = this.window) == null ? void 0 : _a.location) == null ? void 0 : _b.host;
+    if (typeof host === "string" && host.length > 0)
+      return host;
+    return void 0;
+  }
   buildRecord(params) {
+    const host = this.getCurrentHost();
     return {
       level: params.level || "info",
       title: params.title,
       timestamp: params.timestamp || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
       payload: params.payload || {},
       extra: params.extra || {},
-      context: this.store.context || {}
+      context: {
+        ...this.store.context || {},
+        ...host ? { host } : {}
+      }
     };
   }
   async addLog(params) {

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 | 2 | 1 | 4 | 3 | 5 | 6;
+        weekNum: 0 | 1 | 4 | 2 | 3 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -5,6 +5,7 @@ import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 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';
 export * from './types';
 interface ScanOrderItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -41,6 +42,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private logMethodStart;
     private logMethodSuccess;
     private logMethodError;
+    private assertProductListLoaded;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
@@ -122,7 +124,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         orderAmount: number;
         orderItems: any[];
     }>;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<ProductData[]>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;

package/lib/solution/ScanOrder/index.js

@@ -155,6 +155,14 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  assertProductListLoaded(method, result, payload = {}) {
+    if (Array.isArray(result))
+      return result;
+    const error = result instanceof Error ? result : new Error("商品列表接口返回异常");
+    this.logMethodError(method, error, payload);
+    error.__scanOrderLogged = true;
+    throw error;
+  }
   async addLog(params) {
     await this.addScanOrderLog({
       ...params,
@@ -1559,13 +1567,13 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           }
         } else {
           this.enabledReservationRuleProducts = [];
-          void this.addScanOrderLog({
-            level: "error",
-            title: "[ScanOrder] enabled_reservation_rules product query failed",
-            payload: {
-              linkIds: reservationLinkIds,
-              error: this.serializeError(loaded)
-            }
+          const error = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
+          this.logMethodError("loadReservationRuleProducts", error, {
+            resourceId,
+            reservationLinkIds,
+            scheduleDate,
+            scheduleDatetime,
+            cacheId: this.cacheId
           });
         }
       }
@@ -1681,18 +1689,24 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品列表
   async getProductList() {
-    var _a, _b, _c;
+    var _a, _b;
     this.logMethodStart("getProductList");
     const menu_list_ids = ((_b = (_a = this.otherParams) == null ? void 0 : _a.dineInConfig) == null ? void 0 : _b["menu.associated_menus"].map((n) => Number(n.value))) || [];
     try {
-      const res = await ((_c = this.store.products) == null ? void 0 : _c.loadProducts({
+      if (!this.store.products)
+        throw new Error("products 模块未初始化");
+      const res = await this.store.products.loadProducts({
         menu_list_ids,
         cacheId: this.cacheId,
         schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
         schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-      }));
+      });
+      const productList = this.assertProductListLoaded("getProductList", res, {
+        menu_list_ids,
+        cacheId: this.cacheId
+      });
       const formattedRes = (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
-        res,
+        productList,
         this.store.itemRuleQuantityLimits || []
       );
       this.logMethodSuccess("getProductList", {
@@ -1700,7 +1714,12 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       });
       return formattedRes;
     } catch (error) {
-      this.logMethodError("getProductList", error.message);
+      if (!(error == null ? void 0 : error.__scanOrderLogged)) {
+        this.logMethodError("getProductList", error, {
+          menu_list_ids,
+          cacheId: this.cacheId
+        });
+      }
       throw error;
     }
   }

package/package.json

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