@pisell/pisellos 2.0.48 → 2.0.50

package/dist/modules/Rules/index.js

@@ -425,6 +425,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
+          var _originProduct$_produ, _product$discount_lis10;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -434,8 +435,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
 
           // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
-
           var productOriginTotal = product.origin_total || product.total || 0;
+          // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
+          if (Number((originProduct === null || originProduct === void 0 || (_originProduct$_produ = originProduct._productInit) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+            productOriginTotal = product.total;
+          }
+          // 如果当前 product 有 discount_list，则必须从 origin_total 拿
+          if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length) {
+            productOriginTotal = product.origin_total;
+          }
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           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();

package/dist/solution/BookingByStep/index.js

@@ -1436,7 +1436,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resources = [];
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
         dateRange.forEach(function (n) {
-          resources.push.apply(resources, _toConsumableArray(_this10.store.date.getResourcesListByDate(n.date) || []));
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
         });
       }
       var cartItems = this.store.cart.getItems().filter(function (n) {
@@ -1673,10 +1673,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
       if (!AllResources.length) {
-        var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
-          if (n.resource) AllResources.push.apply(AllResources, _toConsumableArray(n.resource));
+        var firstDateCartItem = cartItems === null || cartItems === void 0 ? void 0 : cartItems.find(function (n) {
+          return n.start_date;
         });
+        if (firstDateCartItem !== null && firstDateCartItem !== void 0 && firstDateCartItem.start_date) {
+          var dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+          AllResources.push.apply(AllResources, _toConsumableArray(dateResources || []));
+        } else {
+          var dateList = this.store.date.getDateList();
+          dateList.forEach(function (n) {
+            if (n.resource) AllResources.push.apply(AllResources, _toConsumableArray(n.resource));
+          });
+        }
       }
       var resourcesMap = getResourcesMap(cloneDeep(AllResources));
       var allCartItems = cloneDeep(this.store.cart.getItems());

package/lib/modules/Rules/index.js

@@ -207,7 +207,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
     sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
         processedProductsMap.set(product._id, [originProduct]);
@@ -297,7 +297,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
-        const productOriginTotal = product.origin_total || product.total || 0;
+        let productOriginTotal = product.origin_total || product.total || 0;
+        if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          productOriginTotal = product.total;
+        }
+        if ((_h = product.discount_list) == null ? void 0 : _h.length) {
+          productOriginTotal = product.origin_total;
+        }
         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(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),

package/lib/solution/BookingByStep/index.js

@@ -826,7 +826,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
       dateRange.forEach((n) => {
-        resources.push(...this.store.date.getResourcesListByDate(n.date) || []);
+        if (n.resource)
+          resources.push(...n.resource);
       });
     }
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
@@ -1055,11 +1056,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     if (!AllResources.length) {
-      const dateList = this.store.date.getDateList();
-      dateList.forEach((n) => {
-        if (n.resource)
-          AllResources.push(...n.resource);
-      });
+      const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
+      if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
+        const dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+        AllResources.push(...dateResources || []);
+      } else {
+        const dateList = this.store.date.getDateList();
+        dateList.forEach((n) => {
+          if (n.resource)
+            AllResources.push(...n.resource);
+        });
+      }
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(AllResources));
     const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());

package/package.json

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