@pisell/pisellos 2.1.118 → 2.1.120

package/dist/solution/ScanOrder/utils.js

@@ -0,0 +1,397 @@
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 _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; }
+/**
+ * 构建金额全为 0 的空 summary。
+ * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
+ */
+export function createEmptySummary() {
+  return {
+    product_quantity: 0,
+    product_original_amount: '0.00',
+    product_amount: '0.00',
+    product_expect_amount: '0.00',
+    product_tax_fee: '0.00',
+    shipping_fee: '0.00',
+    shipping_tax_fee: '0.00',
+    tax_fee: '0.00',
+    surcharge_fee: '0.00',
+    discount_amount: '0.00',
+    deposit_amount: '0.00',
+    expect_amount: '0.00',
+    total_amount: '0.00',
+    amount_gap: '0.00',
+    rounding_amount: '0.00',
+    pay_service_charge_amount: '0.00'
+  };
+}
+
+/**
+ * 商品数量安全取值。
+ * - NaN / undefined / < 1 均视作 1（最低起订量）
+ * - 有值时取整（不支持小数数量）
+ */
+export function getSafeProductNum(num) {
+  if (!num || Number.isNaN(num)) return 1;
+  if (num < 1) return 1;
+  return Math.floor(num);
+}
+
+/**
+ * 宽松布尔值转换。
+ * 兼容后端/配置中心常见的 boolean / number / string 表达，统一归一成 true/false。
+ */
+export function toBoolean(value) {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'number') return value !== 0;
+  if (typeof value === 'string') {
+    var normalized = value.trim().toLowerCase();
+    return ['1', 'true', 'yes', 'y', 'on'].includes(normalized);
+  }
+  return false;
+}
+
+/**
+ * 将值归一化为有效的正向字符串。
+ * null / undefined / 空串 / '0' / 'null' 统一视为无效值并返回 undefined。
+ */
+export function toPositiveString(value) {
+  if (value === null || value === undefined || value === '') return undefined;
+  var normalized = String(value).trim();
+  if (!normalized || normalized === '0' || normalized.toLowerCase() === 'null') {
+    return undefined;
+  }
+  return normalized;
+}
+
+/**
+ * 归一化 item rule 策略模型 ID 列表。
+ * - 支持 string / number 混合输入
+ * - 仅保留 > 0 的合法数字
+ * - 自动去重
+ */
+export function normalizeEnabledItemRuleIds(rawIds) {
+  if (!Array.isArray(rawIds)) return [];
+  var uniqueIds = new Set();
+  var _iterator = _createForOfIteratorHelper(rawIds),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      var strategyId = Number(item);
+      if (Number.isFinite(strategyId) && strategyId > 0) {
+        uniqueIds.add(strategyId);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Array.from(uniqueIds);
+}
+
+/**
+ * 从 tableConfig 中提取合法策略模型 ID 列表。
+ */
+export function extractStrategyModelIdsFromTableConfig(tableConfig) {
+  var rawIds = Array.isArray(tableConfig === null || tableConfig === void 0 ? void 0 : tableConfig.strategy_model_ids) ? tableConfig.strategy_model_ids : [];
+  return rawIds.map(function (id) {
+    return Number(id);
+  }).filter(function (id) {
+    return Number.isFinite(id) && id > 0;
+  });
+}
+
+/**
+ * 仅保留 item_rule 类型策略。
+ */
+export function normalizeItemRuleStrategies(configs) {
+  if (!Array.isArray(configs)) return [];
+  return configs.filter(function (config) {
+    var _metadata;
+    return Boolean(config && _typeof(config) === 'object' && (config === null || config === void 0 || (_metadata = config.metadata) === null || _metadata === void 0 ? void 0 : _metadata.type) === 'item_rule');
+  });
+}
+export function toNonNegativeNumber(value) {
+  if (typeof value === 'number') {
+    return Number.isFinite(value) && value >= 0 ? value : 0;
+  }
+  if (typeof value === 'string') {
+    var parsed = Number(value);
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;
+  }
+  return 0;
+}
+export function toNonNegativeInt(value) {
+  return Math.floor(toNonNegativeNumber(value));
+}
+export function toPriceString(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0.00';
+  var parsedValue = Number(value);
+  if (Number.isNaN(parsedValue)) return fallback;
+  return parsedValue.toFixed(2);
+}
+export function buildProductKey(productId, productVariantId) {
+  return "".concat(productId, "_").concat(productVariantId);
+}
+export function getTopLevelProductId(product) {
+  var _product$product_id;
+  var rawProductId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id;
+  var productId = Number(rawProductId);
+  if (!Number.isFinite(productId) || productId <= 0) return null;
+  return productId;
+}
+export function getTopLevelVariantId(product) {
+  var _product$product_vari;
+  var rawVariantId = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : product.variant_id;
+  if (rawVariantId === undefined || rawVariantId === null || rawVariantId === '') {
+    return null;
+  }
+  var variantId = Number(rawVariantId);
+  if (!Number.isFinite(variantId) || variantId <= 0) return null;
+  return variantId;
+}
+export function buildQuantityLimitIndex(limits) {
+  var exactLimitMap = new Map();
+  var productLimitMap = new Map();
+  var _iterator2 = _createForOfIteratorHelper(limits),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var limit = _step2.value;
+      var _iterator3 = _createForOfIteratorHelper(limit.targets || []),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var target = _step3.value;
+          var productId = Number(target.product_id);
+          if (!Number.isFinite(productId) || productId <= 0) continue;
+          var variantId = Number(target.product_variant_id);
+          var hasVariant = Number.isFinite(variantId) && variantId > 0;
+          if (hasVariant) {
+            var exactKey = buildProductKey(productId, variantId);
+            var _existed = exactLimitMap.get(exactKey) || [];
+            exactLimitMap.set(exactKey, [].concat(_toConsumableArray(_existed), [limit]));
+            continue;
+          }
+          var existed = productLimitMap.get(productId) || [];
+          productLimitMap.set(productId, [].concat(_toConsumableArray(existed), [limit]));
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return {
+    exactLimitMap: exactLimitMap,
+    productLimitMap: productLimitMap
+  };
+}
+export function resolveSkuMatchedQuantityLimits(params) {
+  var productId = params.productId,
+    variantId = params.variantId,
+    limitIndex = params.limitIndex;
+  var exactMatched = variantId && variantId > 0 ? limitIndex.exactLimitMap.get(buildProductKey(productId, variantId)) || [] : [];
+  var productMatched = limitIndex.productLimitMap.get(productId) || [];
+  return [].concat(_toConsumableArray(exactMatched), _toConsumableArray(productMatched));
+}
+export function aggregateItemRuleLimit(matchedLimits) {
+  if (!matchedLimits.length) return null;
+  var min;
+  var max;
+  var exact;
+  var mustInclude = false;
+  var _iterator4 = _createForOfIteratorHelper(matchedLimits),
+    _step4;
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var limit = _step4.value;
+      if (typeof limit.requiredMin === 'number' && Number.isFinite(limit.requiredMin)) {
+        min = min === undefined ? limit.requiredMin : Math.max(min, limit.requiredMin);
+      }
+      if (typeof limit.requiredMax === 'number' && Number.isFinite(limit.requiredMax)) {
+        max = max === undefined ? limit.requiredMax : Math.min(max, limit.requiredMax);
+      }
+      if (typeof limit.requiredExact === 'number' && Number.isFinite(limit.requiredExact)) {
+        exact = limit.requiredExact;
+      }
+      mustInclude = mustInclude || Boolean(limit.mustInclude);
+    }
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+  if (typeof exact === 'number' && Number.isFinite(exact)) {
+    min = exact;
+    max = exact;
+  }
+  return {
+    min: min,
+    max: max,
+    exact: exact,
+    mustInclude: mustInclude
+  };
+}
+export function buildItemRuleBusinessData(params) {
+  var tempOrder = params.tempOrder,
+    runtimeConfig = params.runtimeConfig,
+    itemRuleConfigs = params.itemRuleConfigs;
+  var rawPax = runtimeConfig.pax || {};
+  var adultPax = toNonNegativeInt(rawPax.adult);
+  var childPax = toNonNegativeInt(rawPax.child);
+  var totalPax = toNonNegativeInt(rawPax.total) || adultPax + childPax || 1;
+  var cartItems = tempOrder.products.reduce(function (result, product) {
+    if (typeof product.product_id !== 'number') return result;
+    result.push(_objectSpread({
+      product_id: product.product_id,
+      quantity: toNonNegativeInt(product.num)
+    }, typeof product.product_variant_id === 'number' ? {
+      product_variant_id: product.product_variant_id
+    } : {}));
+    return result;
+  }, []);
+  var historicalItems = Array.isArray(runtimeConfig.historicalItems) ? runtimeConfig.historicalItems.reduce(function (result, item) {
+    if (typeof (item === null || item === void 0 ? void 0 : item.product_id) !== 'number') return result;
+    result.push(_objectSpread({
+      product_id: item.product_id,
+      quantity: toNonNegativeInt(item.quantity)
+    }, typeof item.product_variant_id === 'number' ? {
+      product_variant_id: item.product_variant_id
+    } : {}));
+    return result;
+  }, []) : [];
+  return {
+    pax: {
+      total: totalPax,
+      adult: adultPax,
+      child: childPax
+    },
+    cartItems: cartItems,
+    historicalItems: historicalItems,
+    serviceType: runtimeConfig.serviceType || 'dine-in',
+    submissionIndex: typeof runtimeConfig.submissionIndex === 'number' ? toNonNegativeInt(runtimeConfig.submissionIndex) : tempOrder.order_id ? 1 : 0,
+    custom: runtimeConfig.custom || {},
+    strategyConfigs: itemRuleConfigs
+  };
+}
+export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
+  if (!Array.isArray(productList)) return productList;
+  var limitIndex = buildQuantityLimitIndex(limits || []);
+  var _iterator5 = _createForOfIteratorHelper(productList),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var item = _step5.value;
+      if (!item || _typeof(item) !== 'object') continue;
+      var productItem = item;
+      var productId = getTopLevelProductId(productItem);
+      if (productId === null) continue;
+      var variantId = getTopLevelVariantId(productItem);
+      var matchedLimits = limits.length ? resolveSkuMatchedQuantityLimits({
+        productId: productId,
+        variantId: variantId,
+        limitIndex: limitIndex
+      }) : [];
+      var aggregatedLimit = aggregateItemRuleLimit(matchedLimits);
+      if (aggregatedLimit) {
+        productItem.item_rule_limit = aggregatedLimit;
+      } else if ('item_rule_limit' in productItem) {
+        delete productItem.item_rule_limit;
+      }
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+  return productList;
+}
+
+/**
+ * 判断两个商品 identity 是否匹配。
+ * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
+ * 一旦有一方携带 identity_key，则必须严格相等。
+ */
+export function isIdentityMatch(a, b) {
+  if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id) return false;
+  if (!a.identity_key && !b.identity_key) return true;
+  return a.identity_key === b.identity_key;
+}
+
+/**
+ * 根据 identity 在商品列表中定位下标。
+ * 用于判断商品是否已存在（已存在则累加数量，否则新增）。
+ */
+export function getProductIdentityIndex(products, identity) {
+  return products.findIndex(function (item) {
+    return isIdentityMatch(item, identity);
+  });
+}
+
+/**
+ * 对外部传入的商品对象做归一化：
+ * - 补全可选字段默认值（未传则使用兜底值，避免后续计算时因 undefined 导致异常）
+ * - 对 num 调用 getSafeProductNum 做安全处理
+ * - 保留 _origin 供后续业务流程（如促销规则）使用
+ */
+export function normalizeOrderProduct(product) {
+  var _product$is_charge_ta;
+  var metadata = _objectSpread({}, product.metadata || {});
+  if (product.identity_key && !metadata.unique_identification_number) {
+    metadata.unique_identification_number = product.identity_key;
+  }
+  var resolvedOriginalPrice = product.original_price || '0.00';
+  var resolvedSellingPrice = product.selling_price || '0.00';
+  if (metadata.main_product_original_price === undefined) {
+    metadata.main_product_original_price = resolvedOriginalPrice;
+  }
+  if (metadata.main_product_selling_price === undefined) {
+    metadata.main_product_selling_price = resolvedSellingPrice;
+  }
+  if (metadata.source_product_price === undefined) {
+    var _product$_origin$orig, _product$_origin;
+    metadata.source_product_price = (_product$_origin$orig = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.original_price) !== null && _product$_origin$orig !== void 0 ? _product$_origin$orig : resolvedOriginalPrice;
+  }
+  var normalizedBundle = (product.product_bundle || []).map(function (item) {
+    var _ref, _item$bundle_selling_, _ref2, _ref3, _item$custom_price;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      bundle_selling_price: (_ref = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref !== void 0 ? _ref : '0.00',
+      custom_price: (_ref2 = (_ref3 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00'
+    });
+  });
+  return {
+    order_detail_id: product.order_detail_id || null,
+    product_id: product.product_id,
+    num: getSafeProductNum(product.num),
+    product_variant_id: product.product_variant_id,
+    identity_key: product.identity_key,
+    product_option_item: product.product_option_item || [],
+    selling_price: resolvedSellingPrice,
+    original_price: resolvedOriginalPrice,
+    payment_price: product.payment_price || '0.00',
+    tax_fee: product.tax_fee || '0.00',
+    is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
+    discount_list: product.discount_list || [],
+    product_bundle: normalizedBundle,
+    metadata: metadata,
+    _origin: product._origin
+  };
+}

package/dist/solution/ShopDiscount/index.d.ts

@@ -22,7 +22,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
-    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;

package/dist/solution/ShopDiscount/index.js

@@ -56,8 +56,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: undefined,
-      orderTotalAmount: 0
+      bookingSubject: undefined
     };
     return _this;
   }
@@ -289,14 +288,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }()
-  }, {
-    key: "setOriginTotalAmount",
-    value: function setOriginTotalAmount(amount) {
-      this.store.orderTotalAmount = amount;
-    }
-
-    // 设置holders
+    }() // 设置holders
   }, {
     key: "setHolders",
     value: function setHolders(holders) {
@@ -324,7 +316,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref = rulesModule.calcDiscount({
           productList: productList,
           discountList: this.getDiscountList(),
-          orderTotalAmount: this.store.orderTotalAmount || 0,
           holders: this.store.holders || [],
           isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
@@ -504,7 +495,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
-                orderTotalAmount: this.store.orderTotalAmount || 0,
                 holders: this.store.holders || [],
                 isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
@@ -618,27 +608,21 @@ 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 _editModeDiscountList, _discount$metadata, _discount$metadata2;
+                var _discount$metadata;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
-                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
-                    num: ((editModeDiscountList === null || editModeDiscountList === void 0 || (_editModeDiscountList = editModeDiscountList[index]) === null || _editModeDiscountList === void 0 || (_editModeDiscountList = _editModeDiscountList.metadata) === null || _editModeDiscountList === void 0 ? void 0 : _editModeDiscountList.num) || 1) + (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || 1)
-                  }),
                   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.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$metadata3, _discount$metadata4, _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
-                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
-                    num: ((_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.num) || 1
-                  }),
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.product_discount_difference) || 0).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
                   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,
@@ -831,7 +815,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 19:
               _context10.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
             case 21:
               _context10.next = 26;
               break;

package/dist/solution/ShopDiscount/types.d.ts

@@ -23,7 +23,6 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
-    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;

package/dist/solution/ShopDiscount/types.js

@@ -8,5 +8,4 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";
   return ShopDiscountHooks;
-}({});
-;
+}({});

package/dist/solution/ShopDiscount/utils.js

@@ -40,37 +40,23 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  * @returns 
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
-  var discountedPrice = 0;
-
+  var _discount$metadata;
   // 商品券
   if (discount.tag === 'good_pass') {
-    discountedPrice = new Decimal(price).minus(new Decimal(price || 0)).toNumber();
-  } else {
-    var _discount$metadata;
-    // 判断是否是固定金额
-    var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
-
-    // 固定金额 小于0时返回0
-    if (isFixedAmount) {
-      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
-    } else {
-      // 百分比：根据折扣卡金额计算
-      discountedPrice = new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
-    }
+    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
-  /*
-    // 🔥 如果有 maxDeductionAmount 限制，确保折扣金额不超过限制
-    if (discount.config?.maxDeductionAmount) {
-      const actualDiscountAmount = new Decimal(price).minus(discountedPrice).toNumber();
-      if (actualDiscountAmount > discount.config.maxDeductionAmount) {
-        // 折扣金额超过限制，重新计算折扣后价格
-        discountedPrice = new Decimal(price).minus(discount.config.maxDeductionAmount).toNumber();
-      }
-    }
-  */
+  // 判断是否是固定金额
+  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+  // 固定金额 小于0时返回0
+  if (isFixedAmount) {
+    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);
+  }
 
-  return discountedPrice;
+  // 百分比：根据折扣卡金额计算
+  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) {