@pisell/pisellos 2.3.74 → 2.3.76

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -1,104 +1,160 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/solution/BaseSales/utils/cartPromotion.ts
-var cartPromotion_exports = {};
-__export(cartPromotion_exports, {
-  appendPromotionTags: () => appendPromotionTags,
-  buildConsolidateKeyForPromotion: () => buildConsolidateKeyForPromotion,
-  calculateUnfulfilledPromotions: () => calculateUnfulfilledPromotions,
-  extractProductMatchIdentifiersFromStrategyConfig: () => extractProductMatchIdentifiersFromStrategyConfig,
-  getOrderProductBasePrice: () => getOrderProductBasePrice,
-  getOrderProductOriginalPriceForPromotion: () => getOrderProductOriginalPriceForPromotion,
-  getOrderProductUid: () => getOrderProductUid,
-  mergeIdenticalPromotionCartLines: () => mergeIdenticalPromotionCartLines,
-  processCartPromotion: () => processCartPromotion,
-  resolveStrategyEligibleProducts: () => resolveStrategyEligibleProducts,
-  resolveStrategyRequiredQuantity: () => resolveStrategyRequiredQuantity
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(cartPromotion_exports);
-var import_decimal = __toESM(require("decimal.js"));
-var import_lodash_es = require("lodash-es");
-var import_utils = require("../../../modules/Order/utils");
-var import_utils2 = require("../../ScanOrder/utils");
+exports.PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = void 0;
+exports.appendPromotionTags = appendPromotionTags;
+exports.buildConsolidateKeyForPromotion = buildConsolidateKeyForPromotion;
+exports.calculateUnfulfilledPromotions = calculateUnfulfilledPromotions;
+exports.extractProductMatchIdentifiersFromStrategyConfig = extractProductMatchIdentifiersFromStrategyConfig;
+exports.getOrderProductBasePrice = getOrderProductBasePrice;
+exports.getOrderProductOriginalPriceForPromotion = getOrderProductOriginalPriceForPromotion;
+exports.getOrderProductUid = getOrderProductUid;
+exports.mergeIdenticalPromotionCartLines = mergeIdenticalPromotionCartLines;
+exports.processCartPromotion = processCartPromotion;
+exports.resolveStrategyEligibleProducts = resolveStrategyEligibleProducts;
+exports.resolveStrategyRequiredQuantity = resolveStrategyRequiredQuantity;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _lodashEs = require("lodash-es");
+var _utils = require("../../../modules/Order/utils");
+var _utils2 = require("../../ScanOrder/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = exports.PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = '_productLineMergeDisabled';
+
+/**
+ * Cart promotion 工具集（OS 内部纯函数）
+ *
+ * 这是 `private-materials/components/booking/hooks/usePromotion.ts` 中促销/赠品
+ * 核心计算（evaluator → 拆分 / 计价 → 赠品差异化 / 未满足提示 / 标签）的 OS 等价实现。
+ *
+ * 与 legacy 的关键差异：
+ * - legacy 操作 booking `_extend.*` 形状；OS 操作 `OrderProduct.metadata.*` 形状。
+ * - 行唯一标识不再用 `_id`，统一改用 `metadata.unique_identification_number`。
+ * - 赠品标签存到 `metadata._giftInfo`；主商品促销信息存到 `metadata._promotion`；
+ *   商品卡列表的促销 tag 存到 `metadata._promotionTags`。
+ *
+ * 仅暴露纯函数，不持有任何状态；评估器以参数注入。
+ *
+ * @example
+ * const evaluator = appHelper.utils.promotionEvaluator;
+ * const result = processCartPromotion(tempOrder.products, evaluator);
+ * // result.products: 处理后的商品（带 _promotion / 拆分）
+ * // result.giftActions: 需要 add / reduce / remove 的赠品操作
+ * // result.unfulfilledPromotions: 未满足策略列表（购物车底部 alert）
+ */
+
+// ============================================
+// 类型定义
+// ============================================
+
+/** Cart 评估器协议（只描述本文件用到的方法，避免循环依赖） */
+
+/** 单个赠品减量项 */
+
+/** 赠品新增项 */
+
+/** 赠品操作集合（OS 侧根据它落地 tempOrder.products） */
+
+/** 未满足促销提示项（购物车底部 alert 数据源） */
+
+/** 商品卡促销标签结构（写入 `metadata._promotionTags`） */
+
+/** processCartPromotion 输出 */
+
+// ============================================
+// 字段适配 helper
+// ============================================
+
+/**
+ * 获取商品的「主商品基础价」用于评估器入参。
+ *
+ * 优先级（与 OS v2 schema 一致）：
+ * 1. `metadata.source_product_price`
+ * 2. `metadata.main_product_original_price` 减去 option 合计
+ * 3. `original_price`
+ */
 function getOrderProductBasePrice(product) {
-  const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
-  if (metadata.source_product_price !== void 0) {
-    const v2 = Number(metadata.source_product_price);
-    return Number.isFinite(v2) ? v2 : 0;
+  const metadata = product?.metadata || {};
+  const optionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(product)).toNumber();
+  if (metadata.source_product_price !== undefined) {
+    const v = Number(metadata.source_product_price);
+    return Number.isFinite(v) ? v : 0;
   }
-  if (metadata.main_product_original_price !== void 0) {
-    const v2 = Number(metadata.main_product_original_price) - optionSum;
-    return Number.isFinite(v2) ? v2 : 0;
+  if (metadata.main_product_original_price !== undefined) {
+    const v = Number(metadata.main_product_original_price) - optionSum;
+    return Number.isFinite(v) ? v : 0;
   }
-  const v = Number((product == null ? void 0 : product.original_price) ?? (product == null ? void 0 : product.selling_price) ?? 0);
+  const v = Number(product?.original_price ?? product?.selling_price ?? 0);
   return Number.isFinite(v) ? v : 0;
 }
+
+/**
+ * 促销均摊专用原价（对齐 legacy `getMainOriginalPrice` 语义）。
+ *
+ * 必须用券前原价做 X_ITEMS_FOR_Y_PRICE 比例拆分；`source_product_price` 在上一轮 applyPromotion
+ * 后可能已被写成促销价（如 5 / 9 / 1），若继续用它会导致同商品两行出现 9+1 而非 5+5。
+ *
+ * @example
+ * getOrderProductOriginalPriceForPromotion({ metadata: { source_product_price: '9', main_product_original_price: '5.80' } });
+ * // => 5.8
+ */
 function getOrderProductOriginalPriceForPromotion(product) {
-  var _a;
-  const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
-  if (metadata.main_product_original_price !== void 0 && metadata.main_product_original_price !== null && metadata.main_product_original_price !== "") {
+  const metadata = product?.metadata || {};
+  const optionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(product)).toNumber();
+  if (metadata.main_product_original_price !== undefined && metadata.main_product_original_price !== null && metadata.main_product_original_price !== '') {
     const v = Number(metadata.main_product_original_price) - optionSum;
-    if (Number.isFinite(v) && v >= 0)
-      return v;
+    if (Number.isFinite(v) && v >= 0) return v;
   }
-  const promoOriginal = (_a = metadata._promotion) == null ? void 0 : _a.originalPrice;
-  if (promoOriginal !== void 0 && promoOriginal !== null && promoOriginal !== "") {
+  const promoOriginal = metadata._promotion?.originalPrice;
+  if (promoOriginal !== undefined && promoOriginal !== null && promoOriginal !== '') {
     const v = Number(promoOriginal);
-    if (Number.isFinite(v) && v >= 0)
-      return v;
+    if (Number.isFinite(v) && v >= 0) return v;
   }
   return getOrderProductBasePrice(product);
 }
-var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
-var ITEM_REWARD = "ITEM_REWARD";
+const X_ITEMS_FOR_Y_PRICE = 'X_ITEMS_FOR_Y_PRICE';
+const BUY_X_GET_Y_FREE = 'BUY_X_GET_Y_FREE';
+const ITEM_REWARD = 'ITEM_REWARD';
 function isItemRewardPromotionDiscountItem(item) {
-  var _a, _b;
-  return (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === ITEM_REWARD;
+  return item?.type === 'product' && item?.metadata?.source === 'promotion' && item?.metadata?.actionType === ITEM_REWARD;
 }
 function isManagedPromotionDiscountItem(item) {
-  if ((item == null ? void 0 : item.type) === "promotion")
-    return true;
+  if (item?.type === 'promotion') return true;
   return isItemRewardPromotionDiscountItem(item);
 }
+
+/**
+ * 判断商品行在本轮评估前是否已享受促销。
+ *
+ * `_promotion` 仅存在于当前运行时；订单保存后会被裁剪，因此编辑态需通过
+ * ITEM_REWARD 写入的受管商品折扣恢复上一轮状态。
+ */
 function wasInPromotionBeforeEvaluation(item) {
-  var _a, _b;
-  if (((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true)
-    return true;
-  return Array.isArray(item == null ? void 0 : item.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
+  if (item?.metadata?._promotion?.inPromotion === true) return true;
+  return Array.isArray(item?.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
 }
+
+/**
+ * 写入/清除促销 discount_list。
+ *
+ * applyDiscount → applyProductDiscountPrices 会从 source_product_price 减去 discount_list 合计
+ * 重算 main_product_selling_price；保留券前 source 时必须同步写入促销差额，否则会还原成原价。
+ *
+ * ITEM_REWARD 使用 type=product，复用商品级折扣排他规则，避免客户折扣继续叠加到奖励商品行。
+ *
+ * @example
+ * updatePromotionDiscountList(line, { title: '2 items for $10', amount: '17.00', original_amount: '22.00', fixed_amount: '17.00' });
+ */
 function updatePromotionDiscountList(item, promotionDiscount, options) {
   let discountList = Array.isArray(item.discount_list) ? [...item.discount_list] : [];
-  discountList = discountList.filter((d) => !isManagedPromotionDiscountItem(d));
+  discountList = discountList.filter(d => !isManagedPromotionDiscountItem(d));
   if (promotionDiscount) {
-    const discountType = (options == null ? void 0 : options.discountType) || "promotion";
+    const discountType = options?.discountType || 'promotion';
     discountList.push({
       type: discountType,
       amount: promotionDiscount.amount,
@@ -106,14 +162,14 @@ function updatePromotionDiscountList(item, promotionDiscount, options) {
         original_amount: promotionDiscount.original_amount,
         fixed_amount: promotionDiscount.fixed_amount,
         title: promotionDiscount.title,
-        resource_id: ""
+        resource_id: ''
       },
-      ...discountType === "product" ? {
+      ...(discountType === 'product' ? {
         metadata: {
-          source: "promotion",
-          actionType: (options == null ? void 0 : options.actionType) || ITEM_REWARD
+          source: 'promotion',
+          actionType: options?.actionType || ITEM_REWARD
         }
-      } : {}
+      } : {})
     });
   }
   if (discountList.length > 0) {
@@ -123,133 +179,132 @@ function updatePromotionDiscountList(item, promotionDiscount, options) {
   }
 }
 function evaluatorHasActionType(evaluator, actionType) {
-  var _a;
-  const configs = (_a = evaluator == null ? void 0 : evaluator.getStrategyConfigs) == null ? void 0 : _a.call(evaluator);
-  if (!Array.isArray(configs))
-    return false;
-  return configs.some(
-    (config) => ((config == null ? void 0 : config.actions) || []).some((action) => (action == null ? void 0 : action.type) === actionType)
-  );
+  const configs = evaluator?.getStrategyConfigs?.();
+  if (!Array.isArray(configs)) return false;
+  return configs.some(config => (config?.actions || []).some(action => action?.type === actionType));
 }
+
+/**
+ * 将促销单价写入 OrderProduct（含 metadata 三字段 + 行内折扣）。
+ *
+ * @example
+ * applyPromoUnitPriceToLine(newItem, { promoUnitPrice: '5.00', originalBasePrice: 1, strategyTitle: '2 for 10' });
+ */
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
-  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
-  const promoUnitPrice = new import_decimal.default(Number(input.promoUnitPrice) || 0).toDecimalPlaces(2).toFixed(2);
-  const mainSelling = new import_decimal.default(Number(promoUnitPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
-  const catalogSource = new import_decimal.default(input.originalBasePrice).toDecimalPlaces(2).toFixed(2);
+  const optionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(item)).toNumber();
+  const promoUnitPrice = new _decimal.default(Number(input.promoUnitPrice) || 0).toDecimalPlaces(2).toFixed(2);
+  const mainSelling = new _decimal.default(Number(promoUnitPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+  const catalogSource = new _decimal.default(input.originalBasePrice).toDecimalPlaces(2).toFixed(2);
   metadata.source_product_price = catalogSource;
-  metadata.main_product_original_price = new import_decimal.default(Number(catalogSource) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+  metadata.main_product_original_price = new _decimal.default(Number(catalogSource) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
   metadata.main_product_selling_price = mainSelling;
   metadata.price_schema_version = 2;
-  item.selling_price = (0, import_utils.composeLinePrice)({
+  item.selling_price = (0, _utils.composeLinePrice)({
     mainPrice: mainSelling,
     bundle: item.product_bundle
   });
-  item.original_price = (0, import_utils.composeLinePrice)({
+  item.original_price = (0, _utils.composeLinePrice)({
     mainPrice: metadata.main_product_original_price,
     bundle: item.product_bundle,
     useOriginalBundle: true
   });
-  const discountAmount = new import_decimal.default(input.originalBasePrice).minus(Number(promoUnitPrice) || 0).toDecimalPlaces(2).toFixed(2);
+  const discountAmount = new _decimal.default(input.originalBasePrice).minus(Number(promoUnitPrice) || 0).toDecimalPlaces(2).toFixed(2);
   if (Number(catalogSource) !== Number(promoUnitPrice)) {
     updatePromotionDiscountList(item, {
-      title: input.strategyTitle || "",
+      title: input.strategyTitle || '',
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
     }, {
       actionType: input.actionType,
-      discountType: input.actionType === ITEM_REWARD ? "product" : "promotion"
+      discountType: input.actionType === ITEM_REWARD ? 'product' : 'promotion'
     });
   } else {
     updatePromotionDiscountList(item, null);
   }
 }
 function getPromotionActionType(promotion) {
-  var _a, _b;
-  if (promotion == null ? void 0 : promotion.actionType)
-    return String(promotion.actionType);
-  const actions = (_a = promotion == null ? void 0 : promotion.strategyMetadata) == null ? void 0 : _a.actions;
-  if (Array.isArray(actions) && ((_b = actions[0]) == null ? void 0 : _b.type))
-    return String(actions[0].type);
-  return void 0;
+  if (promotion?.actionType) return String(promotion.actionType);
+  const actions = promotion?.strategyMetadata?.actions;
+  if (Array.isArray(actions) && actions[0]?.type) return String(actions[0].type);
+  return undefined;
 }
+
+/**
+ * 同款行凑满 X件Y元 且仅该行参与时，按 Y/X 计算期望单价（2 件 $10 → $5）。
+ *
+ * @example
+ * resolveXItemsExpectedUnitPrice({ actionType: 'X_ITEMS_FOR_Y_PRICE', actionDetail: { x: 2, price: 10 } }, 2);
+ */
 function resolveXItemsExpectedUnitPrice(promotion, sourceCartNum) {
-  if (getPromotionActionType(promotion) !== X_ITEMS_FOR_Y_PRICE)
-    return void 0;
-  const detail = promotion == null ? void 0 : promotion.actionDetail;
-  const x = Number(detail == null ? void 0 : detail.x);
-  const y = Number(detail == null ? void 0 : detail.price);
-  if (!Number.isFinite(x) || x <= 0 || !Number.isFinite(y))
-    return void 0;
-  if (sourceCartNum < x)
-    return void 0;
-  return Number(new import_decimal.default(y).div(x).toDecimalPlaces(2).toFixed(2));
+  if (getPromotionActionType(promotion) !== X_ITEMS_FOR_Y_PRICE) return undefined;
+  const detail = promotion?.actionDetail;
+  const x = Number(detail?.x);
+  const y = Number(detail?.price);
+  if (!Number.isFinite(x) || x <= 0 || !Number.isFinite(y)) return undefined;
+  if (sourceCartNum < x) return undefined;
+  return Number(new _decimal.default(y).div(x).toDecimalPlaces(2).toFixed(2));
 }
+
+/**
+ * 合并「同商品 + 同规格指纹 + 同促销策略 + 同促销单价」的参与促销行（num 累加）。
+ * 避免 Browse Items 连续加购同款时拆成多行且单价被错误均摊。
+ *
+ * @example
+ * mergeIdenticalPromotionCartLines(processedProducts);
+ */
 function mergeIdenticalPromotionCartLines(products) {
-  var _a, _b, _c, _d;
   if (!Array.isArray(products) || products.length <= 1) {
-    return [...products || []];
+    return [...(products || [])];
   }
   const merged = [];
-  const indexByKey = /* @__PURE__ */ new Map();
+  const indexByKey = new Map();
   for (const line of products) {
     if (getGiftInfo(line)) {
       merged.push(line);
       continue;
     }
-    const promotion = (_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a._promotion;
-    if (!(promotion == null ? void 0 : promotion.inPromotion) || !promotion.strategyId) {
+    const promotion = line?.metadata?._promotion;
+    if (!promotion?.inPromotion || !promotion.strategyId) {
       merged.push(line);
       continue;
     }
-    const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
-      (0, import_utils.getProductSkuOptions)(line),
-      line.product_bundle
-    );
-    const unitPrice = String(
-      ((_b = line.metadata) == null ? void 0 : _b.source_product_price) ?? line.selling_price ?? ""
-    );
-    const promoUnitPrice = String(
-      promotion.finalPrice ?? ((_c = line.metadata) == null ? void 0 : _c.main_product_selling_price) ?? ""
-    );
+    const fingerprint = (0, _utils2.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(line), line.product_bundle);
+    const unitPrice = String(line.metadata?.source_product_price ?? line.selling_price ?? '');
+    const promoUnitPrice = String(promotion.finalPrice ?? line.metadata?.main_product_selling_price ?? '');
     const noteSignature = getProductLineNoteSignature(line);
     const lineMergeBoundary = getPromotionLineMergeBoundary(line);
-    const bookingUid = (line == null ? void 0 : line.booking_uid) ?? ((_d = line == null ? void 0 : line.metadata) == null ? void 0 : _d.booking_uid);
-    const orderDetailId = (line == null ? void 0 : line.order_detail_id) ?? (line == null ? void 0 : line.orderDetailId);
-    const mergeKey = [
-      line.product_id,
-      line.product_variant_id ?? 0,
-      fingerprint,
-      noteSignature,
-      lineMergeBoundary,
-      bookingUid ? String(bookingUid) : "",
-      orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "" ? String(orderDetailId) : "",
-      promotion.strategyId,
-      unitPrice,
-      promoUnitPrice
-    ].join("#");
+    const bookingUid = line?.booking_uid ?? line?.metadata?.booking_uid;
+    const orderDetailId = line?.order_detail_id ?? line?.orderDetailId;
+    const mergeKey = [line.product_id, line.product_variant_id ?? 0, fingerprint, noteSignature, lineMergeBoundary, bookingUid ? String(bookingUid) : '', orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '' ? String(orderDetailId) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
     const hitIndex = indexByKey.get(mergeKey);
-    if (hitIndex === void 0) {
+    if (hitIndex === undefined) {
       indexByKey.set(mergeKey, merged.length);
       merged.push(line);
       continue;
     }
     const target = merged[hitIndex];
-    target.num = (0, import_utils2.getSafeProductNum)(Number(target.num || 0) + Number(line.num || 0));
+    target.num = (0, _utils2.getSafeProductNum)(Number(target.num || 0) + Number(line.num || 0));
   }
   return merged;
 }
+
+/**
+ * 同一原购物车行被多个「inPromotion」评估结果命中时（如买赠不改价 + X件Y元），
+ * 优先保留 X件Y元 定价，并恢复加购前的行数量。
+ *
+ * @example
+ * dedupePromotionProcessedLines(processedProducts);
+ */
 function dedupePromotionProcessedLines(lines) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  if (!Array.isArray(lines) || lines.length <= 1)
-    return [...lines || []];
+  if (!Array.isArray(lines) || lines.length <= 1) return [...(lines || [])];
   const passthrough = [];
-  const buckets = /* @__PURE__ */ new Map();
+  const buckets = new Map();
   for (const line of lines) {
-    const promo = (_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a._promotion;
-    const originalUid = String(line._originalProductUid || getOrderProductUid(line) || "");
-    if (!(promo == null ? void 0 : promo.inPromotion) || !originalUid) {
+    const promo = line?.metadata?._promotion;
+    const originalUid = String(line._originalProductUid || getOrderProductUid(line) || '');
+    if (!promo?.inPromotion || !originalUid) {
       passthrough.push(line);
       continue;
     }
@@ -257,13 +312,11 @@ function dedupePromotionProcessedLines(lines) {
     group.push(line);
     buckets.set(originalUid, group);
   }
-  const promotionDelta = (line) => {
-    var _a2;
-    const promo = (_a2 = line.metadata) == null ? void 0 : _a2._promotion;
-    const original = Number(promo == null ? void 0 : promo.originalPrice);
-    const final = Number(promo == null ? void 0 : promo.finalPrice);
-    if (!Number.isFinite(original) || !Number.isFinite(final))
-      return 0;
+  const promotionDelta = line => {
+    const promo = line.metadata?._promotion;
+    const original = Number(promo?.originalPrice);
+    const final = Number(promo?.finalPrice);
+    if (!Number.isFinite(original) || !Number.isFinite(final)) return 0;
     return Math.abs(original - final);
   };
   const deduped = [...passthrough];
@@ -272,73 +325,53 @@ function dedupePromotionProcessedLines(lines) {
       deduped.push(group[0]);
       continue;
     }
-    const sourceCartNum = Math.max(
-      ...group.map((line) => Number(line._sourceCartNum || line.num || 0))
-    );
-    const pricingLines = group.filter((line) => promotionDelta(line) > 0);
-    const xItemsLines = (pricingLines.length ? pricingLines : group).filter(
-      (line) => {
-        var _a2;
-        return getPromotionActionType((_a2 = line.metadata) == null ? void 0 : _a2._promotion) === X_ITEMS_FOR_Y_PRICE;
-      }
-    );
+    const sourceCartNum = Math.max(...group.map(line => Number(line._sourceCartNum || line.num || 0)));
+    const pricingLines = group.filter(line => promotionDelta(line) > 0);
+    const xItemsLines = (pricingLines.length ? pricingLines : group).filter(line => getPromotionActionType(line.metadata?._promotion) === X_ITEMS_FOR_Y_PRICE);
     const pool = xItemsLines.length ? xItemsLines : pricingLines.length ? pricingLines : group;
     let winner = pool[0];
-    const expectedUnit = resolveXItemsExpectedUnitPrice(
-      (_b = winner.metadata) == null ? void 0 : _b._promotion,
-      sourceCartNum
-    );
+    const expectedUnit = resolveXItemsExpectedUnitPrice(winner.metadata?._promotion, sourceCartNum);
     if (expectedUnit != null && pool.length > 1) {
       winner = pool.reduce((best, line) => {
-        var _a2, _b2, _c2, _d2;
-        const bestDiff = Math.abs(Number((_b2 = (_a2 = best.metadata) == null ? void 0 : _a2._promotion) == null ? void 0 : _b2.finalPrice) - expectedUnit);
-        const lineDiff = Math.abs(Number((_d2 = (_c2 = line.metadata) == null ? void 0 : _c2._promotion) == null ? void 0 : _d2.finalPrice) - expectedUnit);
+        const bestDiff = Math.abs(Number(best.metadata?._promotion?.finalPrice) - expectedUnit);
+        const lineDiff = Math.abs(Number(line.metadata?._promotion?.finalPrice) - expectedUnit);
         return lineDiff < bestDiff ? line : best;
       }, pool[0]);
     } else if (pool.length > 1 && !expectedUnit) {
       winner = pool.reduce((best, line) => {
-        var _a2, _b2, _c2, _d2, _e2, _f2;
-        const bestFinal = Number((_b2 = (_a2 = best.metadata) == null ? void 0 : _a2._promotion) == null ? void 0 : _b2.finalPrice);
-        const lineFinal = Number((_d2 = (_c2 = line.metadata) == null ? void 0 : _c2._promotion) == null ? void 0 : _d2.finalPrice);
-        const original = Number((_f2 = (_e2 = line.metadata) == null ? void 0 : _e2._promotion) == null ? void 0 : _f2.originalPrice);
+        const bestFinal = Number(best.metadata?._promotion?.finalPrice);
+        const lineFinal = Number(line.metadata?._promotion?.finalPrice);
+        const original = Number(line.metadata?._promotion?.originalPrice);
         if (Number.isFinite(original) && lineFinal >= original && bestFinal >= original) {
           return lineFinal < bestFinal ? line : best;
         }
         return promotionDelta(line) > promotionDelta(best) ? line : best;
       }, pool[0]);
     }
-    const winnerIsXItems = getPromotionActionType((_c = winner.metadata) == null ? void 0 : _c._promotion) === X_ITEMS_FOR_Y_PRICE;
+
+    // X件Y元：评估器会按单件均摊产出多条 inPromotion 行（如 $1 + $9），
+    // dedupe 应合并为「同组 X件Y元 行 num 之和」，不能用 sourceCartNum（整单 3 件）。
+    const winnerIsXItems = getPromotionActionType(winner.metadata?._promotion) === X_ITEMS_FOR_Y_PRICE;
     if (winnerIsXItems) {
-      const xItemsGroupLines = group.filter(
-        (line) => {
-          var _a2;
-          return getPromotionActionType((_a2 = line.metadata) == null ? void 0 : _a2._promotion) === X_ITEMS_FOR_Y_PRICE;
-        }
-      );
-      const evaluatedPromoQty = xItemsGroupLines.reduce(
-        (sum, line) => sum + Number(line.num || 0),
-        0
-      );
-      winner.num = (0, import_utils2.getSafeProductNum)(evaluatedPromoQty || winner.num || 1);
+      const xItemsGroupLines = group.filter(line => getPromotionActionType(line.metadata?._promotion) === X_ITEMS_FOR_Y_PRICE);
+      const evaluatedPromoQty = xItemsGroupLines.reduce((sum, line) => sum + Number(line.num || 0), 0);
+      winner.num = (0, _utils2.getSafeProductNum)(evaluatedPromoQty || winner.num || 1);
     } else {
-      winner.num = (0, import_utils2.getSafeProductNum)(sourceCartNum || winner.num || 1);
+      winner.num = (0, _utils2.getSafeProductNum)(sourceCartNum || winner.num || 1);
     }
-    const recomputeUnit = resolveXItemsExpectedUnitPrice(
-      (_d = winner.metadata) == null ? void 0 : _d._promotion,
-      sourceCartNum
-    );
+    const recomputeUnit = resolveXItemsExpectedUnitPrice(winner.metadata?._promotion, sourceCartNum);
     if (recomputeUnit != null) {
       const promo = winner.metadata._promotion;
       applyPromoUnitPriceToLine(winner, {
         promoUnitPrice: recomputeUnit,
         originalBasePrice: Number(promo.originalPrice),
-        strategyTitle: (_e = promo.strategyMetadata) == null ? void 0 : _e.name
+        strategyTitle: promo.strategyMetadata?.name
       });
       promo.finalPrice = recomputeUnit;
     }
     for (const line of group) {
-      const giftInfo = (_g = (_f = line.metadata) == null ? void 0 : _f._promotion) == null ? void 0 : _g.giftInfo;
-      if (giftInfo && ((_h = winner.metadata) == null ? void 0 : _h._promotion) && !winner.metadata._promotion.giftInfo) {
+      const giftInfo = line.metadata?._promotion?.giftInfo;
+      if (giftInfo && winner.metadata?._promotion && !winner.metadata._promotion.giftInfo) {
         winner.metadata._promotion.giftInfo = giftInfo;
       }
     }
@@ -346,155 +379,144 @@ function dedupePromotionProcessedLines(lines) {
   }
   return deduped;
 }
+
+/** 获取行 uid（统一以 `metadata.unique_identification_number` 为唯一键） */
 function getOrderProductUid(product) {
-  var _a;
-  return String(
-    ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) ?? (product == null ? void 0 : product.unique_identification_number) ?? ""
-  );
+  return String(product?.metadata?.unique_identification_number ?? product?.unique_identification_number ?? '');
 }
 function getGiftInfo(product) {
-  var _a;
-  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a._giftInfo) || (product == null ? void 0 : product._giftInfo) || null;
+  return product?.metadata?._giftInfo || product?._giftInfo || null;
 }
 function getProductLineNoteSignature(product) {
-  const note = product == null ? void 0 : product.note;
-  if (typeof note !== "string")
-    return "";
+  const note = product?.note;
+  if (typeof note !== 'string') return '';
   const normalizedNote = note.trim();
-  if (!normalizedNote)
-    return "";
+  if (!normalizedNote) return '';
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
 function hasGoodPassDiscount(product) {
-  var _a, _b;
-  const productBundle = Array.isArray(product == null ? void 0 : product.product_bundle) ? product.product_bundle : [];
-  const extendedBundle = Array.isArray((_b = (_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) ? product._extend.other.bundle : [];
-  const discountLists = [
-    product == null ? void 0 : product.discount_list,
-    ...productBundle.map((item) => item == null ? void 0 : item.discount_list),
-    ...extendedBundle.map((item) => item == null ? void 0 : item.discount_list)
-  ];
-  return discountLists.some(
-    (discountList) => Array.isArray(discountList) && discountList.some(
-      (item) => (item == null ? void 0 : item.type) === "good_pass" || (item == null ? void 0 : item.tag) === "good_pass"
-    )
-  );
+  const productBundle = Array.isArray(product?.product_bundle) ? product.product_bundle : [];
+  const extendedBundle = Array.isArray(product?._extend?.other?.bundle) ? product._extend.other.bundle : [];
+  const discountLists = [product?.discount_list, ...productBundle.map(item => item?.discount_list), ...extendedBundle.map(item => item?.discount_list)];
+  return discountLists.some(discountList => Array.isArray(discountList) && discountList.some(item => item?.type === 'good_pass' || item?.tag === 'good_pass'));
 }
+
+/**
+ * 不合并商品、商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
+ */
 function getPromotionLineMergeBoundary(product) {
-  var _a, _b;
-  if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
+  if (product?.metadata?.[PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY] === true) {
+    return `separate:${getOrderProductUid(product)}`;
+  }
+  if (product?.product_id === undefined || product?.product_id === null) {
     return `custom:${getOrderProductUid(product)}`;
   }
   if (hasGoodPassDiscount(product)) {
     return `good-pass:${getOrderProductUid(product)}`;
   }
-  if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
+  if (Number(product?.product_sku?.open_sold_weight || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;
   }
-  if (((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_edit_for_runtime) !== true)
-    return "";
+  if (product?.metadata?.is_edit_for_runtime !== true) return '';
   return `edit:${getOrderProductUid(product)}`;
 }
 function isPersistedGeneratedVoucher(product) {
-  const orderDetailId = (product == null ? void 0 : product.order_detail_id) ?? (product == null ? void 0 : product.orderDetailId);
-  if (orderDetailId === void 0 || orderDetailId === null || orderDetailId === "") {
+  const orderDetailId = product?.order_detail_id ?? product?.orderDetailId;
+  if (orderDetailId === undefined || orderDetailId === null || orderDetailId === '') {
     return false;
   }
-  const metadata = (product == null ? void 0 : product.metadata) || {};
-  return (product == null ? void 0 : product.extension_type) === "product_voucher" || metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  const metadata = product?.metadata || {};
+  return product?.extension_type === 'product_voucher' || metadata.parent_order_detail_id !== undefined || metadata.gift_card_type !== undefined;
 }
 function getProductBundleForEvaluator(product) {
-  const bundles = Array.isArray(product == null ? void 0 : product.product_bundle) ? product.product_bundle : [];
-  return bundles.map((b) => ({
-    product_id: (b == null ? void 0 : b.bundle_product_id) ?? (b == null ? void 0 : b._bundle_product_id) ?? (b == null ? void 0 : b.product_id),
-    product_variant_id: (b == null ? void 0 : b.bundle_variant_id) ?? (b == null ? void 0 : b.product_variant_id) ?? 0,
-    quantity: Number((b == null ? void 0 : b.num) ?? (b == null ? void 0 : b.quantity) ?? 1) || 1,
-    price: Number((b == null ? void 0 : b.bundle_selling_price) ?? (b == null ? void 0 : b.price) ?? 0) || 0,
-    original_price: Number((b == null ? void 0 : b.original_price) ?? (b == null ? void 0 : b.product_price) ?? (b == null ? void 0 : b.price) ?? 0) || 0,
-    id: (b == null ? void 0 : b.bundle_id) ?? (b == null ? void 0 : b.id) ?? 0,
-    _bundle_product_id: (b == null ? void 0 : b._bundle_product_id) ?? (b == null ? void 0 : b.bundle_product_id) ?? (b == null ? void 0 : b.product_id)
+  const bundles = Array.isArray(product?.product_bundle) ? product.product_bundle : [];
+  return bundles.map(b => ({
+    product_id: b?.bundle_product_id ?? b?._bundle_product_id ?? b?.product_id,
+    product_variant_id: b?.bundle_variant_id ?? b?.product_variant_id ?? 0,
+    quantity: Number(b?.num ?? b?.quantity ?? 1) || 1,
+    price: Number(b?.bundle_selling_price ?? b?.price ?? 0) || 0,
+    original_price: Number(b?.original_price ?? b?.product_price ?? b?.price ?? 0) || 0,
+    id: b?.bundle_id ?? b?.id ?? 0,
+    _bundle_product_id: b?._bundle_product_id ?? b?.bundle_product_id ?? b?.product_id
   }));
 }
+
+/**
+ * 促销评估前合并同 SKU 拆分行（含促销/原价行），避免加购后仅前 2 件享受优惠。
+ * 带 `booking_uid` 的预约行不参与合并（每次加车独立 booking + 商品行）。
+ *
+ * @example
+ * consolidateMainProductsForPromotion([
+ *   { item: promoLineNum2, originalListIndex: 0 },
+ *   { item: regularLineNum2, originalListIndex: 1 },
+ * ]);
+ * // => 单行 num=4，清除 _promotion 后重新评估
+ */
 function buildConsolidateKeyForPromotion(item) {
-  var _a;
-  const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
-    (0, import_utils.getProductSkuOptions)(item),
-    item.product_bundle
-  );
+  const fingerprint = (0, _utils2.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(item), item.product_bundle);
   const noteSignature = getProductLineNoteSignature(item);
   const lineMergeBoundary = getPromotionLineMergeBoundary(item);
-  const bookingUid = (item == null ? void 0 : item.booking_uid) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.booking_uid);
-  const orderDetailId = (item == null ? void 0 : item.order_detail_id) ?? (item == null ? void 0 : item.orderDetailId);
-  if (orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "") {
-    return [
-      item.product_id,
-      item.product_variant_id ?? 0,
-      fingerprint,
-      noteSignature,
-      lineMergeBoundary,
-      String(orderDetailId)
-    ].join("#");
+  const bookingUid = item?.booking_uid ?? item?.metadata?.booking_uid;
+  const orderDetailId = item?.order_detail_id ?? item?.orderDetailId;
+  if (orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '') {
+    return [item.product_id, item.product_variant_id ?? 0, fingerprint, noteSignature, lineMergeBoundary, String(orderDetailId)].join('#');
   }
-  if (bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "") {
-    return [
-      item.product_id,
-      item.product_variant_id ?? 0,
-      fingerprint,
-      noteSignature,
-      lineMergeBoundary,
-      String(bookingUid)
-    ].join("#");
+  if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
+    return [item.product_id, item.product_variant_id ?? 0, fingerprint, noteSignature, lineMergeBoundary, String(bookingUid)].join('#');
   }
-  return [
-    item.product_id,
-    item.product_variant_id ?? 0,
-    fingerprint,
-    noteSignature,
-    lineMergeBoundary
-  ].join("#");
+  return [item.product_id, item.product_variant_id ?? 0, fingerprint, noteSignature, lineMergeBoundary].join('#');
 }
 function consolidateMainProductsForPromotion(entries) {
   if (!Array.isArray(entries) || entries.length <= 1) {
-    return [...entries || []];
+    return [...(entries || [])];
   }
-  const groups = /* @__PURE__ */ new Map();
-  for (const { item, originalListIndex } of entries) {
+  const groups = new Map();
+  for (const {
+    item,
+    originalListIndex
+  } of entries) {
     const key = buildConsolidateKeyForPromotion(item);
     const wasInPromotion = wasInPromotionBeforeEvaluation(item);
     const existing = groups.get(key);
     if (!existing) {
-      const mergedItem = (0, import_lodash_es.cloneDeep)(item);
+      const mergedItem = (0, _lodashEs.cloneDeep)(item);
       const metadata = mergedItem.metadata || {};
       delete metadata._promotion;
       mergedItem.metadata = metadata;
       if (Array.isArray(mergedItem.product_bundle)) {
         for (const bundle of mergedItem.product_bundle) {
-          if (bundle && typeof bundle === "object")
-            delete bundle._promotion;
+          if (bundle && typeof bundle === 'object') delete bundle._promotion;
         }
       }
       if (wasInPromotion) {
         mergedItem._wasInPromotionBeforeConsolidate = true;
       }
-      groups.set(key, { item: mergedItem, originalListIndex });
+      groups.set(key, {
+        item: mergedItem,
+        originalListIndex
+      });
       continue;
     }
-    existing.item.num = (0, import_utils2.getSafeProductNum)(
-      Number(existing.item.num || 0) + Number(item.num || 0)
-    );
+    existing.item.num = (0, _utils2.getSafeProductNum)(Number(existing.item.num || 0) + Number(item.num || 0));
     if (wasInPromotion) {
       existing.item._wasInPromotionBeforeConsolidate = true;
     }
   }
   return Array.from(groups.values());
 }
+
+/**
+ * X件Y元 整组凑满时按每组 x 件拆开展示（4 件 → 2 行各 2 件 $10）。
+ *
+ * @example
+ * splitXItemsPromoLinesByGroup(mergedLines, strategyActionMap);
+ */
 function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
-  var _a;
   const result = [];
   for (const line of lines) {
-    const promo = (_a = line == null ? void 0 : line.metadata) == null ? void 0 : _a._promotion;
-    if (!(promo == null ? void 0 : promo.inPromotion) || !promo.strategyId) {
+    const promo = line?.metadata?._promotion;
+    if (!promo?.inPromotion || !promo.strategyId) {
       result.push(line);
       continue;
     }
@@ -503,44 +525,53 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
       continue;
     }
     const actionMeta = strategyActionMap.get(promo.strategyId);
-    const detail = (actionMeta == null ? void 0 : actionMeta.actionDetail) ?? promo.actionDetail;
-    const x = Number(detail == null ? void 0 : detail.x);
+    const detail = actionMeta?.actionDetail ?? promo.actionDetail;
+    const x = Number(detail?.x);
     const num = Number(line.num || 0);
-    const isCumulative = (detail == null ? void 0 : detail.cumulative) !== false;
+    const isCumulative = detail?.cumulative !== false;
     if (!isCumulative || !Number.isFinite(x) || x <= 0 || num <= x || num % x !== 0) {
       result.push(line);
       continue;
     }
     const groupCount = num / x;
     for (let i = 0; i < groupCount; i++) {
-      const splitLine = (0, import_lodash_es.cloneDeep)(line);
-      splitLine.num = (0, import_utils2.getSafeProductNum)(x);
+      const splitLine = (0, _lodashEs.cloneDeep)(line);
+      splitLine.num = (0, _utils2.getSafeProductNum)(x);
       splitLine.metadata = {
-        ...splitLine.metadata || {},
-        unique_identification_number: (0, import_utils.createUuidV4)()
+        ...(splitLine.metadata || {}),
+        unique_identification_number: (0, _utils.createUuidV4)()
       };
       result.push(splitLine);
     }
   }
   return result;
 }
+
+/** 生成新 numeric id（仅用于评估器内部追踪） */
 function generateNumericId() {
-  return Math.floor(Math.random() * 1e9) + Date.now();
+  return Math.floor(Math.random() * 1_000_000_000) + Date.now();
 }
 function isBookingEditProductLine(product) {
-  return (product == null ? void 0 : product.booking_id) !== void 0 && (product == null ? void 0 : product.booking_id) !== null && product.booking_id !== 0 && product.booking_id !== "0";
+  return product?.booking_id !== undefined && product?.booking_id !== null && product.booking_id !== 0 && product.booking_id !== '0';
 }
+
+/**
+ * 把 OrderProduct 转成 evaluator 的 PromotionProduct（仅评估期使用）。
+ *
+ * 注意：评估器是「无状态、按 product_id + variant 组」工作的；这里给每行分配一个
+ * numericId 用于关联回原 OrderProduct（通过 originalItemMap）。
+ */
 function convertToPromotionProduct(product, index) {
-  const metadata = (product == null ? void 0 : product.metadata) || {};
+  const metadata = product?.metadata || {};
   const numericId = generateNumericId();
   const originalItem = product;
   return {
     id: numericId,
-    product_id: Number((product == null ? void 0 : product.product_id) ?? 0) || 0,
-    product_variant_id: Number((product == null ? void 0 : product.product_variant_id) ?? 0) || 0,
-    name: metadata.product_name || (product == null ? void 0 : product.title) || "",
+    product_id: Number(product?.product_id ?? 0) || 0,
+    product_variant_id: Number(product?.product_variant_id ?? 0) || 0,
+    name: metadata.product_name || product?.title || '',
     price: getOrderProductOriginalPriceForPromotion(product),
-    quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
+    quantity: Number(product?.num ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
     _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
@@ -548,35 +579,55 @@ function convertToPromotionProduct(product, index) {
     _originalIndex: index
   };
 }
+
+// ============================================
+// 主流程：processCartPromotion
+// ============================================
+
+/**
+ * 计算赠品差异化操作（toAdd / toReduce / toRemove）。
+ *
+ * 与 legacy `calculateGiftActions` 等价；唯一差别是行键从 `_id` 改成 `metadata.unique_identification_number`。
+ */
 function calculateGiftActions(gifts, existingGifts) {
-  var _a, _b, _c;
   const toAdd = [];
   const toReduce = [];
   const toRemove = [];
-  const existingByStrategy = /* @__PURE__ */ new Map();
+
+  // 按 strategyId 分组现有赠品
+  const existingByStrategy = new Map();
   for (const gift of existingGifts) {
-    const strategyId = (_a = getGiftInfo(gift)) == null ? void 0 : _a.strategyId;
-    if (!strategyId)
-      continue;
+    const strategyId = getGiftInfo(gift)?.strategyId;
+    if (!strategyId) continue;
     const existing = existingByStrategy.get(strategyId);
-    const qty = Number((gift == null ? void 0 : gift.num) ?? 1) || 1;
+    const qty = Number(gift?.num ?? 1) || 1;
     if (existing) {
       existing.items.push(gift);
       existing.totalQuantity += qty;
     } else {
-      existingByStrategy.set(strategyId, { items: [gift], totalQuantity: qty });
+      existingByStrategy.set(strategyId, {
+        items: [gift],
+        totalQuantity: qty
+      });
     }
   }
-  const processedStrategyIds = /* @__PURE__ */ new Set();
+  const processedStrategyIds = new Set();
   for (const giftInfo of gifts) {
-    const { strategyId, strategyName, giftCount, giftOptions, sourceProductIds } = giftInfo;
+    const {
+      strategyId,
+      strategyName,
+      giftCount,
+      giftOptions,
+      sourceProductIds
+    } = giftInfo;
     processedStrategyIds.add(strategyId);
     const existing = existingByStrategy.get(strategyId);
-    const existingCount = (existing == null ? void 0 : existing.totalQuantity) ?? 0;
+    const existingCount = existing?.totalQuantity ?? 0;
     const diff = giftCount - existingCount;
     if (diff > 0) {
-      const lastEvaluated = (_c = getGiftInfo((_b = existing == null ? void 0 : existing.items) == null ? void 0 : _b[0])) == null ? void 0 : _c.lastEvaluatedGiftCount;
-      const strategyChanged = lastEvaluated === void 0 || giftCount !== lastEvaluated;
+      // 判断「用户手动减赠品」: 若评估器的 giftCount 没变，diff>0 说明是手动减，跳过补回
+      const lastEvaluated = getGiftInfo(existing?.items?.[0])?.lastEvaluatedGiftCount;
+      const strategyChanged = lastEvaluated === undefined || giftCount !== lastEvaluated;
       if (strategyChanged) {
         toAdd.push({
           strategyId,
@@ -587,102 +638,127 @@ function calculateGiftActions(gifts, existingGifts) {
         });
       }
     } else if (diff < 0) {
+      // 减赠品：后进先出
       let remaining = Math.abs(diff);
       const reduceItems = [];
       const removeIds = [];
-      const reversed = [...(existing == null ? void 0 : existing.items) || []].reverse();
+      const reversed = [...(existing?.items || [])].reverse();
       for (const giftItem of reversed) {
-        if (remaining <= 0)
-          break;
+        if (remaining <= 0) break;
         const uid = getOrderProductUid(giftItem);
-        const qty = Number((giftItem == null ? void 0 : giftItem.num) ?? 1) || 1;
+        const qty = Number(giftItem?.num ?? 1) || 1;
         if (qty <= remaining) {
           removeIds.push(uid);
           remaining -= qty;
         } else {
-          reduceItems.push({ uid, currentQuantity: qty, newQuantity: qty - remaining });
+          reduceItems.push({
+            uid,
+            currentQuantity: qty,
+            newQuantity: qty - remaining
+          });
           remaining = 0;
         }
       }
-      if (reduceItems.length > 0)
-        toReduce.push({ strategyId, items: reduceItems });
+      if (reduceItems.length > 0) toReduce.push({
+        strategyId,
+        items: reduceItems
+      });
       toRemove.push(...removeIds);
     }
   }
+
+  // 失效策略的赠品：全部 remove
   for (const [strategyId, existing] of existingByStrategy) {
-    if (processedStrategyIds.has(strategyId))
-      continue;
+    if (processedStrategyIds.has(strategyId)) continue;
     for (const giftItem of existing.items) {
       toRemove.push(getOrderProductUid(giftItem));
     }
   }
-  return { toAdd, toReduce, toRemove };
+  return {
+    toAdd,
+    toReduce,
+    toRemove
+  };
 }
+
+/**
+ * 从策略配置的 product_match 规则提取可参与商品列表。
+ *
+ * @example
+ * extractProductMatchIdentifiersFromStrategyConfig(strategyConfig);
+ * // => [{ product_id: 60736, product_variant_id: 0 }]
+ */
 function extractProductMatchIdentifiersFromStrategyConfig(strategyConfig) {
-  var _a;
-  const rules = (_a = strategyConfig == null ? void 0 : strategyConfig.conditions) == null ? void 0 : _a.rules;
-  if (!Array.isArray(rules))
-    return [];
+  const rules = strategyConfig?.conditions?.rules;
+  if (!Array.isArray(rules)) return [];
   for (const rule of rules) {
-    if ((rule == null ? void 0 : rule.field) === "productIdAndVariantId" && ((rule == null ? void 0 : rule.operator) === "product_match" || (rule == null ? void 0 : rule.operator) === "object_in") && Array.isArray(rule == null ? void 0 : rule.value)) {
-      return rule.value.map((item) => ({
-        product_id: Number(item == null ? void 0 : item.product_id) || 0,
-        product_variant_id: Number(item == null ? void 0 : item.product_variant_id) || 0
-      })).filter((item) => item.product_id > 0);
+    if (rule?.field === 'productIdAndVariantId' && (rule?.operator === 'product_match' || rule?.operator === 'object_in') && Array.isArray(rule?.value)) {
+      return rule.value.map(item => ({
+        product_id: Number(item?.product_id) || 0,
+        product_variant_id: Number(item?.product_variant_id) || 0
+      })).filter(item => item.product_id > 0);
     }
   }
   return [];
 }
+
+/**
+ * 解析策略凑单所需件数（evaluator 原始返回可能不含 requiredQuantity）。
+ *
+ * @example
+ * resolveStrategyRequiredQuantity({ actionType: 'X_ITEMS_FOR_Y_PRICE', actionDetail: { x: 2 } });
+ */
 function resolveStrategyRequiredQuantity(matched) {
   const preset = Number(matched.requiredQuantity);
-  if (Number.isFinite(preset) && preset > 0)
-    return preset;
+  if (Number.isFinite(preset) && preset > 0) return preset;
   const detail = matched.actionDetail || {};
-  if (matched.actionType === "X_ITEMS_FOR_Y_PRICE") {
+  if (matched.actionType === 'X_ITEMS_FOR_Y_PRICE') {
     return Number(detail.x) || 2;
   }
-  if (matched.actionType === "BUY_X_GET_Y_FREE") {
+  if (matched.actionType === 'BUY_X_GET_Y_FREE') {
     return Number(detail.buyQuantity) || 1;
   }
-  if (matched.actionType === "ITEM_REWARD") {
+  if (matched.actionType === 'ITEM_REWARD') {
     return Number(detail.triggerQuantity) || 1;
   }
   return 1;
 }
+
+/**
+ * 解析 Browse Items 弹窗候选商品（优先 eligibleProducts，否则读 strategyConfig）。
+ *
+ * @example
+ * resolveStrategyEligibleProducts(matchedStrategy);
+ */
 function resolveStrategyEligibleProducts(matched) {
   if (Array.isArray(matched.eligibleProducts) && matched.eligibleProducts.length > 0) {
     return matched.eligibleProducts;
   }
   return extractProductMatchIdentifiersFromStrategyConfig(matched.strategyConfig);
 }
+
+/**
+ * 计算未满足促销条件（用于购物车底部「再买 N 件即可享受 XX」alert）。
+ *
+ * 数据源：商品的 `metadata._promotion.inPromotion === false`（来自 processCartPromotion
+ * 第 8 步追加的「有适用策略但当前未参与促销」标记）。
+ */
 function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts) {
-  var _a, _b;
-  const unfulfilledMap = /* @__PURE__ */ new Map();
+  const unfulfilledMap = new Map();
   for (let i = 0; i < processedProducts.length; i++) {
     const product = processedProducts[i];
-    const promotion = (_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a._promotion;
-    if (!promotion || promotion.inPromotion !== false)
-      continue;
+    const promotion = product?.metadata?._promotion;
+    if (!promotion || promotion.inPromotion !== false) continue;
     const strategyId = promotion.strategyId;
-    if (!strategyId)
-      continue;
-    const lookupUid = String(
-      (product == null ? void 0 : product._originalProductUid) ?? ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.unique_identification_number) ?? ""
-    );
-    const originalIndex = mainProducts.findIndex(
-      (item) => getOrderProductUid(item) === lookupUid
-    );
-    if (originalIndex === -1)
-      continue;
+    if (!strategyId) continue;
+    const lookupUid = String(product?._originalProductUid ?? product?.metadata?.unique_identification_number ?? '');
+    const originalIndex = mainProducts.findIndex(item => getOrderProductUid(item) === lookupUid);
+    if (originalIndex === -1) continue;
     const strategyData = applicableStrategiesResult[originalIndex];
-    if (!strategyData || !strategyData.hasApplicableStrategy)
-      continue;
-    const matched = strategyData.applicableStrategies.find(
-      (s) => s.strategyId === strategyId
-    );
-    if (!matched)
-      continue;
-    const quantity = Number((product == null ? void 0 : product.num) ?? 1) || 1;
+    if (!strategyData || !strategyData.hasApplicableStrategy) continue;
+    const matched = strategyData.applicableStrategies.find(s => s.strategyId === strategyId);
+    if (!matched) continue;
+    const quantity = Number(product?.num ?? 1) || 1;
     if (unfulfilledMap.has(strategyId)) {
       unfulfilledMap.get(strategyId).currentQuantity += quantity;
     } else {
@@ -703,32 +779,47 @@ function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesR
   for (const data of unfulfilledMap.values()) {
     const needQuantity = data.requiredQuantity - data.currentQuantity;
     if (needQuantity > 0) {
-      result.push({ ...data, needQuantity });
+      result.push({
+        ...data,
+        needQuantity
+      });
     }
   }
   return result;
 }
+
+/**
+ * 给商品列表追加促销标签（写入 `metadata._promotionTags`），供 ProductCard 渲染。
+ *
+ * - 没有适用策略的商品会清除 `_promotionTags`（避免脏数据）。
+ * - 仅基于 product_id 匹配（matchVariant=false），与商品卡通用场景对齐。
+ *
+ * @example
+ * const list = appendPromotionTags(catalog, evaluator);
+ * // list[i].metadata._promotionTags = [{ text, type, strategyId }]
+ */
 function appendPromotionTags(products, evaluator) {
   if (!Array.isArray(products) || products.length === 0 || !evaluator) {
     return products || [];
   }
+
+  // 评估器期望的 product shape，最少字段集
   const evaluatorInput = products.map((item, index) => ({
     id: index,
-    product_id: Number((item == null ? void 0 : item.id) ?? (item == null ? void 0 : item.product_id) ?? 0) || 0,
-    product_variant_id: Number((item == null ? void 0 : item.product_variant_id) ?? 0) || 0,
-    name: (item == null ? void 0 : item.title) || (item == null ? void 0 : item.name) || "",
-    price: Number((item == null ? void 0 : item.price) ?? 0) || 0,
-    quantity: Number((item == null ? void 0 : item.quantity) ?? 1) || 1,
+    product_id: Number(item?.id ?? item?.product_id ?? 0) || 0,
+    product_variant_id: Number(item?.product_variant_id ?? 0) || 0,
+    name: item?.title || item?.name || '',
+    price: Number(item?.price ?? 0) || 0,
+    quantity: Number(item?.quantity ?? 1) || 1,
     bundle: []
   }));
-  const strategies = evaluator.getProductsApplicableStrategies(
-    { products: evaluatorInput },
-    false
-  );
+  const strategies = evaluator.getProductsApplicableStrategies({
+    products: evaluatorInput
+  }, false);
   return products.map((item, index) => {
     const data = strategies[index];
     const tags = [];
-    if (data == null ? void 0 : data.hasApplicableStrategy) {
+    if (data?.hasApplicableStrategy) {
       for (const strategy of data.applicableStrategies) {
         if (strategy.display) {
           tags.push({
@@ -739,28 +830,60 @@ function appendPromotionTags(products, evaluator) {
         }
       }
     }
+    // 商品卡兼容两种位置：顶层 `_promotionTags` 与 `metadata._promotionTags`
+    // ProductCard 现有实现读顶层（详见 productSelect/ProductCard/index.tsx），
+    // 此处同时写顶层以保持视图直连；OrderProduct 行版本走 metadata（避免顶层非协议字段）。
     if (tags.length === 0) {
-      const { _promotionTags, ...rest } = item;
+      const {
+        _promotionTags,
+        ...rest
+      } = item;
+      void _promotionTags;
       return rest;
     }
-    return { ...item, _promotionTags: tags };
+    return {
+      ...item,
+      _promotionTags: tags
+    };
   });
 }
+
+/**
+ * 处理购物车的促销计算与赠品差异化。
+ *
+ * 流程：
+ * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
+ *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
+ * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
+ * 3. 把 PricedProduct 映射回 OrderProduct 形态：
+ *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`
+ *    - 拆分的，生成新 uid，复制原行其它字段
+ * 4. 计算 `_giftInfo` 挂主商品（每个策略首个主商品）
+ * 5. 计算 `giftActions`（toAdd / toReduce / toRemove）
+ * 6. 计算 `unfulfilledPromotions`
+ *
+ * @example
+ * const { products, giftActions, unfulfilledPromotions } = processCartPromotion(
+ *   tempOrder.products,
+ *   evaluator,
+ * );
+ */
 function processCartPromotion(list, evaluator, options) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
   const empty = {
     products: Array.isArray(list) ? [...list] : [],
     totalDiscount: 0,
     gifts: [],
-    giftActions: { toAdd: [], toReduce: [], toRemove: [] },
+    giftActions: {
+      toAdd: [],
+      toReduce: [],
+      toRemove: []
+    },
     unfulfilledPromotions: []
   };
-  if (!list || list.length === 0 || !evaluator)
-    return empty;
-  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(
-    evaluator,
-    ITEM_REWARD
-  );
+  if (!list || list.length === 0 || !evaluator) return empty;
+
+  // 0. 分类
+  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(evaluator, ITEM_REWARD);
   const mainProductsWithIndex = [];
   const existingGiftsWithIndex = [];
   const editProductsWithIndex = [];
@@ -768,38 +891,54 @@ function processCartPromotion(list, evaluator, options) {
     const item = list[i];
     const giftInfo = getGiftInfo(item);
     if (isPersistedGeneratedVoucher(item)) {
-      editProductsWithIndex.push({ item, originalListIndex: i });
+      editProductsWithIndex.push({
+        item,
+        originalListIndex: i
+      });
     } else if (giftInfo) {
-      existingGiftsWithIndex.push({ item, originalListIndex: i });
+      existingGiftsWithIndex.push({
+        item,
+        originalListIndex: i
+      });
     } else if (isBookingEditProductLine(item)) {
       if (shouldIncludeEditProductsForItemReward) {
-        mainProductsWithIndex.push({ item, originalListIndex: i });
+        mainProductsWithIndex.push({
+          item,
+          originalListIndex: i
+        });
       } else {
-        editProductsWithIndex.push({ item, originalListIndex: i });
+        editProductsWithIndex.push({
+          item,
+          originalListIndex: i
+        });
       }
     } else {
-      mainProductsWithIndex.push({ item, originalListIndex: i });
+      mainProductsWithIndex.push({
+        item,
+        originalListIndex: i
+      });
     }
   }
-  const consolidatedMainProductsWithIndex = consolidateMainProductsForPromotion(
-    mainProductsWithIndex
-  );
-  const mainProducts = consolidatedMainProductsWithIndex.map((x) => x.item);
-  const existingGifts = existingGiftsWithIndex.map((x) => x.item);
+  const consolidatedMainProductsWithIndex = consolidateMainProductsForPromotion(mainProductsWithIndex);
+  const mainProducts = consolidatedMainProductsWithIndex.map(x => x.item);
+  const existingGifts = existingGiftsWithIndex.map(x => x.item);
   if (mainProducts.length === 0) {
-    const editProducts = editProductsWithIndex.map((x) => x.item);
+    const editProducts = editProductsWithIndex.map(x => x.item);
     if (existingGifts.length > 0) {
       const toRemove = [];
       for (const gift of existingGifts) {
         const uid = getOrderProductUid(gift);
-        if (uid)
-          toRemove.push(uid);
+        if (uid) toRemove.push(uid);
       }
       return {
         products: editProducts,
         totalDiscount: 0,
         gifts: [],
-        giftActions: { toAdd: [], toReduce: [], toRemove },
+        giftActions: {
+          toAdd: [],
+          toReduce: [],
+          toRemove
+        },
         unfulfilledPromotions: []
       };
     }
@@ -808,93 +947,109 @@ function processCartPromotion(list, evaluator, options) {
       products: editProducts.length > 0 ? editProducts : [...list]
     };
   }
+
+  // 1. 转 PromotionProduct
   const promotionProducts = [];
-  const originalItemMap = /* @__PURE__ */ new Map();
-  const productsForStrategies = consolidatedMainProductsWithIndex.map(({ item }, i) => {
-    var _a2;
-    return {
-      id: i,
-      product_id: Number((item == null ? void 0 : item.product_id) ?? 0) || 0,
-      product_variant_id: Number((item == null ? void 0 : item.product_variant_id) ?? 0) || 0,
-      name: ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.product_name) || (item == null ? void 0 : item.title) || "",
-      price: getOrderProductBasePrice(item),
-      quantity: Number((item == null ? void 0 : item.num) ?? 1) || 1,
-      bundle: getProductBundleForEvaluator(item),
-      _promotionOnlyForItemReward: isBookingEditProductLine(item)
-    };
-  });
+  const originalItemMap = new Map();
+  const productsForStrategies = consolidatedMainProductsWithIndex.map(({
+    item
+  }, i) => ({
+    id: i,
+    product_id: Number(item?.product_id ?? 0) || 0,
+    product_variant_id: Number(item?.product_variant_id ?? 0) || 0,
+    name: item?.metadata?.product_name || item?.title || '',
+    price: getOrderProductBasePrice(item),
+    quantity: Number(item?.num ?? 1) || 1,
+    bundle: getProductBundleForEvaluator(item),
+    _promotionOnlyForItemReward: isBookingEditProductLine(item)
+  }));
   for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
-    const { item, originalListIndex } = consolidatedMainProductsWithIndex[i];
+    const {
+      item,
+      originalListIndex
+    } = consolidatedMainProductsWithIndex[i];
     const promotionProduct = convertToPromotionProduct(item, originalListIndex);
     promotionProducts.push(promotionProduct);
-    originalItemMap.set(promotionProduct.id, { item, index: originalListIndex });
+    originalItemMap.set(promotionProduct.id, {
+      item,
+      index: originalListIndex
+    });
   }
+
+  // 2. 拿适用策略
   const applicableStrategiesResult = evaluator.getProductsApplicableStrategies({
     products: productsForStrategies,
-    channel: options == null ? void 0 : options.channel
+    channel: options?.channel
   });
-  const strategyActionMap = /* @__PURE__ */ new Map();
+  const strategyActionMap = new Map();
   for (const row of applicableStrategiesResult || []) {
-    for (const strategy of (row == null ? void 0 : row.applicableStrategies) || []) {
-      if (!(strategy == null ? void 0 : strategy.strategyId))
-        continue;
+    for (const strategy of row?.applicableStrategies || []) {
+      if (!strategy?.strategyId) continue;
       strategyActionMap.set(strategy.strategyId, {
         actionType: strategy.actionType,
         actionDetail: strategy.actionDetail
       });
     }
   }
+
+  // 3. 评估器
   const result = evaluator.evaluateCartWithPricing({
     products: promotionProducts,
-    channel: options == null ? void 0 : options.channel
+    channel: options?.channel
   });
-  const strategySourceProductIds = /* @__PURE__ */ new Map();
+
+  // 4. 收集每个策略的 sourceProductIds（参与策略的主商品 uid）
+  const strategySourceProductIds = new Map();
   for (const priced of result.products) {
     if (priced.inPromotion && priced.strategyId) {
       const sourceId = priced.originalId ?? priced.id;
       const originalData = originalItemMap.get(sourceId);
       if (originalData) {
         const uid = getOrderProductUid(originalData.item);
-        if (!uid)
-          continue;
+        if (!uid) continue;
         const arr = strategySourceProductIds.get(priced.strategyId) || [];
-        if (!arr.includes(uid))
-          arr.push(uid);
+        if (!arr.includes(uid)) arr.push(uid);
         strategySourceProductIds.set(priced.strategyId, arr);
       }
     }
   }
-  const extendedGifts = result.gifts.map((gift) => ({
+
+  // 5. 扩展 gifts，加 sourceProductIds
+  const extendedGifts = result.gifts.map(gift => ({
     ...gift,
     sourceProductIds: strategySourceProductIds.get(gift.strategyId) || []
   }));
-  const strategyGiftInfoMap = /* @__PURE__ */ new Map();
-  for (const gift of extendedGifts)
-    strategyGiftInfoMap.set(gift.strategyId, gift);
-  const strategyGiftInfoOwner = /* @__PURE__ */ new Map();
+
+  // 6. PricedProduct → OrderProduct（含拆分与价格调整）
+  const strategyGiftInfoMap = new Map();
+  for (const gift of extendedGifts) strategyGiftInfoMap.set(gift.strategyId, gift);
+  const strategyGiftInfoOwner = new Map();
   const processedProducts = [];
   for (const priced of result.products) {
     const rawSourceId = priced.originalId ?? priced.id;
     const sourceId = Number(rawSourceId);
-    const originalData = Number.isFinite(sourceId) ? originalItemMap.get(sourceId) : void 0;
-    if (!originalData)
-      continue;
-    const { item: originalItem, index: originalIndex } = originalData;
+    const originalData = Number.isFinite(sourceId) ? originalItemMap.get(sourceId) : undefined;
+    if (!originalData) continue;
+    const {
+      item: originalItem,
+      index: originalIndex
+    } = originalData;
     const pricedProductId = Number(priced.product_id ?? 0);
     const originalProductId = Number(originalItem.product_id ?? 0);
     if (pricedProductId > 0 && originalProductId > 0 && pricedProductId !== originalProductId) {
       continue;
     }
-    const newItem = (0, import_lodash_es.cloneDeep)(originalItem);
+    const newItem = (0, _lodashEs.cloneDeep)(originalItem);
     const metadata = newItem.metadata || {};
-    const sourceCartNum = (0, import_utils2.getSafeProductNum)(originalItem.num);
+    const sourceCartNum = (0, _utils2.getSafeProductNum)(originalItem.num);
     newItem._sourceCartNum = sourceCartNum;
+
+    // 清掉历史促销字段
     const wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
     delete metadata._promotion;
     if (Array.isArray(newItem.product_bundle)) {
       for (const b of newItem.product_bundle) {
-        if (b && typeof b === "object")
-          delete b._promotion;
+        if (b && typeof b === 'object') delete b._promotion;
       }
     }
     const originalBasePrice = getOrderProductOriginalPriceForPromotion(originalItem);
@@ -902,30 +1057,33 @@ function processCartPromotion(list, evaluator, options) {
     const priceUnchangedPromo = priced.inPromotion && Number(priced.finalPrice) === Number(originalBasePrice);
     if (shouldModifyPrice) {
       if (priced.inPromotion && !priceUnchangedPromo) {
-        const promoUnitPrice = new import_decimal.default(priced.finalPrice).toDecimalPlaces(2).toFixed(2);
+        const promoUnitPrice = new _decimal.default(priced.finalPrice).toDecimalPlaces(2).toFixed(2);
         applyPromoUnitPriceToLine(newItem, {
           promoUnitPrice,
           originalBasePrice,
-          strategyTitle: (_a = priced.strategyMetadata) == null ? void 0 : _a.name,
-          actionType: priced.strategyId ? (_b = strategyActionMap.get(priced.strategyId)) == null ? void 0 : _b.actionType : void 0
+          strategyTitle: priced.strategyMetadata?.name,
+          actionType: priced.strategyId ? strategyActionMap.get(priced.strategyId)?.actionType : undefined
         });
       } else {
-        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();
-        const sourceRestore = new import_decimal.default(originalBasePrice).toDecimalPlaces(2).toFixed(2);
-        const mainRestore = new import_decimal.default(Number(sourceRestore) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+        // 撤销上一轮促销：还原 selling_price 到 main_product_original_price 派生值
+        const optionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(newItem)).toNumber();
+        const sourceRestore = new _decimal.default(originalBasePrice).toDecimalPlaces(2).toFixed(2);
+        const mainRestore = new _decimal.default(Number(sourceRestore) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         metadata.source_product_price = sourceRestore;
         metadata.main_product_selling_price = mainRestore;
         metadata.price_schema_version = 2;
-        newItem.selling_price = (0, import_utils.composeLinePrice)({
+        newItem.selling_price = (0, _utils.composeLinePrice)({
           mainPrice: mainRestore,
           bundle: newItem.product_bundle
         });
         updatePromotionDiscountList(newItem, null);
       }
     }
-    newItem.num = priced.isSplit ? (0, import_utils2.getSafeProductNum)(priced.quantity) : sourceCartNum;
+    newItem.num = priced.isSplit ? (0, _utils2.getSafeProductNum)(priced.quantity) : sourceCartNum;
+
+    // 拆分行：生成新 uid，复制原行
     if (priced.isSplit) {
-      metadata.unique_identification_number = (0, import_utils.createUuidV4)();
+      metadata.unique_identification_number = (0, _utils.createUuidV4)();
     }
     if (priced.strategyId) {
       const actionMeta = strategyActionMap.get(priced.strategyId);
@@ -935,17 +1093,19 @@ function processCartPromotion(list, evaluator, options) {
         inPromotion: priced.inPromotion,
         originalPrice: originalBasePrice,
         finalPrice: priced.finalPrice,
-        actionType: actionMeta == null ? void 0 : actionMeta.actionType,
-        actionDetail: actionMeta == null ? void 0 : actionMeta.actionDetail
+        actionType: actionMeta?.actionType,
+        actionDetail: actionMeta?.actionDetail
       };
       const bundleIdx = priced.matchedBundleIndex;
-      if (bundleIdx !== void 0 && Array.isArray(newItem.product_bundle) && newItem.product_bundle[bundleIdx]) {
+      if (bundleIdx !== undefined && Array.isArray(newItem.product_bundle) && newItem.product_bundle[bundleIdx]) {
         newItem.product_bundle[bundleIdx]._promotion = promotionInfo;
       } else {
         metadata._promotion = promotionInfo;
       }
     }
     newItem.metadata = metadata;
+
+    // 5.1 第一个参与「买X送Y」策略的主商品，挂 giftInfo
     if (priced.inPromotion && priced.strategyId) {
       const gift = strategyGiftInfoMap.get(priced.strategyId);
       if (gift && Array.isArray(gift.giftOptions) && gift.giftOptions.length > 0 && !strategyGiftInfoOwner.has(priced.strategyId)) {
@@ -955,74 +1115,79 @@ function processCartPromotion(list, evaluator, options) {
           giftOptions: gift.giftOptions
         };
         const bundleIdx = priced.matchedBundleIndex;
-        if (bundleIdx !== void 0 && Array.isArray(newItem.product_bundle) && ((_c = newItem.product_bundle[bundleIdx]) == null ? void 0 : _c._promotion)) {
+        if (bundleIdx !== undefined && Array.isArray(newItem.product_bundle) && newItem.product_bundle[bundleIdx]?._promotion) {
           newItem.product_bundle[bundleIdx]._promotion.giftInfo = giftInfoData;
         } else if (metadata._promotion) {
           metadata._promotion.giftInfo = giftInfoData;
         }
-        strategyGiftInfoOwner.set(
-          priced.strategyId,
-          getOrderProductUid(newItem)
-        );
+        strategyGiftInfoOwner.set(priced.strategyId, getOrderProductUid(newItem));
       }
     }
+
+    // 记录原商品 uid（用于排序与未满足匹配）
     newItem._sortIndex = originalIndex;
     newItem._sortSubIndex = priced.inPromotion ? 0 : 1;
     newItem._originalProductUid = getOrderProductUid(originalItem);
     processedProducts.push(newItem);
   }
-  for (const { item, originalListIndex } of existingGiftsWithIndex) {
+
+  // 7. 赠品/编辑商品原样拼回；同时同步赠品的 sourceProductIds / sourceProductId
+  for (const {
+    item,
+    originalListIndex
+  } of existingGiftsWithIndex) {
     const next = item;
     next._sortIndex = originalListIndex;
     next._sortSubIndex = 0;
-    const strategyId = (_d = getGiftInfo(next)) == null ? void 0 : _d.strategyId;
+    const strategyId = getGiftInfo(next)?.strategyId;
     if (strategyId) {
       const latest = strategyGiftInfoMap.get(strategyId);
       const owner = strategyGiftInfoOwner.get(strategyId);
-      if (latest && ((_e = next.metadata) == null ? void 0 : _e._giftInfo)) {
+      if (latest && next.metadata?._giftInfo) {
         next.metadata._giftInfo.sourceProductIds = latest.sourceProductIds;
       }
-      if (owner && ((_f = next.metadata) == null ? void 0 : _f._giftInfo)) {
+      if (owner && next.metadata?._giftInfo) {
         next.metadata._giftInfo.sourceProductId = owner;
       }
     }
     processedProducts.push(next);
   }
-  for (const { item, originalListIndex } of editProductsWithIndex) {
+  for (const {
+    item,
+    originalListIndex
+  } of editProductsWithIndex) {
     const next = item;
     next._sortIndex = originalListIndex;
     next._sortSubIndex = 0;
     processedProducts.push(next);
   }
+
+  // 8. 排序回原顺序，参与促销的拆分行排在前
   processedProducts.sort((a, b) => {
-    if (a._sortIndex !== b._sortIndex)
-      return a._sortIndex - b._sortIndex;
+    if (a._sortIndex !== b._sortIndex) return a._sortIndex - b._sortIndex;
     return a._sortSubIndex - b._sortSubIndex;
   });
+
+  // 8.1 同款参与促销行：先去重（买赠+满减并存）再合并 num
   const dedupedPromotionLines = dedupePromotionProcessedLines(processedProducts);
   processedProducts.splice(0, processedProducts.length, ...dedupedPromotionLines);
   const mergedPromotionLines = mergeIdenticalPromotionCartLines(processedProducts);
   processedProducts.splice(0, processedProducts.length, ...mergedPromotionLines);
   const splitPromoLines = splitXItemsPromoLinesByGroup(processedProducts, strategyActionMap);
   processedProducts.splice(0, processedProducts.length, ...splitPromoLines);
+
+  // 9. 给「有适用策略但未参与促销」的主商品打 inPromotion:false
   for (const product of processedProducts) {
     const metadata = product.metadata || {};
-    if (metadata._promotion)
-      continue;
-    if (getGiftInfo(product))
-      continue;
+    if (metadata._promotion) continue;
+    if (getGiftInfo(product)) continue;
     const lookupUid = String(product._originalProductUid ?? getOrderProductUid(product));
-    const originalIndex = mainProducts.findIndex(
-      (item) => getOrderProductUid(item) === lookupUid
-    );
-    if (originalIndex === -1)
-      continue;
+    const originalIndex = mainProducts.findIndex(item => getOrderProductUid(item) === lookupUid);
+    if (originalIndex === -1) continue;
     const strategyData = applicableStrategiesResult[originalIndex];
-    if (!strategyData || !strategyData.hasApplicableStrategy)
-      continue;
+    if (!strategyData || !strategyData.hasApplicableStrategy) continue;
     const first = strategyData.applicableStrategies[0];
-    if (!first)
-      continue;
+    if (!first) continue;
     const originalPrice = getOrderProductOriginalPriceForPromotion(mainProducts[originalIndex]);
     metadata._promotion = {
       strategyId: first.strategyId,
@@ -1033,21 +1198,24 @@ function processCartPromotion(list, evaluator, options) {
     };
     product.metadata = metadata;
   }
+
+  // 10. 赠品操作（在更新 lastEvaluatedGiftCount 前做对比）
   const giftActions = calculateGiftActions(extendedGifts, existingGifts);
+
+  // 10.1 更新 lastEvaluatedGiftCount，便于下次评估时判别「策略已变」
   for (const gift of existingGifts) {
-    const strategyId = (_g = getGiftInfo(gift)) == null ? void 0 : _g.strategyId;
-    if (!strategyId)
-      continue;
+    const strategyId = getGiftInfo(gift)?.strategyId;
+    if (!strategyId) continue;
     const latest = strategyGiftInfoMap.get(strategyId);
-    if (latest && ((_h = gift.metadata) == null ? void 0 : _h._giftInfo)) {
+    if (latest && gift.metadata?._giftInfo) {
       gift.metadata._giftInfo.lastEvaluatedGiftCount = latest.giftCount;
     }
   }
-  const unfulfilledPromotions = calculateUnfulfilledPromotions(
-    processedProducts,
-    applicableStrategiesResult,
-    mainProducts
-  );
+
+  // 11. 未满足促销
+  const unfulfilledPromotions = calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts);
+
+  // 12. 清理排序辅助字段
   for (const product of processedProducts) {
     delete product._sortIndex;
     delete product._sortSubIndex;
@@ -1062,18 +1230,4 @@ function processCartPromotion(list, evaluator, options) {
     giftActions,
     unfulfilledPromotions
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  appendPromotionTags,
-  buildConsolidateKeyForPromotion,
-  calculateUnfulfilledPromotions,
-  extractProductMatchIdentifiersFromStrategyConfig,
-  getOrderProductBasePrice,
-  getOrderProductOriginalPriceForPromotion,
-  getOrderProductUid,
-  mergeIdenticalPromotionCartLines,
-  processCartPromotion,
-  resolveStrategyEligibleProducts,
-  resolveStrategyRequiredQuantity
-});
+}