@pisell/pisellos 1.0.76 → 1.0.78

package/dist/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/dist/solution/BookingByStep/index.js

@@ -3160,7 +3160,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var product = _ref13.product,
         date = _ref13.date,
         account = _ref13.account;
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (item) {
+        return !isNormalProduct(item._productOrigin);
+      });
 
       // 将 ProductData 转换为 CartItem 但不真正添加到购物车
       var currentCartItem = this.convertProductToCartItem({

package/dist/solution/ShopDiscount/index.js

@@ -495,12 +495,13 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
+                var _discount$metadata;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
@@ -508,7 +509,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),
+                  savedAmount: discount.amount * ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) || (product === null || product === void 0 ? void 0 : product.num) || 1),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -529,6 +530,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         var targetProduct = productList.find(function (n) {
           return n.id === id;
         });
+        if (!targetProduct) return false;
         var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
         // 如果 product.total 是小于等于0有可能是她已经用过商品券或者折扣卡导致的，或者本身就是负数价格，所以此时还需要判断 origin_total 是否小于等于0
         // 如果 product.vouchersApplicable是布尔值，并且是 false，也当做免费商品处理，此商品不可用优惠券或折扣卡
@@ -536,10 +538,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       };
       var allUsedProductIds = newDiscountList.map(function (n) {
         var _n$appliedProductDeta;
-        return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
+        return n.isSelected ? ((_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
           var _n$discount;
           return (_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.product_id;
-        }) : [];
+        })) || n.product_id : [];
       }).flat();
       newDiscountList.forEach(function (item) {
         var _item$applicableProdu;

package/dist/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/dist/solution/ShopDiscount/utils.js

@@ -20,7 +20,7 @@ export var getDiscountAmount = function getDiscountAmount(discount, total, price
   var _discount$metadata;
   // 商品券
   if (discount.tag === 'good_pass') {
-    return new Decimal(total).minus(new Decimal(price || 0)).toNumber();
+    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
   // 判断是否是固定金额
@@ -28,9 +28,25 @@ export var getDiscountAmount = function getDiscountAmount(discount, total, price
 
   // 固定金额 小于0时返回0
   if (isFixedAmount) {
-    return Math.max(new Decimal(total).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+    return Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
   }
 
   // 百分比：根据折扣卡金额计算
-  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(total)).toNumber();
+  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
+};
+export var getDiscountListAmountTotal = function getDiscountListAmountTotal(discount) {
+  return discount.reduce(function (acc, cur) {
+    return new Decimal(acc).plus(new Decimal(cur.num || 1).mul(new Decimal(cur.amount || 0))).toNumber();
+  }, new Decimal(0));
+};
+
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount 
+ * @returns 
+ */
+export var getDiscountListAmount = function getDiscountListAmount(discount) {
+  return discount.reduce(function (acc, cur) {
+    return new Decimal(acc).plus(new Decimal(cur.amount || 0)).toNumber();
+  }, new Decimal(0));
 };

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

@@ -172,16 +172,6 @@ var formatProductToCartItemOrigin = (params) => {
 var getProductTotalPrice = (params) => {
   const { product, bundle, options, discounts } = params;
   let price = Number(product.price);
-  if (bundle == null ? void 0 : bundle.length) {
-    price = bundle.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
-  if (options == null ? void 0 : options.length) {
-    price = options.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
       var _a;
@@ -196,6 +186,16 @@ var getProductTotalPrice = (params) => {
       }
     });
   }
+  if (bundle == null ? void 0 : bundle.length) {
+    price = bundle.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  if (options == null ? void 0 : options.length) {
+    price = options.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
   return price;
 };
 var getProductOriginTotalPrice = (params) => {
@@ -254,9 +254,15 @@ var formatBundle = (bundle) => {
       price: item == null ? void 0 : item.price,
       total: item == null ? void 0 : item.price,
       price_type: item == null ? void 0 : item.price_type,
+      original_price: item == null ? void 0 : item.original_price,
+      original_total: item == null ? void 0 : item.original_total,
+      price_type_ext: item == null ? void 0 : item.price_type_ext,
       bundle_sum_price: item == null ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item == null ? void 0 : item.bundle_sum_type,
-      options: formatOptions(item == null ? void 0 : item.option)
+      options: formatOptions(item == null ? void 0 : item.option),
+      _bundle_product_id: item._bundle_product_id,
+      discount_list: item.discount_list,
+      originBundleItem: item.originBundleItem || item
     };
   });
 };
@@ -264,15 +270,24 @@ var formatBundleToOrigin = (bundle) => {
   if (!(bundle == null ? void 0 : bundle.length))
     return [];
   return bundle.map((d) => {
+    const getBundleValueByKey = (key) => {
+      var _a;
+      return (d == null ? void 0 : d[key]) || ((_a = d == null ? void 0 : d.originBundleItem) == null ? void 0 : _a[key]);
+    };
     return {
-      bundle_group_id: d.group_id,
+      bundle_group_id: getBundleValueByKey("group_id"),
       bundle_id: d.id,
-      bundle_product_id: (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
-      bundle_variant_id: d.bundle_variant_id,
+      bundle_product_id: getBundleValueByKey("_bundle_product_id") || getBundleValueByKey("product_id"),
+      bundle_variant_id: getBundleValueByKey("bundle_variant_id"),
       num: d.num,
-      extension_id: d.extension_id,
-      extension_type: d.extension_type,
-      option: formatOptionsToOrigin(d.option)
+      extension_id: getBundleValueByKey("extension_id"),
+      extension_type: getBundleValueByKey("extension_type"),
+      option: formatOptionsToOrigin(getBundleValueByKey("option")),
+      discount_list: d.discount_list,
+      "bundle_selling_price": d == null ? void 0 : d.price,
+      metadata: {
+        custom_product_bundle_map_id: d._id
+      }
     };
   });
 };

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

@@ -15,11 +15,16 @@ interface Formattitle {
     'zh-CN'?: any;
     'zh-HK'?: any;
 }
+interface PackageSubItemUsageRules {
+    type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
+    rules: ("original_price" | "markup_price")[];
+}
 interface Limitedrelationproductdata {
     id: number;
     type: 'product_all' | 'products' | 'product_collection';
     product_ids: number[];
     product_collection_id: number[];
+    package_sub_item_usage_rules?: PackageSubItemUsageRules;
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -72,6 +77,7 @@ export interface Discount {
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
+        custom_product_bundle_map_id?: string;
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -98,6 +104,7 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
+    num?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/Order/index.js

@@ -115,6 +115,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           item._origin.duration = duration;
           item._origin.sub_type = durationType;
         }
+        const discountList = (0, import_utils.getAllDiscountList)(item);
+        item._origin.product.discount_list = discountList;
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

package/lib/modules/Order/utils.d.ts

@@ -20,3 +20,4 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export declare const getAllDiscountList: (cartItem: CartItem) => any;

package/lib/modules/Order/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   generateDuration: () => generateDuration,
+  getAllDiscountList: () => getAllDiscountList,
   mergeRelationForms: () => mergeRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
@@ -55,8 +56,18 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
+var getAllDiscountList = (cartItem) => {
+  var _a, _b, _c, _d;
+  let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
+  (((_d = (_c = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []).forEach((item) => {
+    discountList = [...discountList, ...item.discount_list];
+    item.discount_list = void 0;
+  });
+  return discountList;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateDuration,
+  getAllDiscountList,
   mergeRelationForms
 });

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -30,6 +30,13 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
+    /**
+     * 检查优惠是否符合 PackageSubItemUsageRules 配置
+     * @param discount 优惠券
+     * @param flatItem 扁平化后的商品项（可能是主商品或bundle子商品）
+     * @returns 是否可用
+     */
+    private checkPackageSubItemUsageRules;
     destroy(): Promise<void>;
     clear(): Promise<void>;
 }