@pisell/pisellos 0.0.179 → 0.0.181

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,
@@ -276,14 +277,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);
           }));
 
@@ -316,9 +317,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]);
@@ -328,7 +329,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;
@@ -347,12 +351,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = 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;
         })) {

package/dist/solution/BookingByStep/index.js

@@ -1295,7 +1295,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   var originResource = allOriginResources.find(function (n) {
                     return n.id === targetRes.id;
                   });
-                  var canUse = checkResourceCanUseByCapacity(currentResourcesCapacityMap[m.id], currentCapacity, originResource === null || originResource === void 0 ? void 0 : originResource.capacity);
+                  var canUse = checkResourceCanUseByCapacity(currentResourcesCapacityMap[m.id] || 0, currentCapacity, originResource === null || originResource === void 0 ? void 0 : originResource.capacity);
                   if (canUse) currentResourcesCapacityMap[m.id] += currentCapacity;
                   return !canUse;
                 }
@@ -1425,7 +1425,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) {

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,
@@ -213,7 +214,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         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")

package/lib/solution/BookingByStep/index.js

@@ -719,7 +719,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                   (n) => n.id === targetRes.id
                 );
                 const canUse = (0, import_capacity.checkResourceCanUseByCapacity)(
-                  currentResourcesCapacityMap[m.id],
+                  currentResourcesCapacityMap[m.id] || 0,
                   currentCapacity,
                   originResource == null ? void 0 : originResource.capacity
                 );
@@ -825,7 +825,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));

package/package.json

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