@pisell/pisellos 3.0.82 → 3.0.84

package/dist/modules/Rules/index.js

@@ -1059,7 +1059,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: [],
-              price: flatItem.bundleItem.original_price,
+              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
           }

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

package/dist/solution/BookingByStep/index.js

@@ -2556,8 +2556,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/Rules/index.js

@@ -749,7 +749,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: [],
-            price: flatItem.bundleItem.original_price,
+            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
         }

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

package/lib/solution/BookingByStep/index.js

@@ -1773,10 +1773,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": "3.0.82",
+  "version": "3.0.84",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",