@pisell/pisellos 2.2.263 → 2.2.264

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

@@ -77,19 +77,43 @@ function getOrderProductOriginalPriceForPromotion(product) {
   }
   return getOrderProductBasePrice(product);
 }
-function updatePromotionDiscountList(item, promotionDiscount) {
+var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
+var 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;
+}
+function isManagedPromotionDiscountItem(item) {
+  if ((item == null ? void 0 : item.type) === "promotion")
+    return true;
+  return isItemRewardPromotionDiscountItem(item);
+}
+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);
+}
+function updatePromotionDiscountList(item, promotionDiscount, options) {
   let discountList = Array.isArray(item.discount_list) ? [...item.discount_list] : [];
-  discountList = discountList.filter((d) => (d == null ? void 0 : d.type) !== "promotion");
+  discountList = discountList.filter((d) => !isManagedPromotionDiscountItem(d));
   if (promotionDiscount) {
+    const discountType = (options == null ? void 0 : options.discountType) || "promotion";
     discountList.push({
-      type: "promotion",
+      type: discountType,
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
         fixed_amount: promotionDiscount.fixed_amount,
         title: promotionDiscount.title,
         resource_id: ""
-      }
+      },
+      ...discountType === "product" ? {
+        metadata: {
+          source: "promotion",
+          actionType: (options == null ? void 0 : options.actionType) || ITEM_REWARD
+        }
+      } : {}
     });
   }
   if (discountList.length > 0) {
@@ -98,7 +122,15 @@ function updatePromotionDiscountList(item, promotionDiscount) {
     delete item.discount_list;
   }
 }
-var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
+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)
+  );
+}
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
   const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
@@ -125,6 +157,9 @@ function applyPromoUnitPriceToLine(item, input) {
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
+    }, {
+      actionType: input.actionType,
+      discountType: input.actionType === ITEM_REWARD ? "product" : "promotion"
     });
   } else {
     updatePromotionDiscountList(item, null);
@@ -179,7 +214,6 @@ function mergeIdenticalPromotionCartLines(products) {
       promotion.finalPrice ?? ((_c = line.metadata) == null ? void 0 : _c.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 = [
@@ -187,7 +221,6 @@ function mergeIdenticalPromotionCartLines(products) {
       line.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
-      lineMergeBoundary,
       bookingUid ? String(bookingUid) : "",
       orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "" ? String(orderDetailId) : "",
       promotion.strategyId,
@@ -331,12 +364,6 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
-function getPromotionLineMergeBoundary(product) {
-  var _a;
-  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.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 === "") {
@@ -364,7 +391,6 @@ function buildConsolidateKeyForPromotion(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 !== "") {
@@ -373,7 +399,6 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
-      lineMergeBoundary,
       String(orderDetailId)
     ].join("#");
   }
@@ -383,7 +408,6 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
-      lineMergeBoundary,
       String(bookingUid)
     ].join("#");
   }
@@ -391,19 +415,17 @@ function buildConsolidateKeyForPromotion(item) {
     item.product_id,
     item.product_variant_id ?? 0,
     fingerprint,
-    noteSignature,
-    lineMergeBoundary
+    noteSignature
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {
-  var _a, _b;
   if (!Array.isArray(entries) || entries.length <= 1) {
     return [...entries || []];
   }
   const groups = /* @__PURE__ */ new Map();
   for (const { item, originalListIndex } of entries) {
     const key = buildConsolidateKeyForPromotion(item);
-    const wasInPromotion = ((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true;
+    const wasInPromotion = wasInPromotionBeforeEvaluation(item);
     const existing = groups.get(key);
     if (!existing) {
       const mergedItem = (0, import_lodash_es.cloneDeep)(item);
@@ -469,6 +491,9 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
 function generateNumericId() {
   return Math.floor(Math.random() * 1e9) + 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";
+}
 function convertToPromotionProduct(product, index) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const numericId = generateNumericId();
@@ -481,6 +506,7 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
+    _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
@@ -582,6 +608,9 @@ function resolveStrategyRequiredQuantity(matched) {
   if (matched.actionType === "BUY_X_GET_Y_FREE") {
     return Number(detail.buyQuantity) || 1;
   }
+  if (matched.actionType === "ITEM_REWARD") {
+    return Number(detail.triggerQuantity) || 1;
+  }
   return 1;
 }
 function resolveStrategyEligibleProducts(matched) {
@@ -692,6 +721,10 @@ function processCartPromotion(list, evaluator, options) {
   };
   if (!list || list.length === 0 || !evaluator)
     return empty;
+  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(
+    evaluator,
+    ITEM_REWARD
+  );
   const mainProductsWithIndex = [];
   const existingGiftsWithIndex = [];
   const editProductsWithIndex = [];
@@ -702,8 +735,12 @@ function processCartPromotion(list, evaluator, options) {
       editProductsWithIndex.push({ item, originalListIndex: i });
     } else if (giftInfo) {
       existingGiftsWithIndex.push({ item, originalListIndex: i });
-    } else if ((item == null ? void 0 : item.booking_id) !== void 0 && (item == null ? void 0 : item.booking_id) !== null && item.booking_id !== 0 && item.booking_id !== "0") {
-      editProductsWithIndex.push({ item, originalListIndex: i });
+    } else if (isBookingEditProductLine(item)) {
+      if (shouldIncludeEditProductsForItemReward) {
+        mainProductsWithIndex.push({ item, originalListIndex: i });
+      } else {
+        editProductsWithIndex.push({ item, originalListIndex: i });
+      }
     } else {
       mainProductsWithIndex.push({ item, originalListIndex: i });
     }
@@ -746,7 +783,8 @@ function processCartPromotion(list, evaluator, options) {
       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)
+      bundle: getProductBundleForEvaluator(item),
+      _promotionOnlyForItemReward: isBookingEditProductLine(item)
     };
   });
   for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
@@ -815,7 +853,7 @@ function processCartPromotion(list, evaluator, options) {
     const metadata = newItem.metadata || {};
     const sourceCartNum = (0, import_utils2.getSafeProductNum)(originalItem.num);
     newItem._sourceCartNum = sourceCartNum;
-    const wasInPromotion = ((_a = metadata._promotion) == null ? void 0 : _a.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
+    const wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
     delete metadata._promotion;
     if (Array.isArray(newItem.product_bundle)) {
       for (const b of newItem.product_bundle) {
@@ -832,7 +870,8 @@ function processCartPromotion(list, evaluator, options) {
         applyPromoUnitPriceToLine(newItem, {
           promoUnitPrice,
           originalBasePrice,
-          strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
+          strategyTitle: (_a = priced.strategyMetadata) == null ? void 0 : _a.name,
+          actionType: priced.strategyId ? (_b = strategyActionMap.get(priced.strategyId)) == null ? void 0 : _b.actionType : void 0
         });
       } else {
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -2,7 +2,7 @@
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -130,7 +130,7 @@ export interface ISalesDetail {
     customer: ISalesDetailCustomer | null;
     /** 服务端 summary（仅输出） */
     summary: Record<string, any>;
-    /** 规范化后的响应快照，方便 UI 兜底使用 */
+    /** 原始响应快照，方便 UI 兜底使用 */
     raw: Record<string, any>;
 }
 /**
@@ -138,7 +138,7 @@ export interface ISalesDetail {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
+ * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export declare function parseSalesResponse(input: Record<string, any> | null | undefined): ISalesDetail;

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

@@ -22,7 +22,6 @@ __export(parseSalesResponse_exports, {
   parseSalesResponse: () => parseSalesResponse
 });
 module.exports = __toCommonJS(parseSalesResponse_exports);
-var import_orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
 var HEADER_KEYS = [
   "order_id",
   "order_number",
@@ -122,12 +121,14 @@ function indexBookingsByProductUid(bookings) {
   return result;
 }
 function parseSalesResponse(input) {
-  const sourceRaw = input && typeof input === "object" && input.data && input.order_id == null ? input.data : input || {};
-  const raw = (0, import_orderCollectionIdentity.normalizeOrderCollections)(sourceRaw).order;
+  const raw = input && typeof input === "object" && input.data && input.order_id == null ? input.data : input || {};
   const productsRaw = Array.isArray(raw == null ? void 0 : raw.products) ? raw.products : [];
-  const products = productsRaw.map((p) => {
+  const products = productsRaw.map((p, index) => {
     const row = { ...p || {} };
     const metadata = row.metadata && typeof row.metadata === "object" ? { ...row.metadata } : {};
+    if (!metadata.unique_identification_number) {
+      metadata.unique_identification_number = `sales-product-${row.product_id ?? "unknown"}-${row.product_variant_id ?? 0}-${index}`;
+    }
     delete metadata.price_schema_version;
     delete row.identity_key;
     return { ...row, metadata };

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

@@ -50,12 +50,6 @@ function toPriceString(value, fallback = "0.00") {
     return fallback;
   return parsedValue.toFixed(2);
 }
-function isBlankValue(value) {
-  return value === void 0 || value === null || typeof value === "string" && value.trim() === "";
-}
-function firstNonBlank(...values) {
-  return values.find((value) => !isBlankValue(value));
-}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
@@ -204,7 +198,6 @@ function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
-    holder_config: sourceProduct == null ? void 0 : sourceProduct.holder_config,
     ...hasPriceOverride ? {
       price_override: String(payload.price_override),
       is_manual_discount: 1
@@ -243,7 +236,6 @@ function transformBaseProductToOrderProduct(params) {
     metadata,
     note: payload.note != null ? String(payload.note) : "",
     product_title: productTitle,
-    product_cover: firstNonBlank(matchedVariant == null ? void 0 : matchedVariant.cover, sourceProduct == null ? void 0 : sourceProduct.cover),
     _origin: {
       ...sourceProduct || {},
       callbackData: payload

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -341,28 +341,15 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const raw = await this.store.order.scanCode(code, customerId);
-    const scannedList = raw.scannedDiscountList || [];
-    const extractedCustomerId = this.getDiscountCustomerId(scannedList);
-    const hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
-    if (!hasOrderCustomer && extractedCustomerId) {
-      await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
-    }
     if (raw.isAvailable) {
+      await this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList || []);
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
-      const tempOrder = this.store.order.ensureTempOrder();
-      await this.effectsEmit("onDiscountApplied", {
-        productList: tempOrder.products || [],
-        discountList: this.store.order.getDiscountList(),
-        selectedDiscountList: tempOrder.discount_list || [],
-        tempOrder
-      });
     }
     return {
       isAvailable: raw.isAvailable,
       type: raw.type,
-      unavailableReason: raw.unavailableReason,
-      scannedDiscountList: raw.scannedDiscountList
+      unavailableReason: raw.unavailableReason
     };
   }
   async hydrateOrderCustomerFromScanDiscounts(discounts) {
@@ -379,13 +366,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     this.setOrderCustomer(customer);
   }
   getDiscountCustomerId(discounts) {
-    for (const item of discounts) {
-      const topLevelId = Number(item.customer_id);
-      if (Number.isFinite(topLevelId) && topLevelId > 0) {
-        return topLevelId;
-      }
-    }
-    return null;
+    const discount = discounts.find((item) => item.customer_id != null);
+    const customerId = Number(discount == null ? void 0 : discount.customer_id);
+    if (!Number.isFinite(customerId) || customerId <= 0)
+      return null;
+    return customerId;
   }
   async resolveCustomerByDiscountCustomerId(customerId) {
     var _a;
@@ -877,17 +862,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     void ((_a = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _a.call(discountModule, []));
     void ((_b = discountModule == null ? void 0 : discountModule.setDiscountList) == null ? void 0 : _b.call(discountModule, []));
     this.store.order.applyDiscount();
-    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => {
-      var _a2;
-      const tempOrder = this.store.order.ensureTempOrder();
-      this.store.order.persistTempOrder();
-      return this.effectsEmit("onDiscountApplied", {
-        productList: tempOrder.products || [],
-        discountList: ((_a2 = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _a2.call(discountModule)) || [],
-        selectedDiscountList: tempOrder.discount_list || [],
-        tempOrder
-      });
-    }).catch((error) => {
+    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => this.store.order.persistTempOrder()).catch((error) => {
       console.error("Failed to recalculate summary after clearing customer:", error);
     });
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, null);

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

@@ -83,8 +83,6 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
-    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
-    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

package/lib/solution/ScanOrder/index.js

@@ -48,6 +48,10 @@ var import_utils2 = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_itemRule = require("../../model/strategy/adapter/itemRule");
 __reExport(ScanOrder_exports, require("./types"), module.exports);
+function isItemRewardProductDiscount(discount) {
+  var _a, _b;
+  return (discount == null ? void 0 : discount.type) === "product" && ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+}
 var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -742,6 +746,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
+        if ((product.discount_list || []).some(isItemRewardProductDiscount)) {
+          product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
+          continue;
+        }
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;

package/lib/solution/ShopDiscount/index.js

@@ -505,7 +505,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     try {
       const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      const prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -514,7 +514,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...orderId ? { order_id: orderId } : {}
       }));
-      const goodPassList = (prepareConfigResult == null ? void 0 : prepareConfigResult.discountList) || [];
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );

package/lib/solution/VenueBooking/index.js

@@ -65,6 +65,10 @@ var OPEN_DATA_SECTION_CODES = [
   "workflow",
   "checkout"
 ];
+function isItemRewardProductDiscount(discount) {
+  var _a, _b;
+  return (discount == null ? void 0 : discount.type) === "product" && ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
+}
 function cloneCustomDepositData(customDepositData) {
   if (!customDepositData || typeof customDepositData !== "object")
     return void 0;
@@ -1339,6 +1343,10 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
+        if ((product.discount_list || []).some(isItemRewardProductDiscount)) {
+          product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
+          continue;
+        }
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;

package/package.json

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

package/dist/model/strategy/adapter/dataVariant/adapter.d.ts

@@ -1,50 +0,0 @@
-import type { EvaluationResult, RuntimeContext } from '../../type';
-import type { BusinessAdapter } from '../type';
-import type { DataVariantBusinessData, DataVariantProduct } from './type';
-/**
- * Data Variant 适配器。
- *
- * 负责把智能定价运行态数据转换为 StrategyEngine 能识别的 attributes。
- */
-export declare class DataVariantAdapter implements BusinessAdapter {
-    name: string;
-    version: string;
-    /**
-     * 准备批量全局上下文。
-     *
-     * 这里只放不依赖单个商品的字段，用于预计算 schedule/channel/orderType 等条件。
-     */
-    prepareContext(businessData: DataVariantBusinessData): RuntimeContext;
-    /**
-     * 准备全局预计算上下文。
-     */
-    prepareGlobalContext(businessData: DataVariantBusinessData): RuntimeContext;
-    /**
-     * 准备单商品上下文。
-     *
-     * 商品级条件只在当前商品 data_variants 引用到对应规则后才评估。
-     */
-    prepareProductContext(businessData: DataVariantBusinessData, product: DataVariantProduct): RuntimeContext;
-    transformResult(result: EvaluationResult): EvaluationResult;
-    formatConfig(result: EvaluationResult, businessData?: DataVariantBusinessData): {
-        result: EvaluationResult;
-        businessData?: DataVariantBusinessData;
-    };
-    /**
-     * 构建 menu_match 使用的轻量商品对象。
-     *
-     * collection_ids 来自商品 collection 字段，避免 operator 读取复杂商品对象。
-     */
-    buildProductValue(product: DataVariantProduct): {
-        id: number;
-        product_variant_id: number;
-        collection_ids: number[];
-    };
-    private toNumber;
-    /**
-     * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
-     */
-    private normalizeCustomerId;
-    private normalizeNumberArray;
-}
-export default DataVariantAdapter;