@pisell/pisellos 0.0.154 → 0.0.156

package/dist/modules/Rules/index.js

@@ -107,6 +107,18 @@ 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);
+      })) {
+        return {
+          isAvailable: false,
+          discountList: oldDiscountList,
+          productList: productList
+        };
+      }
+
       // 合并新旧折扣列表，并计算折扣结果
       var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({

package/dist/solution/ShopDiscount/index.js

@@ -501,10 +501,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         var isAllProductUsed = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
           return allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id);
         });
-        var isAllProductFree = (_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.every(function (n) {
+        var isAllProductFree = (_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.every(function (id) {
           var _this3$hooks2;
           var targetProduct = productList.find(function (n) {
-            return n.id === n;
+            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;

package/lib/modules/Rules/index.js

@@ -69,6 +69,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
+    if (productList.every((item) => {
+      var _a;
+      return item.booking_id && ((_a = item.discount_list) == null ? void 0 : _a.length);
+    })) {
+      return {
+        isAvailable: false,
+        discountList: oldDiscountList,
+        productList
+      };
+    }
     const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
       ...oldDiscountList,
       ...newDiscountList

package/lib/solution/ShopDiscount/index.js

@@ -345,9 +345,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const isAllProductUsed = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
         return allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id);
       });
-      const isAllProductFree = (_b = item.applicableProductIds) == null ? void 0 : _b.every((n) => {
+      const isAllProductFree = (_b = item.applicableProductIds) == null ? void 0 : _b.every((id) => {
         var _a3;
-        const targetProduct = productList.find((n2) => n2.id === n2);
+        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;
       });

package/package.json

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