@pisell/pisellos 0.0.484 → 0.0.486

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

@@ -15,6 +15,20 @@ import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 import { calcDiscountListDifference } from "../../Summary/utils";
 
+/** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
+var toDiscountPayload = function toDiscountPayload(discountItem) {
+  var _discountItem$discoun, _discountItem$discoun2;
+  return {
+    amount: discountItem.amount,
+    tag: discountItem.type,
+    par_value: (_discountItem$discoun = discountItem.discount) === null || _discountItem$discoun === void 0 ? void 0 : _discountItem$discoun.percent,
+    config: discountItem.config,
+    metadata: {
+      discount_card_type: discountItem === null || discountItem === void 0 || (_discountItem$discoun2 = discountItem.discount) === null || _discountItem$discoun2 === void 0 ? void 0 : _discountItem$discoun2.discount_card_type
+    }
+  };
+};
+
 /**
  * @title 处理组合商品
  * @description 组合商品需要直接修改 product 里的价格和 is_charge_tax
@@ -195,6 +209,7 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
  * @returns 商品总价
  */
 export var getProductTotalPrice = function getProductTotalPrice(params) {
+  var _options$map;
   var product = params.product,
     bundle = params.bundle,
     options = params.options,
@@ -202,23 +217,29 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   // const num = params.num || 1;
   var price = Number(product.price);
 
+  // option 行：unit 折后价在循环中与主商品使用同一套 getDiscountAmount（含 deductOptionPrice）
+  var optionRows = (_options$map = options === null || options === void 0 ? void 0 : options.map(function (currentValue) {
+    var _ref, _currentValue$price, _ref2, _currentValue$num;
+    return {
+      unit: Number((_ref = (_currentValue$price = currentValue.price) !== null && _currentValue$price !== void 0 ? _currentValue$price : currentValue.add_price) !== null && _ref !== void 0 ? _ref : 0),
+      num: Number((_ref2 = (_currentValue$num = currentValue.num) !== null && _currentValue$num !== void 0 ? _currentValue$num : currentValue.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1)
+    };
+  })) !== null && _options$map !== void 0 ? _options$map : [];
+
   // 如果商品有折扣，则计算折扣
   if (discounts !== null && discounts !== void 0 && discounts.length) {
     discounts.forEach(function (currentValue) {
-      var _currentValue$discoun;
-      // 不是商品券则代表折扣卡，计算打折后的价格
-      // 一个商品折扣卡只能存在于一张
-      // if (currentValue.type !== 'good_pass') {
-      price = getDiscountAmount({
-        amount: currentValue.amount,
-        tag: currentValue.type,
-        par_value: currentValue.discount.percent,
-        config: currentValue.config,
-        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
+      var _currentValue$config;
+      var payload = toDiscountPayload(currentValue);
+      price = getDiscountAmount(payload, price, price);
+      if (currentValue !== null && currentValue !== void 0 && (_currentValue$config = currentValue.config) !== null && _currentValue$config !== void 0 && _currentValue$config.deductOptionPrice && optionRows.length) {
+        for (var i = 0; i < optionRows.length; i++) {
+          var row = optionRows[i];
+          optionRows[i] = _objectSpread(_objectSpread({}, row), {}, {
+            unit: getDiscountAmount(payload, row.unit, row.unit)
+          });
         }
-      }, price, price);
-      // }
+      }
     });
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -227,10 +248,10 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
     }, price);
   }
 
-  // 单规格
-  if (options !== null && options !== void 0 && options.length) {
-    price = options.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+  // 单规格 / 加购 option
+  if (optionRows.length) {
+    price = optionRows.reduce(function (accumulator, row) {
+      return accumulator + row.unit * row.num;
     }, price);
   }
   return Math.max(0, price);
@@ -389,11 +410,11 @@ export var getProductDeposit = function getProductDeposit(params) {
   // 判定商品是否有定金规则
   if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
     var total = new Decimal(0);
-    var _ref = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
-      deposit_fixed = _ref.deposit_fixed,
-      deposit_percentage = _ref.deposit_percentage,
-      deposit_policy_data = _ref.deposit_policy_data,
-      self_deposit_policy_ids = _ref.self_deposit_policy_ids;
+    var _ref3 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref3.deposit_fixed,
+      deposit_percentage = _ref3.deposit_percentage,
+      deposit_policy_data = _ref3.deposit_policy_data,
+      self_deposit_policy_ids = _ref3.self_deposit_policy_ids;
     // 所有协议数据
     var allProtocols = deposit_policy_data || [];
     // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
@@ -487,9 +508,9 @@ export var handleProductDeposit = function handleProductDeposit(params) {
       depositTotal: new Decimal(0)
     };
   }
-  var _ref2 = depositData || {},
-    deposit_fixed = _ref2.deposit_fixed,
-    deposit_percentage = _ref2.deposit_percentage;
+  var _ref4 = depositData || {},
+    deposit_fixed = _ref4.deposit_fixed,
+    deposit_percentage = _ref4.deposit_percentage;
   if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
     var depositFixed = Decimal(deposit_fixed || 0);
     var depositPercent = Decimal(deposit_percentage || 0);

package/dist/modules/Rules/index.js

@@ -150,7 +150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       if (productList.every(function (item) {
         var _product$discount_lis;
         var product = _this2.hooks.getProduct(item);
-        return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || (newDiscountList[0].tag === 'good_pass' ? product.price == 0 : product.total == 0));
+        return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || product.total == 0);
       })) {
         return {
           isAvailable: false,

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

@@ -46,6 +46,18 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
 var import_utils2 = require("../../../solution/ShopDiscount/utils");
 var import_utils3 = require("../../Summary/utils");
+var toDiscountPayload = (discountItem) => {
+  var _a, _b;
+  return {
+    amount: discountItem.amount,
+    tag: discountItem.type,
+    par_value: (_a = discountItem.discount) == null ? void 0 : _a.percent,
+    config: discountItem.config,
+    metadata: {
+      discount_card_type: (_b = discountItem == null ? void 0 : discountItem.discount) == null ? void 0 : _b.discount_card_type
+    }
+  };
+};
 var handleVariantProduct = (product) => {
   var _a;
   if (product == null ? void 0 : product.product_variant_id) {
@@ -192,18 +204,24 @@ var formatProductToCartItemOrigin = (params) => {
 var getProductTotalPrice = (params) => {
   const { product, bundle, options, discounts } = params;
   let price = Number(product.price);
+  const optionRows = (options == null ? void 0 : options.map((currentValue) => ({
+    unit: Number(currentValue.price ?? currentValue.add_price ?? 0),
+    num: Number(currentValue.num ?? currentValue.quantity ?? 1)
+  }))) ?? [];
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
       var _a;
-      price = (0, import_utils2.getDiscountAmount)({
-        amount: currentValue.amount,
-        tag: currentValue.type,
-        par_value: currentValue.discount.percent,
-        config: currentValue.config,
-        metadata: {
-          discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
+      const payload = toDiscountPayload(currentValue);
+      price = (0, import_utils2.getDiscountAmount)(payload, price, price);
+      if (((_a = currentValue == null ? void 0 : currentValue.config) == null ? void 0 : _a.deductOptionPrice) && optionRows.length) {
+        for (let i = 0; i < optionRows.length; i++) {
+          const row = optionRows[i];
+          optionRows[i] = {
+            ...row,
+            unit: (0, import_utils2.getDiscountAmount)(payload, row.unit, row.unit)
+          };
         }
-      }, price, price);
+      }
     });
   }
   if (bundle == null ? void 0 : bundle.length) {
@@ -211,10 +229,11 @@ var getProductTotalPrice = (params) => {
       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 (optionRows.length) {
+    price = optionRows.reduce(
+      (accumulator, row) => accumulator + row.unit * row.num,
+      price
+    );
   }
   return Math.max(0, price);
 };

package/lib/modules/Rules/index.js

@@ -97,7 +97,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     if (productList.every((item) => {
       var _a;
       const product = this.hooks.getProduct(item);
-      return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || (newDiscountList[0].tag === "good_pass" ? product.price == 0 : product.total == 0));
+      return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || product.total == 0);
     })) {
       return {
         isAvailable: false,

package/package.json

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