@pisell/pisellos 2.0.47 → 2.0.49

package/dist/modules/Rules/index.js

@@ -109,8 +109,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 编辑商品已有商品券
       if (productList.every(function (item) {
-        var _item$discount_list;
-        return item.booking_id && (((_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.length) || item.price == 0);
+        var _product$discount_lis;
+        var product = _this2.hooks.getProduct(item);
+        return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || (newDiscountList[0].tag === 'good_pass' ? product.price == 0 : product.total == 0));
       })) {
         return {
           isAvailable: false,
@@ -278,14 +279,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       sortedProductList.forEach(function (originProduct) {
         var product = _this3.hooks.getProduct(originProduct);
         addModeDiscount.forEach(function (discount) {
-          var _product$discount_lis, _product$discount_lis2;
+          var _product$discount_lis2, _product$discount_lis3;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
 
           // 是符合折扣的商品
           var isLimitedProduct = limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id);
 
           // 编辑的商品 使用了优惠券不可用
-          var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
+          var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && product !== null && product !== void 0 && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.every(function (discount) {
             return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           }));
 
@@ -318,9 +319,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct, i) {
-        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7, _product$discount_lis8;
+        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9;
         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) {
+        if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
           return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
         })) {
           processedProductsMap.set(product._id, [originProduct]);
@@ -330,7 +331,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          if (Number(product.price) === 0 && discount.tag === 'good_pass' || Number(product.total) === 0 && discount.tag !== 'good_pass' || !product.price) return false;
+          // 商品券时主商品价格为0不可用
+          if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
+          // 折扣卡时总价为0时不可用
+          if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== 'good_pass') return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
@@ -346,15 +350,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         });
 
         // 选择第一个适用的优惠券（已经按过期时间排序）
-        var selectedDiscount = applicableDiscounts[0];
+        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
+        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
+        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+          return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
+        });
+        var selectedDiscount = selectedDiscountCard || 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) || (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) {
+        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || (product === null || product === void 0 || (_product$discount_lis7 = product.discount_list) === null || _product$discount_lis7 === void 0 || (_product$discount_lis8 = _product$discount_lis7.every) === null || _product$discount_lis8 === void 0 ? void 0 : _product$discount_lis8.call(_product$discount_lis7, function (item) {
           return item.type === 'product';
         })));
 
         // 勾选时覆盖手动折扣
-        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
+        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
           var _item$discount;
           return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
         })) {
@@ -416,7 +425,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _selectedDiscount = applicableDiscounts[_i];
+          var _originProduct$_produ, _product$discount_lis10;
+          // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
+          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
           usedDiscounts.set(_selectedDiscount.id, true);
 
@@ -425,6 +436,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 优先从 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

@@ -71,7 +71,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     }
     if (productList.every((item) => {
       var _a;
-      return item.booking_id && (((_a = item.discount_list) == null ? void 0 : _a.length) || item.price == 0);
+      const product = this.hooks.getProduct(item);
+      return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || (newDiscountList[0].tag === "good_pass" ? product.price == 0 : product.total == 0));
     })) {
       return {
         isAvailable: false,
@@ -206,14 +207,16 @@ 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]);
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (Number(product.price) === 0 && discount.tag === "good_pass" || Number(product.total) === 0 && discount.tag !== "good_pass" || !product.price)
+        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+          return false;
+        if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== "good_pass")
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
@@ -226,7 +229,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscount = applicableDiscounts[0];
+      const selectedDiscountCard = applicableDiscounts.find((n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass");
+      const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       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) && ((_f = product.discount_list) == null ? void 0 : _f.some((item) => {
         var _a2;
@@ -290,10 +294,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }));
       }
       for (let i2 = 0; i2 < splitCount; i2++) {
-        const selectedDiscount2 = applicableDiscounts[i2];
+        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.47",
+  "version": "2.0.49",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",