@pisell/pisellos 0.0.134 → 0.0.136

package/dist/modules/Cart/utils/cartProduct.js

@@ -206,7 +206,7 @@ export var getProductOriginTotalPrice = function getProductOriginTotalPrice(para
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 
 /**

package/dist/modules/Discount/index.js

@@ -206,7 +206,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
-          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0);
+          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0).mul((product === null || product === void 0 ? void 0 : product.num) || 1);
           return new Decimal(total).plus(price).toNumber();
         }, 0);
       }

package/dist/modules/Discount/types.d.ts

@@ -27,6 +27,7 @@ interface ApplicableProductDetails {
     resource_id: number;
     title: string;
     original_amount: string;
+    num: number;
 }
 export interface Discount {
     id: number;

package/dist/modules/Rules/index.js

@@ -242,7 +242,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           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) {
-            return discount.id && discount.type === 'good_pass';
+            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.type);
           }));
 
           // 判断优惠券是否适用于该商品
@@ -261,7 +261,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: discount.format_title,
                 original_amount: product.origin_total,
                 pre_value: discount.par_value
-              }
+              },
+              num: product.num || 1
             });
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
@@ -273,7 +274,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         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) {
-          return discount.id && discount.type === 'good_pass';
+          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.type);
         })) {
           processedProductsMap.set(product._id, originProduct);
           return;
@@ -358,7 +359,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             original_amount: product.price,
             product_id: selectedDiscount.product_id,
             percent: selectedDiscount.par_value
-          }
+          },
+          num: product.num || 1
         };
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
@@ -388,7 +390,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new Decimal(targetProductPrice).toNumber(),
-            total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0)).toNumber(),
+            total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
             origin_total: product.origin_total || product.total
           }));
         }

package/dist/modules/Rules/types.d.ts

@@ -37,6 +37,7 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/dist/solution/BookingByStep/index.js

@@ -568,7 +568,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id, _ref4$quantity = _ref4.quantity, quantity = _ref4$quantity === void 0 ? 1 : _ref4$quantity, rowKey = _ref4.rowKey; // 检查购物车里是否已经存在 rowKey相同的数据，如果是则更新数量
               cartItems = this.store.cart.getItems();
               if (!rowKey) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
               targetCartItem = cartItems.find(function (n) {
@@ -576,7 +576,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey;
               });
               if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin))) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
               this.store.cart.updateItem({
@@ -584,8 +584,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 product: _objectSpread({}, targetCartItem._productOrigin),
                 quantity: (targetCartItem.num || 1) + quantity
               });
+              // 这里需要单独触发一个，购物车商品数量发生改变的 hook
+              this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateCartItemNums"), {});
               return _context8.abrupt("return");
-            case 8:
+            case 9:
               product = _objectSpread(_objectSpread({}, origin), {}, {
                 product_variant_id: product_variant_id,
                 rowKey: rowKey
@@ -600,7 +602,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 addCartItem.account = activeAccount;
               }
               this.store.cart.addItem(addCartItem);
-            case 12:
+            case 13:
             case "end":
               return _context8.stop();
           }
@@ -2630,6 +2632,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             options: targetCartItem._optionsOrigin,
             quantity: (targetCartItem.num || 1) + quantity
           });
+          // 这里需要单独触发一个，购物车商品数量发生改变的 hook
+          this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateCartItemNums"), {});
           return;
         }
       }

package/dist/solution/ShopDiscount/index.js

@@ -434,7 +434,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList.forEach(function (item) {
         if (item.booking_id) {
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id && discount.type === 'good_pass') {
+            if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
               var _discount$discount, _discount$discount2, _discount$discount3;
               editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                 isEditMode: true,

package/lib/modules/Cart/utils/cartProduct.js

@@ -194,7 +194,7 @@ var getProductOriginTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var formatOptions = (options) => {
   if (!(options == null ? void 0 : options.length))

package/lib/modules/Discount/index.js

@@ -122,7 +122,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0);
+        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0).mul((product == null ? void 0 : product.num) || 1);
         return new import_decimal.default(total).plus(price).toNumber();
       }, 0);
     }

package/lib/modules/Discount/types.d.ts

@@ -27,6 +27,7 @@ interface ApplicableProductDetails {
     resource_id: number;
     title: string;
     original_amount: string;
+    num: number;
 }
 export interface Discount {
     id: number;

package/lib/modules/Rules/index.js

@@ -164,7 +164,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && discount2.type === "good_pass")));
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.type))));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
@@ -176,7 +176,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value
-            }
+            },
+            num: product.num || 1
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
@@ -185,7 +186,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       var _a, _b, _c, _d, _e;
       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 && discount.type === "good_pass"))) {
+      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.type)))) {
         processedProductsMap.set(product._id, originProduct);
         return;
       }
@@ -259,7 +260,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           original_amount: product.price,
           product_id: selectedDiscount.product_id,
           percent: selectedDiscount.par_value
-        }
+        },
+        num: product.num || 1
       };
       appliedProducts.push(discountDetail);
       appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
@@ -291,7 +293,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new import_decimal.default(targetProductPrice).toNumber(),
-            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0)).toNumber(),
+            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice))).toNumber(),
             origin_total: product.origin_total || product.total
           })
         );

package/lib/modules/Rules/types.d.ts

@@ -37,6 +37,7 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/solution/BookingByStep/index.js

@@ -359,6 +359,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           },
           quantity: (targetCartItem.num || 1) + quantity
         });
+        this.core.effects.emit(`${this.store.cart.name}:onUpdateCartItemNums`, {});
         return;
       }
     }
@@ -1829,6 +1830,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           options: targetCartItem._optionsOrigin,
           quantity: (targetCartItem.num || 1) + quantity
         });
+        this.core.effects.emit(`${this.store.cart.name}:onUpdateCartItemNums`, {});
         return;
       }
     }

package/lib/solution/ShopDiscount/index.js

@@ -271,7 +271,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         (item.discount_list || []).forEach((discount) => {
           var _a2, _b, _c;
-          if (discount.id && discount.type === "good_pass") {
+          if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             editModeDiscountList.push({
               ...discount,
               isEditMode: true,

package/package.json

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