@pisell/pisellos 2.1.63 → 2.1.65

package/lib/modules/Rules/index.js

@@ -151,6 +151,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         addModeDiscount.push(discount);
       }
     });
+    const editModeOrderLevelProductIds = /* @__PURE__ */ new Set();
+    editModeDiscount.forEach((discount) => {
+      var _a, _b;
+      if (((_a = discount.discount) == null ? void 0 : _a.discount_calculation_mode) === "order_level") {
+        editModeOrderLevelProductIds.add((_b = discount == null ? void 0 : discount.discount) == null ? void 0 : _b.discount_product_id);
+      }
+    });
+    if (editModeOrderLevelProductIds.size > 0) {
+      addModeDiscount.forEach((discount) => {
+        if (editModeOrderLevelProductIds.has(discount.product_id)) {
+          discount.isDisabled = true;
+        }
+      });
+    }
     const filteredDiscountList = addModeDiscount.filter((discount) => {
       return !discount.isManualSelect;
     });
@@ -198,45 +212,85 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return flattened;
     };
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
-      var _a, _b;
-      if (a.tag === "good_pass" && b.tag !== "good_pass")
-        return -1;
-      if (b.tag === "good_pass" && a.tag !== "good_pass")
-        return 1;
-      if (a.tag === "good_pass" && b.tag === "good_pass") {
-        return compareByExpireTime(a, b);
-      } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
-        const typeA = ((_a = a.metadata) == null ? void 0 : _a.discount_card_type) || "percent";
-        const typeB = ((_b = b.metadata) == null ? void 0 : _b.discount_card_type) || "percent";
+      const isHolderDiscount = (discount) => {
+        var _a, _b;
+        return ((_b = (_a = discount.metadata) == null ? void 0 : _a.holder) == null ? void 0 : _b.type) === "custom";
+      };
+      const isGoodPass = (discount) => discount.tag === "good_pass";
+      const isOrderLevelDiscount = (discount) => {
+        var _a;
+        return discount.tag === "product_discount_card" && ((_a = discount.metadata) == null ? void 0 : _a.discount_calculation_mode) === "order_level";
+      };
+      const isItemLevelDiscount = (discount) => {
+        var _a;
+        return discount.tag === "product_discount_card" && ((_a = discount.metadata) == null ? void 0 : _a.discount_calculation_mode) !== "order_level";
+      };
+      const getPriority = (discount) => {
+        const isHolder = isHolderDiscount(discount);
+        if (isHolder) {
+          if (isGoodPass(discount))
+            return 1;
+          if (isItemLevelDiscount(discount))
+            return 2;
+          if (isOrderLevelDiscount(discount))
+            return 3;
+        } else {
+          if (isGoodPass(discount))
+            return 4;
+          if (isItemLevelDiscount(discount))
+            return 5;
+          if (isOrderLevelDiscount(discount))
+            return 6;
+        }
+        return 7;
+      };
+      function compareByExpireTime(itemA, itemB) {
+        if (itemA.expire_time && itemB.expire_time) {
+          const timeA = new Date(itemA.expire_time).getTime();
+          const timeB = new Date(itemB.expire_time).getTime();
+          return timeA - timeB;
+        }
+        return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
+      }
+      function compareDiscountCardValue(itemA, itemB) {
+        var _a, _b;
+        const typeA = ((_a = itemA.metadata) == null ? void 0 : _a.discount_card_type) || "percent";
+        const typeB = ((_b = itemB.metadata) == null ? void 0 : _b.discount_card_type) || "percent";
         if (typeA === "fixed_amount" && typeB === "percent")
           return -1;
         if (typeA === "percent" && typeB === "fixed_amount")
           return 1;
         if (typeA === "fixed_amount" && typeB === "fixed_amount") {
-          if (a.par_value !== b.par_value) {
-            const valueA = new import_decimal.default(a.par_value || 0);
-            const valueB = new import_decimal.default(b.par_value || 0);
+          if (itemA.par_value !== itemB.par_value) {
+            const valueA = new import_decimal.default(itemA.par_value || 0);
+            const valueB = new import_decimal.default(itemB.par_value || 0);
             return valueB.minus(valueA).toNumber();
           }
         }
         if (typeA === "percent" && typeB === "percent") {
-          if (a.par_value !== b.par_value) {
-            const valueA = new import_decimal.default(100).minus(a.par_value || 0);
-            const valueB = new import_decimal.default(100).minus(b.par_value || 0);
+          if (itemA.par_value !== itemB.par_value) {
+            const valueA = new import_decimal.default(100).minus(itemA.par_value || 0);
+            const valueB = new import_decimal.default(100).minus(itemB.par_value || 0);
             return valueA.minus(valueB).toNumber();
           }
         }
+        return 0;
+      }
+      const priorityA = getPriority(a);
+      const priorityB = getPriority(b);
+      if (priorityA !== priorityB) {
+        return priorityA - priorityB;
+      }
+      if (isGoodPass(a) && isGoodPass(b)) {
         return compareByExpireTime(a, b);
       }
-      return compareByExpireTime(a, b);
-      function compareByExpireTime(itemA, itemB) {
-        if (itemA.expire_time && itemB.expire_time) {
-          const timeA = new Date(itemA.expire_time).getTime();
-          const timeB = new Date(itemB.expire_time).getTime();
-          return timeA - timeB;
-        }
-        return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
+      if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
+        const valueCompare = compareDiscountCardValue(a, b);
+        if (valueCompare !== 0)
+          return valueCompare;
+        return compareByExpireTime(a, b);
       }
+      return compareByExpireTime(a, b);
     });
     const flattenedList = flattenProductsWithBundle(productList);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
@@ -270,6 +324,128 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       discountApplicability.set(discount.id, []);
       discountApplicableProducts.set(discount.id, []);
     });
+    const orderLevelDiscountAllocations = /* @__PURE__ */ new Map();
+    const orderLevelDiscountApplicableItems = /* @__PURE__ */ new Map();
+    const itemApplicableDiscounts = /* @__PURE__ */ new Map();
+    const checkItemApplicableForDiscount = (flatItem, discount) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      let product;
+      if (flatItem.type === "main") {
+        product = flatItem.product;
+      } else {
+        product = {
+          _id: flatItem._id,
+          id: flatItem.id,
+          price: flatItem.price,
+          quantity: flatItem.quantity,
+          num: flatItem.num,
+          booking_id: flatItem.booking_id,
+          discount_list: flatItem.discount_list || [],
+          startDate: (_a = flatItem.parentProduct) == null ? void 0 : _a.startDate
+        };
+      }
+      const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.length) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.every((d) => d.id && ["good_pass", "discount_card", "product_discount_card"].includes(d.tag || d.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_e = (_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.length) && ((_g = (_f = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _f.discount_list) == null ? void 0 : _g.every((d) => d.id)));
+      if (!isAvailableProduct) {
+        return false;
+      }
+      if ((0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+        return false;
+      }
+      if (Number(product.price) <= 0 || !product.price) {
+        return false;
+      }
+      const limitedData = discount.limited_relation_product_data;
+      const timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
+      if (!timeLimit) {
+        return false;
+      }
+      let isLimitedProduct = false;
+      if (limitedData.type === "product_all") {
+        if (limitedData.filter === 1 && ((_h = limitedData.exclude_product_ids) == null ? void 0 : _h.includes(product.id))) {
+          isLimitedProduct = false;
+        } else {
+          isLimitedProduct = true;
+        }
+      } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
+        isLimitedProduct = true;
+      }
+      const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
+      return isLimitedProduct && isBundleAvailable;
+    };
+    const selectedOrderLevelDiscounts = sortedDiscountList.filter((discount) => {
+      return (0, import_utils.isOrderLevelFixedAmountDiscount)(discount) && discount.isSelected !== false;
+    });
+    selectedOrderLevelDiscounts.forEach((discount) => {
+      const applicableItemIds = /* @__PURE__ */ new Set();
+      sortedFlattenedList.forEach((flatItem) => {
+        if (checkItemApplicableForDiscount(flatItem, discount)) {
+          applicableItemIds.add(flatItem._id);
+          if (!itemApplicableDiscounts.has(flatItem._id)) {
+            itemApplicableDiscounts.set(flatItem._id, /* @__PURE__ */ new Set());
+          }
+          itemApplicableDiscounts.get(flatItem._id).add(discount.id);
+        }
+      });
+      orderLevelDiscountApplicableItems.set(discount.id, applicableItemIds);
+    });
+    const occupiedItems = /* @__PURE__ */ new Map();
+    selectedOrderLevelDiscounts.forEach((discount) => {
+      const limitedData = discount.limited_relation_product_data;
+      const isExclusiveDiscount = limitedData.type !== "product_all";
+      if (isExclusiveDiscount) {
+        const applicableItems = orderLevelDiscountApplicableItems.get(discount.id);
+        if (applicableItems) {
+          applicableItems.forEach((itemId) => {
+            if (!occupiedItems.has(itemId)) {
+              occupiedItems.set(itemId, discount.id);
+            }
+          });
+        }
+      }
+    });
+    console.log("occupiedItems", occupiedItems, "orderLevelDiscountApplicableItems", orderLevelDiscountApplicableItems);
+    sortedDiscountList.forEach((discount) => {
+      if (!(0, import_utils.isOrderLevelFixedAmountDiscount)(discount)) {
+        return;
+      }
+      const applicableProducts = [];
+      sortedFlattenedList.forEach((flatItem) => {
+        var _a, _b;
+        const occupyingDiscountId = occupiedItems.get(flatItem._id);
+        if (occupyingDiscountId !== void 0 && occupyingDiscountId !== discount.id) {
+          return;
+        }
+        if (!checkItemApplicableForDiscount(flatItem, discount)) {
+          return;
+        }
+        let product;
+        if (flatItem.type === "main") {
+          product = flatItem.product;
+        } else {
+          product = {
+            _id: flatItem._id,
+            id: flatItem.id,
+            price: flatItem.price,
+            quantity: flatItem.quantity,
+            num: flatItem.num
+          };
+        }
+        const quantity = flatItem.type === "main" ? product.quantity || 1 : (product.num || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.quantity) || 1);
+        const productData = {
+          productId: flatItem._id,
+          amount: Number(product.price || 0),
+          quantity
+        };
+        if (flatItem.type === "bundle") {
+          productData.parentQuantity = ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1;
+        }
+        applicableProducts.push(productData);
+      });
+      if (applicableProducts.length > 0) {
+        const allocation = (0, import_utils.calculateOrderLevelDiscountAllocation)(discount, applicableProducts);
+        orderLevelDiscountAllocations.set(discount.id, allocation);
+      }
+    });
     const processedProductsMap = /* @__PURE__ */ new Map();
     const appliedDiscountProducts = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem) => {
@@ -294,7 +470,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         originProduct = flatItem.originProduct;
       }
       addModeDiscount.forEach((discount) => {
-        var _a2, _b, _c, _d, _e, _f;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
         const isHolderMatch = this.checkHolderMatch(
@@ -308,10 +484,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         let timeLimit = true;
         timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
         const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
-        const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a2 = product == null ? void 0 : product.discount_list) == null ? void 0 : _a2.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
+        const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a2 = product == null ? void 0 : product.discount_list) == null ? void 0 : _a2.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every(
+          (discount2) => discount2.id && [
+            "good_pass",
+            "discount_card",
+            "product_discount_card"
+          ].includes(discount2.tag || discount2.type)
+        ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
         if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
-          (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
+          (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
           const isGoodPass = discountType === "good_pass";
@@ -321,8 +503,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
-              discount_card_type: (_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.discount_card_type,
+              discount_card_type: (_h = discount == null ? void 0 : discount.metadata) == null ? void 0 : _h.discount_card_type,
               fixed_amount: product.price,
+              discount_calculation_mode: (_i = discount == null ? void 0 : discount.metadata) == null ? void 0 : _i.discount_calculation_mode,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.price || product.origin_total,
@@ -340,7 +523,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -560,16 +743,29 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (Number(((_v = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _v.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
+          const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
+          const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
+          const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
+          let targetProductTotal;
+          let amount;
+          let productDiscountDifference;
+          if (isOrderLevel && productAllocation) {
+            amount = productAllocation.discountAmount;
+            productDiscountDifference = productAllocation.difference;
+            targetProductTotal = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
+          } else {
+            targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
+            amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+          }
           const discountType = selectedDiscount2.tag || selectedDiscount2.type;
           const isGoodPass = discountType === "good_pass";
-          const amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
           const discountDetail = {
             amount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
               discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
               fixed_amount: amount,
+              discount_calculation_mode: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -579,7 +775,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             // 前端使用的num数量，为了计算优惠金额
             _num: isGoodPass ? 1 : product.num,
             metadata: {
-              num: 1
+              num: 1,
+              // 🔥 order_level 分摊差值
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             }
           };
           appliedProducts.push(discountDetail);
@@ -636,6 +834,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
+                discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -680,18 +879,33 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[0];
           usedDiscounts.set(selectedDiscount2.id, true);
           const productOriginTotal = product.original_price || product.price || 0;
-          const targetProductTotal = (0, import_utils.getDiscountAmount)(
-            selectedDiscount2,
-            productOriginTotal,
-            productOriginTotal
-          );
+          const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
+          const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
+          const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
+          let targetProductTotal;
+          let fixedAmountPerItem;
+          let productDiscountDifference;
+          if (isOrderLevel && productAllocation) {
+            fixedAmountPerItem = productAllocation.discountAmount;
+            productDiscountDifference = productAllocation.difference;
+            targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+          } else {
+            targetProductTotal = (0, import_utils.getDiscountAmount)(
+              selectedDiscount2,
+              productOriginTotal,
+              productOriginTotal
+            );
+            fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
+          }
+          debugger;
           const uniqueId = flatItem._id;
           const discountDetail = {
-            amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber() * (product.num || 1),
+            amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
-              fixed_amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber(),
+              discount_card_type: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_card_type,
+              fixed_amount: fixedAmountPerItem,
+              discount_calculation_mode: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -701,9 +915,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             metadata: {
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
-              num: product.num || 1
+              num: product.num || 1,
+              // 🔥 order_level 分摊差值
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
-            _num: (product.num || 1) * (((_y = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _y.num) || 1)
+            _num: (product.num || 1) * (((_B = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _B.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -711,7 +927,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedItems.push({
             ...flatItem,
             total: targetProductTotal,
-            price: new import_decimal.default(productOriginTotal || 0).minus(discountDetail.discount.fixed_amount).toNumber(),
+            price: new import_decimal.default(productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
             discount_list: [discountDetail],
             processed: true
           });
@@ -801,6 +1017,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     return {
                       ...discount,
                       metadata: {
+                        ...discount.metadata,
                         num: item.num,
                         custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
                       }
@@ -824,6 +1041,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     return {
                       ...discount,
                       metadata: {
+                        ...discount.metadata,
                         num: item.num,
                         custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
                       }
@@ -854,6 +1072,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 ...discount,
                 // num: 1,
                 metadata: {
+                  ...discount.metadata,
                   custom_product_bundle_map_id: (_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.custom_product_bundle_map_id,
                   num: 1
                 }
@@ -914,6 +1133,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 return {
                   ...discount,
                   metadata: {
+                    ...discount.metadata,
                     num: mainProductQuantity - 1,
                     custom_product_bundle_map_id: (_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.custom_product_bundle_map_id
                   }
@@ -972,6 +1192,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                         return {
                           ...discount,
                           metadata: {
+                            ...discount.metadata,
                             num: item.num,
                             custom_product_bundle_map_id: (_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
                           }

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

@@ -2,6 +2,11 @@ import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
 export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState['summary'];
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 /**
  * 计算商品小计（不含其他费用）
  * @param items - 购物车商品数组

package/lib/modules/Summary/utils.js

@@ -32,7 +32,8 @@ __export(utils_exports, {
   calculateDeposit: () => calculateDeposit,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
-  calculateTaxFee: () => calculateTaxFee
+  calculateTaxFee: () => calculateTaxFee,
+  getBundleDiscountList: () => getBundleDiscountList
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
@@ -50,13 +51,35 @@ var calculatePriceDetails = (shopInfo, items) => {
     deposit
   };
 };
+var getBundleDiscountList = (bundle) => {
+  if (!bundle) {
+    return [];
+  }
+  let discountList = [];
+  bundle.forEach((d) => {
+    if (d.discount_list && Array.isArray(d.discount_list)) {
+      discountList.push(...d.discount_list.filter((item) => !item.id));
+    }
+  });
+  return discountList;
+};
+var getProductDiscountProductDiscountDifference = (item) => {
+  var _a, _b, _c, _d;
+  const mainDiscountList = ((_b = (_a = item._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
+  const bundleDiscountList = getBundleDiscountList(((_d = (_c = item._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []);
+  const discountList = [...mainDiscountList, ...bundleDiscountList];
+  return discountList.reduce((pre, cur) => {
+    return pre + (cur.metadata.product_discount_difference || 0);
+  }, 0);
+};
 var calculateSubtotal = (items) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
     const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
-    return sum.plus(cartItemTotalPrice);
+    const productDiscountProductDiscountDifference = getProductDiscountProductDiscountDifference(item);
+    return sum.plus(cartItemTotalPrice).sub(productDiscountProductDiscountDifference);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
@@ -103,5 +126,6 @@ var calculateDeposit = (items) => {
   calculateDeposit,
   calculatePriceDetails,
   calculateSubtotal,
-  calculateTaxFee
+  calculateTaxFee,
+  getBundleDiscountList
 });

package/lib/solution/BookingTicket/index.d.ts

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

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

package/lib/solution/ShopDiscount/index.js

@@ -369,7 +369,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;
@@ -379,7 +379,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.quantity) || (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((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.product_discount_difference) || 0).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -390,13 +390,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.quantity) || (product == null ? void 0 : product.num) || 1),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0).toNumber(),
                 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
               });
             }
           }

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

@@ -65,3 +65,27 @@ export declare const getDateIsInSchedule: (dateTime: string, scheduleList: Sched
  * @returns 过滤后的优惠券列表
  */
 export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];
+/**
+ * 判断是否是订单级别的固定金额折扣卡
+ * @param discount 折扣
+ * @returns 是否是订单级别的固定金额折扣卡
+ */
+export declare const isOrderLevelFixedAmountDiscount: (discount: Discount) => boolean;
+/**
+ * 计算订单级别固定金额折扣卡的分摊结果
+ * @param discount 折扣卡
+ * @param applicableProducts 适用商品列表 { productId, amount, quantity, parentQuantity }
+ * @returns 分摊结果 Map<productId, { discountAmount, difference }>
+ * 注意：
+ * - discountAmount 是单价折扣金额（不是总折扣金额）
+ * - difference（总差值）优先直接加到数量为1的单商品折扣上，如果没有则存储在metadata中
+ */
+export declare const calculateOrderLevelDiscountAllocation: (discount: Discount, applicableProducts: Array<{
+    productId: string | number;
+    amount: number;
+    quantity: number;
+    parentQuantity?: number;
+}>) => Map<string | number, {
+    discountAmount: number;
+    difference: number;
+}>;