@pisell/pisellos 1.0.76 → 1.0.78

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

@@ -50,8 +50,9 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number;
+        original_price?: number | string;
         quantity?: number;
+        bundle?: any[];
     }) => Record<string, any>;
 }
 export {};

package/lib/solution/BookingByStep/index.js

@@ -2186,7 +2186,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     account
   }) {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     const currentCartItem = this.convertProductToCartItem({ product, date, account });
     cartItems.push(currentCartItem);
     if (cartItems.length === 0)

package/lib/solution/BookingTicket/index.js

@@ -122,12 +122,6 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  /**
-   * 初始化外设扫码结果监听
-   */
-  initPeripheralsListener() {
-    this.scan.initPeripheralsListener();
-  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表

package/lib/solution/ShopDiscount/index.js

@@ -314,7 +314,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a3, _b, _c;
+          var _a3, _b, _c, _d, _e;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
@@ -324,7 +324,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.num) || (product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -335,13 +335,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
+                savedAmount: discount.amount * (((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.num) || (product == null ? void 0 : product.num) || 1),
                 isAvailable: true,
-                id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
-                format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
+                id: ((_c = discount.discount) == null ? void 0 : _c.resource_id) || discount.id,
+                format_title: ((_d = discount.discount) == null ? void 0 : _d.title) || discount.format_title,
                 isDisabled: true,
                 isSelected: true,
-                product_id: ((_c = discount.discount) == null ? void 0 : _c.product_id) || discount.product_id
+                product_id: ((_e = discount.discount) == null ? void 0 : _e.product_id) || discount.product_id
               });
             }
           }
@@ -355,15 +355,17 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const isProductFree = (id) => {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
+      if (!targetProduct)
+        return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
       return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
     };
     const allUsedProductIds = newDiscountList.map((n) => {
       var _a2;
-      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+      return n.isSelected ? ((_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
         var _a3;
         return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
-      }) : [];
+      })) || n.product_id : [];
     }).flat();
     newDiscountList.forEach((item) => {
       var _a2;

package/lib/solution/ShopDiscount/utils.d.ts

@@ -10,3 +10,10 @@ export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount
+ * @returns
+ */
+export declare const getDiscountListAmount: (discount: Discount[]) => any;

package/lib/solution/ShopDiscount/utils.js

@@ -30,6 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getDiscountAmount: () => getDiscountAmount,
+  getDiscountListAmount: () => getDiscountListAmount,
+  getDiscountListAmountTotal: () => getDiscountListAmountTotal,
   uniqueById: () => uniqueById
 });
 module.exports = __toCommonJS(utils_exports);
@@ -41,16 +43,28 @@ var uniqueById = (arr, key = "id") => {
 var getDiscountAmount = (discount, total, price) => {
   var _a;
   if (discount.tag === "good_pass") {
-    return new import_decimal.default(total).minus(new import_decimal.default(price || 0)).toNumber();
+    return new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
   }
   const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
   if (isFixedAmount) {
-    return Math.max(new import_decimal.default(total).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+    return Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
   }
-  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(total)).toNumber();
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
+};
+var getDiscountListAmountTotal = (discount) => {
+  return discount.reduce((acc, cur) => {
+    return new import_decimal.default(acc).plus(new import_decimal.default(cur.num || 1).mul(new import_decimal.default(cur.amount || 0))).toNumber();
+  }, new import_decimal.default(0));
+};
+var getDiscountListAmount = (discount) => {
+  return discount.reduce((acc, cur) => {
+    return new import_decimal.default(acc).plus(new import_decimal.default(cur.amount || 0)).toNumber();
+  }, new import_decimal.default(0));
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDiscountAmount,
+  getDiscountListAmount,
+  getDiscountListAmountTotal,
   uniqueById
 });

package/package.json

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