@pisell/pisellos 2.2.259 → 2.2.261

package/dist/model/strategy/adapter/promotion/type.d.ts

@@ -12,6 +12,8 @@ export declare const PROMOTION_ACTION_TYPES: {
     readonly X_ITEMS_FOR_Y_PRICE: "X_ITEMS_FOR_Y_PRICE";
     /** 买X送Y（买X件送Y件，可累计） */
     readonly BUY_X_GET_Y_FREE: "BUY_X_GET_Y_FREE";
+    /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
+    readonly ITEM_REWARD: "ITEM_REWARD";
     /** 固定折扣 */
     readonly DISCOUNT_RATE: "DISCOUNT_RATE";
     /** 固定减价 */
@@ -66,6 +68,59 @@ export interface BuyXGetYFreeConfig {
     /** 可选的赠品列表 */
     giftProducts?: ProductIdentifier[];
 }
+/**
+ * 商品奖励优惠方式
+ *
+ * - free: 目标商品最终价为 0
+ * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
+ * - amount_off: 每个目标商品固定减免 rewardValue
+ * - fixed_price: 目标商品改为固定价 rewardValue
+ */
+export type ItemRewardMethod = 'free' | 'percent_off' | 'amount_off' | 'fixed_price';
+/**
+ * 商品奖励数量规则
+ *
+ * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
+ * - all_targets: 满足条件后奖励全部目标商品
+ * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
+ */
+export type ItemRewardQuantityRule = 'per_condition_quantity' | 'all_targets' | 'max_per_order';
+/** 商品奖励目标选择规则 */
+export type ItemRewardTargetSelection = 'consumer_best';
+/**
+ * 商品奖励 - Action Value
+ *
+ * @example
+ * value: {
+ *   rewardMethod: 'free',
+ *   quantityRule: 'per_condition_quantity',
+ *   triggerQuantity: 1,
+ *   rewardQuantity: 1,
+ * }
+ */
+export interface ItemRewardValue {
+    /** 奖励方式 */
+    rewardMethod: ItemRewardMethod;
+    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 可省略 */
+    rewardValue?: number;
+    /** 奖励数量规则 */
+    quantityRule: ItemRewardQuantityRule;
+    /** 每满足 N 个条件商品；默认 1 */
+    triggerQuantity?: number;
+    /** 奖励 Y 个目标商品；默认 1 */
+    rewardQuantity?: number;
+    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
+    maxRewardQuantity?: number;
+}
+/**
+ * 商品奖励 - Action Config
+ */
+export interface ItemRewardConfig {
+    /** 奖励对象，本期支持指定商品/变体；product_variant_id=0 表示任意变体 */
+    rewardTargets?: ProductIdentifier[];
+    /** 目标商品超额时的选择规则；本期支持 consumer_best */
+    targetSelection?: ItemRewardTargetSelection;
+}
 /**
  * 商品标识
  *
@@ -102,10 +157,19 @@ export interface BuyXGetYFreeAction extends Omit<ActionEffect, 'type' | 'value'
     valueType: 'object';
     config?: BuyXGetYFreeConfig;
 }
+/**
+ * 商品奖励 Action
+ */
+export interface ItemRewardAction extends Omit<ActionEffect, 'type' | 'value' | 'config'> {
+    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
+    value: ItemRewardValue;
+    valueType: 'object';
+    config?: ItemRewardConfig;
+}
 /**
  * 促销活动 Action 联合类型
  */
-export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction;
+export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction | ItemRewardAction;
 /**
  * 促销相关运算符
  */
@@ -170,6 +234,8 @@ export interface PromotionProduct {
     quantity: number;
     /** 原价 */
     original_price?: number;
+    /** 内部字段：编辑态订单行只允许参与 ITEM_REWARD，避免旧促销误算历史行 */
+    _promotionOnlyForItemReward?: boolean;
 }
 /**
  * 促销活动适配器转换结果
@@ -195,7 +261,7 @@ export interface PromotionTransformResult {
 /**
  * Action 详情联合类型
  */
-export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail;
+export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail | ItemRewardActionDetail;
 /**
  * X件Y元 Action 详情
  */
@@ -226,6 +292,28 @@ export interface BuyXGetYFreeActionDetail {
     /** 可选的赠品列表 */
     giftProducts: ProductIdentifier[];
 }
+/**
+ * 商品奖励 Action 详情
+ */
+export interface ItemRewardActionDetail {
+    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
+    /** 奖励方式 */
+    rewardMethod: ItemRewardMethod;
+    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 为 0 */
+    rewardValue: number;
+    /** 奖励数量规则 */
+    quantityRule: ItemRewardQuantityRule;
+    /** 每满足 N 个条件商品；默认 1 */
+    triggerQuantity: number;
+    /** 奖励 Y 个目标商品；默认 1 */
+    rewardQuantity: number;
+    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
+    maxRewardQuantity?: number;
+    /** 奖励对象，本期支持指定商品/变体 */
+    rewardTargets: ProductIdentifier[];
+    /** 目标商品超额时的选择规则 */
+    targetSelection: ItemRewardTargetSelection;
+}
 /**
  * X件Y元 - 业务层计算结果
  *

package/dist/model/strategy/adapter/promotion/type.js

@@ -16,6 +16,8 @@ export var PROMOTION_ACTION_TYPES = {
   X_ITEMS_FOR_Y_PRICE: 'X_ITEMS_FOR_Y_PRICE',
   /** 买X送Y（买X件送Y件，可累计） */
   BUY_X_GET_Y_FREE: 'BUY_X_GET_Y_FREE',
+  /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
+  ITEM_REWARD: 'ITEM_REWARD',
   /** 固定折扣 */
   DISCOUNT_RATE: 'DISCOUNT_RATE',
   /** 固定减价 */
@@ -54,6 +56,41 @@ export var PROMOTION_ACTION_TYPES = {
  * 买X送Y - Action Config
  */
 
+/**
+ * 商品奖励优惠方式
+ *
+ * - free: 目标商品最终价为 0
+ * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
+ * - amount_off: 每个目标商品固定减免 rewardValue
+ * - fixed_price: 目标商品改为固定价 rewardValue
+ */
+
+/**
+ * 商品奖励数量规则
+ *
+ * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
+ * - all_targets: 满足条件后奖励全部目标商品
+ * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
+ */
+
+/** 商品奖励目标选择规则 */
+
+/**
+ * 商品奖励 - Action Value
+ *
+ * @example
+ * value: {
+ *   rewardMethod: 'free',
+ *   quantityRule: 'per_condition_quantity',
+ *   triggerQuantity: 1,
+ *   rewardQuantity: 1,
+ * }
+ */
+
+/**
+ * 商品奖励 - Action Config
+ */
+
 // ============================================
 // 商品标识
 // ============================================
@@ -78,6 +115,10 @@ export var PROMOTION_ACTION_TYPES = {
  * 买X送Y Action
  */
 
+/**
+ * 商品奖励 Action
+ */
+
 /**
  * 促销活动 Action 联合类型
  */
@@ -146,6 +187,10 @@ var obj = {
  * 买X送Y Action 详情
  */
 
+/**
+ * 商品奖励 Action 详情
+ */
+
 // ============================================
 // 业务层输出类型（供参考）
 // ============================================

package/dist/modules/Order/index.d.ts

@@ -461,7 +461,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/utils.js

@@ -544,7 +544,8 @@ export function resolveEffectivePerUnitDiscount(product) {
     return sum + Number((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
   }, 0);
   var hasPromoDiscountItem = discountList.some(function (item) {
-    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion';
+    var _item$metadata, _item$metadata2;
+    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion' || (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.d.ts

@@ -36,6 +36,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
+    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -241,6 +241,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function resolveDiscountListForManualOverride(discountList) {
       return this.excludeDiscountListByType(discountList, 'promotion');
     }
+  }, {
+    key: "isItemRewardProductDiscount",
+    value: function isItemRewardProductDiscount(product) {
+      var _product$_promotion;
+      var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+      return (product === null || product === void 0 || (_product$_promotion = product._promotion) === null || _product$_promotion === void 0 ? void 0 : _product$_promotion.actionType) === 'ITEM_REWARD' && discountList.some(function (item) {
+        var _item$metadata, _item$metadata2;
+        return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+      });
+    }
+
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -698,6 +709,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
+        if (_this3.isItemRewardProductDiscount(product)) {
+          return false;
+        }
 
         // 编辑的商品使用了优惠券不可用
         var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
@@ -884,6 +898,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
           var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
@@ -909,7 +924,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -1054,6 +1069,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          if (_this3.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
           if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
@@ -1134,6 +1150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
+        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
           var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
@@ -1145,7 +1162,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
-          if (product.inPromotion) {
+          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
+          if (product.inPromotion && !isItemRewardProductDiscount) {
             isManualDiscount = false;
           }
         } else {
@@ -1255,15 +1273,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
                 var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
                 price: product.price,
-                main_product_selling_price: product.price
-              } : {
+                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
+              }, isItemRewardProductDiscount ? {
+                total: total
+              } : {}) : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
@@ -1704,11 +1724,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   processedItems.forEach(function (item) {
                     // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                     var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata;
+                      var _item$metadata3;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1727,11 +1747,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata2;
+                      var _item$metadata4;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1772,8 +1792,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                var _item$metadata3;
-                return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
+                var _item$metadata5;
+                return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
               });
               if (mainDiscountList && mainDiscountList.length > 0) {
                 var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1846,8 +1866,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  var _item$metadata4;
-                  return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
+                  var _item$metadata6;
+                  return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;

package/dist/solution/BaseSales/utils/cartPromotion.d.ts

@@ -78,6 +78,7 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
+    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -267,7 +268,8 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
+ * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
+ *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`