@pisell/pisellos 2.0.40 → 2.0.42

package/dist/modules/AccountList/index.js

@@ -326,7 +326,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
-              if (((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id) {
+              if (!this.getActiveAccount() || ((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id || this.store.accounts.length === 1) {
                 this.setActiveAccount(this.store.accounts[0].getId());
               }
               _context6.next = 12;

package/dist/modules/Rules/index.js

@@ -423,15 +423,18 @@ 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
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(product.origin_total || 0).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.origin_total || 0)).toNumber();
+          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
           var discountDetail = {
-            amount: new Decimal(product.origin_total || 0).minus(new Decimal(targetProductTotal)).toNumber(),
+            amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
             discount: {
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
-              original_amount: product.origin_total,
+              original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
             },
@@ -465,7 +468,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,
-              origin_total: product.origin_total || product.total
+              origin_total: productOriginTotal
             }));
           }
         }

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/lib/modules/AccountList/index.js

@@ -195,7 +195,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.accountList = this.store.accountList.filter(
         (account) => account.id !== id
       );
-      if (((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id) {
+      if (!this.getActiveAccount() || ((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id || this.store.accounts.length === 1) {
         this.setActiveAccount(this.store.accounts[0].getId());
       }
       await this.core.effects.emit(

package/lib/modules/Rules/index.js

@@ -293,14 +293,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const selectedDiscount2 = applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
-        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.origin_total || 0)).toNumber();
+        const productOriginTotal = product.origin_total || product.total || 0;
+        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
         const discountDetail = {
-          amount: new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+          amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
-            original_amount: product.origin_total,
+            original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
           },
@@ -331,7 +332,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,
-            origin_total: product.origin_total || product.total
+            origin_total: productOriginTotal
           }));
         }
       }

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/package.json

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