@pisell/pisellos 2.2.23 → 2.2.24

package/dist/solution/ShopDiscount/utils.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -45,7 +51,8 @@ export var getDiscountAmount = function getDiscountAmount(discount, total, price
 
   // 固定金额 小于0时返回0
   if (isFixedAmount) {
-    return Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+    var _discount$amount;
+    return Math.max(new Decimal(price).minus(new Decimal(((_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.par_value) || 0)).toNumber(), 0);
   }
 
   // 百分比：根据折扣卡金额计算
@@ -462,4 +469,131 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
       return true;
     }
   });
+};
+/**
+ * 判断是否是订单级别的固定金额折扣卡
+ * @param discount 折扣
+ * @returns 是否是订单级别的固定金额折扣卡
+ */
+export var isOrderLevelFixedAmountDiscount = function isOrderLevelFixedAmountDiscount(discount) {
+  var _discount$metadata3, _discount$metadata4;
+  return discount.tag === 'product_discount_card' && (discount === null || discount === void 0 || (_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.discount_card_type) === 'fixed_amount' && (discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.discount_calculation_mode) === 'order_level';
+};
+
+/**
+ * 计算订单级别固定金额折扣卡的分摊结果
+ * @param discount 折扣卡
+ * @param applicableProducts 适用商品列表 { productId, amount, quantity, parentQuantity }
+ * @returns 分摊结果 Map<productId, { discountAmount, difference }>
+ * 注意：
+ * - discountAmount 是单价折扣金额（不是总折扣金额）
+ * - difference（总差值）优先直接加到数量为1的单商品折扣上，如果没有则存储在metadata中
+ */
+export var calculateOrderLevelDiscountAllocation = function calculateOrderLevelDiscountAllocation(discount, applicableProducts) {
+  var result = new Map();
+  if (applicableProducts.length === 0) {
+    return result;
+  }
+
+  // 计算适用商品的总金额（数量 × 单价）
+  var totalAmount = applicableProducts.reduce(function (acc, product) {
+    return new Decimal(acc).plus(new Decimal(product.amount).mul(product.quantity)).toNumber();
+  }, 0);
+  if (totalAmount <= 0) {
+    return result;
+  }
+
+  // 固定减免金额
+  var fixedAmount = new Decimal(discount.par_value || 0).toNumber();
+
+  // 如果固定金额 >= 商品总金额，折扣最高为商品金额（免费）
+  var actualDiscountTotal = Math.min(fixedAmount, totalAmount);
+
+  // 计算每个商品的单价折扣金额
+  var allocatedTotal = new Decimal(0);
+  applicableProducts.forEach(function (product) {
+    // 🔥 分摊公式改为：(单价 / 适用商品总金额) × 固定金额
+    // 这样只有一次取整，避免精度损失
+    var rawDiscountPerItem = new Decimal(product.amount).div(totalAmount).mul(actualDiscountTotal);
+
+    // 保留两位小数，向下取整（单价折扣）
+    var discountAmountPerItem = rawDiscountPerItem.toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+    result.set(product.productId, {
+      discountAmount: discountAmountPerItem,
+      // 单价折扣金额
+      difference: 0 // 默认差值为0
+    });
+
+    // 累加实际分配的总折扣金额（单价折扣 × 数量）
+    allocatedTotal = allocatedTotal.plus(new Decimal(discountAmountPerItem).mul(product.quantity));
+  });
+
+  // 🔥 计算总差值
+  // 总差值 = 固定金额 - 所有商品的 (单价折扣 × 数量) 之和
+  var totalDifference = new Decimal(actualDiscountTotal).minus(allocatedTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+  if (totalDifference > 0) {
+    // 🔥 判断商品是否是真正的"数量为1"
+    // 主商品：quantity === 1
+    // 子商品：quantity === 1 且 parentQuantity === 1
+    var isSingleQuantity = function isSingleQuantity(product) {
+      if (product.parentQuantity !== undefined) {
+        // 子商品：需要同时满足自身数量为1且主商品数量为1
+        return product.quantity === 1 && product.parentQuantity === 1;
+      }
+      // 主商品：只需要自身数量为1
+      return product.quantity === 1;
+    };
+
+    // 🔥 筛选出数量为1的商品
+    var singleQuantityProducts = applicableProducts.filter(isSingleQuantity);
+    if (singleQuantityProducts.length > 0) {
+      // 🔥 优先级1：找到有足够剩余空间且金额最大的商品
+      // 剩余空间 = 商品价格 - 当前折扣金额 >= 差值
+      var productsWithEnoughSpace = singleQuantityProducts.filter(function (product) {
+        var allocation = result.get(product.productId);
+        if (!allocation) return false;
+        var remainingSpace = new Decimal(product.amount).minus(allocation.discountAmount).toNumber();
+        return remainingSpace >= totalDifference;
+      });
+      if (productsWithEnoughSpace.length > 0) {
+        // 按金额降序排序，选择金额最大的
+        productsWithEnoughSpace.sort(function (a, b) {
+          return b.amount - a.amount;
+        });
+        var targetProduct = productsWithEnoughSpace[0];
+        var targetAllocation = result.get(targetProduct.productId);
+        if (targetAllocation) {
+          // 差值直接加到折扣金额上
+          result.set(targetProduct.productId, {
+            discountAmount: new Decimal(targetAllocation.discountAmount).plus(totalDifference).toNumber(),
+            difference: 0 // 不需要存储差值
+          });
+        }
+      } else {
+        // 🔥 优先级2：所有数量为1的商品都没有足够剩余空间
+        // 选择金额最大的商品，差值存储在metadata中
+        singleQuantityProducts.sort(function (a, b) {
+          return b.amount - a.amount;
+        });
+        var _targetProduct = singleQuantityProducts[0];
+        var _targetAllocation = result.get(_targetProduct.productId);
+        if (_targetAllocation) {
+          result.set(_targetProduct.productId, _objectSpread(_objectSpread({}, _targetAllocation), {}, {
+            difference: totalDifference
+          }));
+        }
+      }
+    } else {
+      // 🔥 优先级3：没有数量为1的商品，走原有逻辑
+      // 差值存储在最后一个商品的metadata中
+      var lastProduct = applicableProducts[applicableProducts.length - 1];
+      var lastProductAllocation = result.get(lastProduct.productId);
+      if (lastProductAllocation) {
+        result.set(lastProduct.productId, _objectSpread(_objectSpread({}, lastProductAllocation), {}, {
+          difference: totalDifference
+        }));
+      }
+    }
+  }
+  return result;
 };

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

@@ -139,7 +139,7 @@ var formatProductToCartItem = (params) => {
   return cartItem;
 };
 var formatProductToCartItemOrigin = (params) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const {
     cartItem,
     product,
@@ -149,17 +149,27 @@ var formatProductToCartItemOrigin = (params) => {
     quantity = 1
   } = params;
   let origin = cartItem._origin;
+  const product_discount_difference = (((_a = origin.product) == null ? void 0 : _a.discount_list) || []).filter((item) => {
+    var _a2;
+    return !((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+  }).reduce((pre, cur) => {
+    var _a2;
+    return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+  }, 0);
   if (product) {
     origin.product = {
       ...origin.product || {},
       num: quantity,
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
-      product_bundle: ((_a = origin.product) == null ? void 0 : _a.product_bundle) || [],
-      product_option_item: ((_b = origin.product) == null ? void 0 : _b.product_option_item) || []
+      product_bundle: ((_b = origin.product) == null ? void 0 : _b.product_bundle) || [],
+      product_option_item: ((_c = origin.product) == null ? void 0 : _c.product_option_item) || [],
+      metadata: {
+        product_discount_difference
+      }
     };
-    origin.sub_type = (_c = product == null ? void 0 : product.duration) == null ? void 0 : _c.type;
-    origin.duration = (_d = product == null ? void 0 : product.duration) == null ? void 0 : _d.value;
+    origin.sub_type = (_d = product == null ? void 0 : product.duration) == null ? void 0 : _d.type;
+    origin.duration = (_e = product == null ? void 0 : product.duration) == null ? void 0 : _e.value;
     if (bundle == null ? void 0 : bundle.length) {
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
@@ -176,6 +186,7 @@ var getProductTotalPrice = (params) => {
     discounts.forEach((currentValue) => {
       var _a;
       price = (0, import_utils2.getDiscountAmount)({
+        amount: currentValue.amount,
         tag: currentValue.type,
         par_value: currentValue.discount.percent,
         metadata: {
@@ -272,6 +283,10 @@ var formatBundleToOrigin = (bundle) => {
       var _a;
       return (d == null ? void 0 : d[key]) || ((_a = d == null ? void 0 : d.originBundleItem) == null ? void 0 : _a[key]);
     };
+    const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
+      var _a;
+      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+    }, 0);
     return {
       bundle_group_id: getBundleValueByKey("group_id"),
       bundle_id: d.id,
@@ -284,7 +299,8 @@ var formatBundleToOrigin = (bundle) => {
       discount_list: d.discount_list,
       "bundle_selling_price": d == null ? void 0 : d.price,
       metadata: {
-        custom_product_bundle_map_id: d._id
+        custom_product_bundle_map_id: d._id,
+        product_discount_difference
       }
     };
   });

package/lib/modules/Customer/index.js

@@ -102,7 +102,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       skip,
       num,
       sort_by: import_constants.SORT_BY,
-      with: ["latestWalletDetail.wallet", "contactsInfo"],
+      with: ["latestWalletDetail.wallet", "contactsInfo", "formRecord"],
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },

package/lib/modules/Discount/index.js

@@ -109,7 +109,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       tags: ["good_pass", "product_discount_card"],
       available: 1,
       relation_product: 1,
-      with: ["extensionData", "holder.detail"],
+      with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1
     });
@@ -176,9 +176,9 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        var _a;
+        var _a, _b;
         const price = new import_decimal.default(((_a = product == null ? void 0 : product.discount) == null ? void 0 : _a.fixed_amount) || 0).mul((product == null ? void 0 : product._num) || 1);
-        return new import_decimal.default(total).plus(price).toNumber();
+        return new import_decimal.default(total).plus(price).add(((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber();
       }, 0);
     }
   }

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

@@ -33,6 +33,9 @@ interface ApplicableProductDetails {
     title: string;
     original_amount: string;
     num: number;
+    metadata?: {
+        product_discount_difference?: number;
+    };
     discount?: {
         fixed_amount?: number;
         product_id?: number;
@@ -81,6 +84,10 @@ export interface Discount {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
+        discount_calculation_mode: 'item_level' | 'order_level';
+        holder: {
+            type: "customer" | "custom";
+        };
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -89,7 +96,9 @@ export interface Discount {
     isEditMode?: boolean;
     isScan?: boolean;
     discount?: {
+        discount_product_id: number;
         resource_id: number;
+        discount_calculation_mode: 'item_level' | 'order_level';
     };
     isManualSelect?: boolean;
     isDisabled?: boolean;

package/lib/modules/Order/utils.js

@@ -60,7 +60,7 @@ 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 || []];
+    discountList = [...discountList, ...(item == null ? void 0 : item.discount_list) || []];
     item.discount_list = void 0;
   });
   return discountList;