@pisell/pisellos 2.0.41 → 2.0.43

package/dist/modules/Rules/index.js

@@ -330,7 +330,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          if (Number(product.price) === 0 || !product.price) return false;
+          if (Number(product.price) === 0 && discount.tag === 'good_pass' || Number(product.total) === 0 && discount.tag !== 'good_pass' || !product.price) return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;

package/dist/solution/BookingByStep/index.js

@@ -1191,6 +1191,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _this6.store.cart.removeItem(n._id);
           });
         }
+        // 如果 date.startTime 和 dateRange 里的 startTime 不一样，需要修正 dateRange
+        var dateRange = this.store.date.getDateRange();
+        if (dateRange !== null && dateRange !== void 0 && dateRange[0] && !dayjs(dateRange[0].date).isSame(dayjs(date.startTime), 'day')) {
+          this.setDateRange([{
+            date: dayjs(date.startTime).format('YYYY-MM-DD'),
+            status: 'available',
+            week: '',
+            weekNum: 0
+          }, {
+            date: dayjs(date.endTime).format('YYYY-MM-DD'),
+            status: 'available',
+            week: '',
+            weekNum: 0
+          }]);
+        }
       }
     }
   }, {
@@ -2809,7 +2824,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                       });
 
                       // 如果 firstAvailableDate 距离 startDate 大于 14 天了，则后面就不需要再找了，也是一种性能保护
-                      if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 14)) {
+                      if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 31)) {
                         _context28.next = 9;
                         break;
                       }

package/dist/solution/ShopDiscount/index.js

@@ -504,7 +504,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             return n.id === id;
           });
           var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
-          return Number(product === null || product === void 0 ? void 0 : product.price) === 0;
+          return Number(product === null || product === void 0 ? void 0 : product.total) === 0;
         };
         var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
           var _item$applicableProdu2;

package/lib/modules/Rules/index.js

@@ -213,7 +213,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (Number(product.price) === 0 || !product.price)
+        if (Number(product.price) === 0 && discount.tag === "good_pass" || Number(product.total) === 0 && discount.tag !== "good_pass" || !product.price)
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")

package/lib/solution/BookingByStep/index.js

@@ -637,6 +637,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           this.store.cart.removeItem(n._id);
         });
       }
+      const dateRange = this.store.date.getDateRange();
+      if ((dateRange == null ? void 0 : dateRange[0]) && !(0, import_dayjs.default)(dateRange[0].date).isSame((0, import_dayjs.default)(date.startTime), "day")) {
+        this.setDateRange([
+          { date: (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD"), status: "available", week: "", weekNum: 0 },
+          { date: (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD"), status: "available", week: "", weekNum: 0 }
+        ]);
+      }
     }
   }
   beforeUpdateCart(params, targetCartItem) {
@@ -2010,7 +2017,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         weekNum: (0, import_dayjs.default)(currentDate).day(),
         status
       });
-      if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 14) {
+      if (firstAvailableDate && (0, import_dayjs.default)(currentDate).diff((0, import_dayjs.default)(startDate), "day") > 31) {
         break;
       }
       currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");

package/lib/solution/ShopDiscount/index.js

@@ -346,7 +346,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         var _a3;
         const targetProduct = productList.find((n) => n.id === id);
         const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
-        return Number(product == null ? void 0 : product.price) === 0;
+        return Number(product == null ? void 0 : product.total) === 0;
       };
       const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
         var _a3;

package/package.json

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