@pisell/pisellos 0.0.91 → 0.0.93

package/dist/modules/Date/utils.js

@@ -209,7 +209,18 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
     var disabledDate = _objectSpread(_objectSpread({}, date), {}, {
       status: 'unavailable'
     });
-
+    var hasScheduleConfig = rules.find(function (n) {
+      var _n$schedule;
+      return (_n$schedule = n.schedule) === null || _n$schedule === void 0 ? void 0 : _n$schedule.length;
+    });
+    // 如果外面穿了 schedule，但是这个时候scheduleMap为空，则设置为不可用
+    // 这种情况为，商品设置了 5.1-5.31 可用，资源设置了 5.1-6.30 可用，session 类商品详情弹窗里里看到的6 月以后的日期都应该是不可用的
+    if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
+      return _objectSpread(_objectSpread({}, date), {}, {
+        color: '',
+        status: 'unavailable'
+      });
+    }
     // 根据日程判断日期是否可用
     if (Object.keys(scheduleMap).length) {
       var schedule = scheduleMap[date.date];

package/dist/modules/Rules/index.js

@@ -243,7 +243,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct) {
-        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5;
+        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
           return discount.id && discount.type === 'good_pass';
@@ -271,7 +271,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
-        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && !((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length);
+        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || (product === null || product === void 0 || (_product$discount_lis6 = product.discount_list) === null || _product$discount_lis6 === void 0 || (_product$discount_lis7 = _product$discount_lis6.every) === null || _product$discount_lis7 === void 0 ? void 0 : _product$discount_lis7.call(_product$discount_lis6, function (item) {
+          return item.type === 'product';
+        })));
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId && (options === null || options === void 0 ? void 0 : options.discountId) === (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.id)) {
@@ -302,7 +304,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             })));
           } else {
             processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-              total: product.total,
+              total: product.origin_total || product.total,
               price: product.price
             }), {}, {
               discount_list: []

package/dist/modules/Schedule/utils.js

@@ -716,7 +716,7 @@ export function getAllSortedDateRanges(schedules) {
   }
 
   // 按照开始时间和时长排序
-  return allDateRanges.sort(function (a, b) {
+  var sortedDateRanges = allDateRanges.sort(function (a, b) {
     // 首先按开始时间排序
     var startTimeCompare = dayjs(a.start).valueOf() - dayjs(b.start).valueOf();
     if (startTimeCompare !== 0) return startTimeCompare;
@@ -726,4 +726,12 @@ export function getAllSortedDateRanges(schedules) {
     var durationB = dayjs(b.end).valueOf() - dayjs(b.start).valueOf();
     return durationA - durationB;
   });
+
+  // 排序完了，还需要做个去重，如果有开始时间结束时间完全一致的，则只保留一个
+  var uniqueDateRanges = sortedDateRanges.filter(function (range, index, self) {
+    return index === self.findIndex(function (t) {
+      return t.start === range.start && t.end === range.end;
+    });
+  });
+  return uniqueDateRanges;
 }

package/dist/solution/BookingByStep/utils/resources.js

@@ -205,6 +205,10 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
         canBookingForOngoing = true;
       }
     }
+  } else if (type === 'ongoing' && (ongoing === null || ongoing === void 0 ? void 0 : ongoing.type) === 'before_end') {
+    if (dayjs(timeSlice.end_at).isAfter(earliest)) {
+      canBookingForOngoing = true;
+    }
   } else {
     if (unit) {
       earliest = earliest.add(unit, unit_type);

package/lib/modules/Date/utils.js

@@ -155,6 +155,13 @@ var handleAvailableDatesByRules = (dates, rules) => {
   newDates = newDates.map((date) => {
     var _a;
     const disabledDate = { ...date, status: "unavailable" };
+    const hasScheduleConfig = rules.find((n) => {
+      var _a2;
+      return (_a2 = n.schedule) == null ? void 0 : _a2.length;
+    });
+    if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
+      return { ...date, color: "", status: "unavailable" };
+    }
     if (Object.keys(scheduleMap).length) {
       const schedule = scheduleMap[date.date];
       if (!schedule || (schedule == null ? void 0 : schedule.isExcluded)) {

package/lib/modules/Rules/index.js

@@ -154,7 +154,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     sortedProductList.forEach((originProduct) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       const product = this.hooks.getProduct(originProduct);
       if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
         processedProductsMap.set(product._id, originProduct);
@@ -172,7 +172,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return false;
       });
       const selectedDiscount = applicableDiscounts[0];
-      let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_c = product.discount_list) == null ? void 0 : _c.length);
+      let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
       if ((options == null ? void 0 : options.discountId) && (options == null ? void 0 : options.discountId) === (selectedDiscount == null ? void 0 : selectedDiscount.id)) {
         isManualDiscount = false;
       }
@@ -206,7 +206,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             product._id,
             this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
-                total: product.total,
+                total: product.origin_total || product.total,
                 price: product.price
               },
               discount_list: []

package/lib/modules/Schedule/utils.js

@@ -573,7 +573,7 @@ function getAllSortedDateRanges(schedules) {
     console.log("No dateRanges found in schedules:", schedules);
     return [];
   }
-  return allDateRanges.sort((a, b) => {
+  let sortedDateRanges = allDateRanges.sort((a, b) => {
     const startTimeCompare = (0, import_dayjs.default)(a.start).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     if (startTimeCompare !== 0)
       return startTimeCompare;
@@ -581,6 +581,10 @@ function getAllSortedDateRanges(schedules) {
     const durationB = (0, import_dayjs.default)(b.end).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     return durationA - durationB;
   });
+  const uniqueDateRanges = sortedDateRanges.filter(
+    (range, index, self) => index === self.findIndex((t) => t.start === range.start && t.end === range.end)
+  );
+  return uniqueDateRanges;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/BookingByStep/utils/resources.js

@@ -149,6 +149,10 @@ var getIsUsableByTimeItem = ({
         canBookingForOngoing = true;
       }
     }
+  } else if (type === "ongoing" && (ongoing == null ? void 0 : ongoing.type) === "before_end") {
+    if ((0, import_dayjs.default)(timeSlice.end_at).isAfter(earliest)) {
+      canBookingForOngoing = true;
+    }
   } else {
     if (unit) {
       earliest = earliest.add(unit, unit_type);

package/package.json

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