@pisell/pisellos 2.1.46 → 2.1.47

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

@@ -174,6 +174,24 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
     discounts = params.discounts;
   // const num = params.num || 1;
   var price = Number(product.price);
+
+  // 如果商品有折扣，则计算折扣
+  if (discounts !== null && discounts !== void 0 && discounts.length) {
+    discounts.forEach(function (currentValue) {
+      var _currentValue$discoun;
+      // 不是商品券则代表折扣卡，计算打折后的价格
+      // 一个商品折扣卡只能存在于一张
+      // if (currentValue.type !== 'good_pass') {
+      price = getDiscountAmount({
+        tag: currentValue.type,
+        par_value: currentValue.discount.percent,
+        metadata: {
+          discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+        }
+      }, price, price);
+      // }
+    });
+  }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
     price = bundle.reduce(function (accumulator, currentValue) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
@@ -186,25 +204,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-
-  // 如果商品有折扣，则计算折扣
-  if (discounts !== null && discounts !== void 0 && discounts.length) {
-    discounts.forEach(function (currentValue) {
-      // 不是商品券则代表折扣卡，计算打折后的价格
-      // 一个商品折扣卡只能存在于一张
-      if (currentValue.type !== 'good_pass') {
-        var _currentValue$discoun;
-        price = getDiscountAmount({
-          tag: currentValue.type,
-          par_value: currentValue.discount.percent,
-          metadata: {
-            discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
-          }
-        }, price, price);
-      }
-    });
-  }
-  return price;
+  return Math.max(0, price);
 };
 
 /**
@@ -284,24 +284,39 @@ export var formatBundle = function formatBundle(bundle) {
       price: item === null || item === void 0 ? void 0 : item.price,
       total: item === null || item === void 0 ? void 0 : item.price,
       price_type: item === null || item === void 0 ? void 0 : item.price_type,
+      original_price: item === null || item === void 0 ? void 0 : item.original_price,
+      original_total: item === null || item === void 0 ? void 0 : item.original_total,
+      price_type_ext: item === null || item === void 0 ? void 0 : item.price_type_ext,
       bundle_sum_price: item === null || item === void 0 ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item === null || item === void 0 ? void 0 : item.bundle_sum_type,
-      options: formatOptions(item === null || item === void 0 ? void 0 : item.option)
+      options: formatOptions(item === null || item === void 0 ? void 0 : item.option),
+      _bundle_product_id: item._bundle_product_id,
+      discount_list: item.discount_list,
+      originBundleItem: item.originBundleItem || item
     };
   });
 };
 export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
   if (!(bundle !== null && bundle !== void 0 && bundle.length)) return [];
   return bundle.map(function (d) {
+    var getBundleValueByKey = function getBundleValueByKey(key) {
+      var _d$originBundleItem;
+      return (d === null || d === void 0 ? void 0 : d[key]) || (d === null || d === void 0 || (_d$originBundleItem = d.originBundleItem) === null || _d$originBundleItem === void 0 ? void 0 : _d$originBundleItem[key]);
+    };
     return {
-      bundle_group_id: d.group_id,
+      bundle_group_id: getBundleValueByKey('group_id'),
       bundle_id: d.id,
-      bundle_product_id: (d === null || d === void 0 ? void 0 : d._bundle_product_id) || (d === null || d === void 0 ? 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 || d === void 0 ? void 0 : d.price,
+      metadata: {
+        custom_product_bundle_map_id: d._id
+      }
     };
   });
 };

package/dist/modules/Discount/index.js

@@ -299,7 +299,8 @@ 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).mul((product === null || product === void 0 ? void 0 : product.num) || 1);
+          var _product$discount;
+          var price = new Decimal((product === null || product === void 0 || (_product$discount = product.discount) === null || _product$discount === void 0 ? void 0 : _product$discount.fixed_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

@@ -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;
@@ -29,12 +34,14 @@ interface ApplicableProductDetails {
     original_amount: string;
     num: number;
     discount?: {
+        fixed_amount?: number;
         product_id?: number;
         original_amount?: string;
         percent?: string;
         resource_id?: number;
         title?: string;
     };
+    _num: number;
 }
 interface UsageCreditsValue {
     total_credits: number;
@@ -72,6 +79,7 @@ export interface Discount {
     format_title: Formattitle;
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
+        custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
     };
     product: Product;
@@ -102,6 +110,7 @@ export interface Discount {
     custom_schedule_snapshot?: {
         data: any[];
     };
+    num?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/modules/Order/index.js

@@ -24,7 +24,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { generateDuration, mergeRelationForms } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
@@ -145,6 +145,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             item._origin.duration = duration;
             item._origin.sub_type = durationType;
           }
+          var discountList = getAllDiscountList(item);
+          item._origin.product.discount_list = discountList;
+
           // 购物车是否为普通商品
           if (isNormalProduct(item._origin)) {
             var _order$relation_forms;

package/dist/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/dist/modules/Order/utils.js

@@ -51,4 +51,13 @@ export var mergeRelationForms = function mergeRelationForms(relationForms) {
   }, {})).filter(function (item) {
     return item.form_record_ids.length > 0;
   }); // 过滤掉没有有效记录的表单
+};
+export var getAllDiscountList = function getAllDiscountList(cartItem) {
+  var _cartItem$_origin, _cartItem$_origin2;
+  var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
+  ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
+    discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray(item.discount_list));
+    item.discount_list = undefined;
+  });
+  return discountList;
 };

package/dist/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>;
 }