@pisell/pisellos 0.0.172 → 0.0.174

package/dist/modules/Rules/index.js

@@ -420,6 +420,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 记录实际应用了优惠券的商品信息
           var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
+
+          // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
           var productOriginTotal = product.origin_total || product.total || 0;
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total

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
+          }]);
+        }
       }
     }
   }, {

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/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) {

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