@pisell/pisellos 2.1.92 → 2.1.94

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -2566,8 +2566,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   _step3;
                 try {
                   for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var _time$event_list;
                     var time = _step3.value;
-                    var _iterator4 = _createForOfIteratorHelper(time.event_list || []),
+                    var blockedTimes = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.filter(function (event) {
+                      return event.type !== 'schedule_event';
+                    });
+                    var _iterator4 = _createForOfIteratorHelper(blockedTimes || []),
                       _step4;
                     try {
                       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1774,10 +1774,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentStartTime: currentStartTime2,
               times
             }) {
+              var _a4;
               const currentStart = (0, import_dayjs.default)(currentStartTime2);
               let earliestBlockStart;
               for (const time of times || []) {
-                for (const event of time.event_list || []) {
+                const blockedTimes = (_a4 = time.event_list) == null ? void 0 : _a4.filter((event) => event.type !== "schedule_event");
+                for (const event of blockedTimes || []) {
                   const eventStart = (0, import_dayjs.default)(event.start_at);
                   const eventEnd = (0, import_dayjs.default)(event.end_at);
                   if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {

package/package.json

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