@pisell/pisellos 2.2.260 → 2.2.261

package/lib/model/strategy/adapter/promotion/examples.d.ts

@@ -136,3 +136,89 @@ export declare const BUY_X_GET_Y_FREE_STRATEGY: {
         };
     }[];
 };
+/**
+ * ITEM_REWARD 策略配置示例：儿童票触发婴儿票免费
+ *
+ * 业务规则：
+ * - 条件商品：儿童票（conditions.rules.productIdAndVariantId）
+ * - 奖励商品：购物车/订单内已经存在的婴儿票（actions[0].config.rewardTargets）
+ * - 本 action 不自动新增婴儿票；每次购物车变更后由统一促销链路重算
+ *
+ * 字段说明：
+ * - type: "ITEM_REWARD" 表示商品奖励 action
+ * - target: "product" 表示本期只奖励商品行
+ * - config.rewardTargets: 奖励对象数组，支持 { product_id, product_variant_id }
+ * - config.targetSelection: "consumer_best" 表示目标商品超额时选择节省金额最高的商品
+ * - value.rewardMethod:
+ *   - "free": 目标商品最终价为 0
+ *   - "percent_off": 百分比折扣，rewardValue 为 0-100
+ *   - "amount_off": 每个目标商品固定减免 rewardValue
+ *   - "fixed_price": 目标商品最终单价为 rewardValue
+ * - value.quantityRule:
+ *   - "per_condition_quantity": 每满足 triggerQuantity 个条件商品，奖励 rewardQuantity 个目标商品
+ *   - "all_targets": 满足条件后奖励全部目标商品
+ *   - "max_per_order": 满足条件后每单最多奖励 maxRewardQuantity 个目标商品
+ */
+export declare const ITEM_REWARD_STRATEGY: {
+    metadata: {
+        id: string;
+        name: {
+            en: string;
+            'zh-CN': string;
+            'zh-HK': string;
+        };
+        type: string;
+        custom: {
+            display: {
+                product_card: {
+                    text: {
+                        en: string;
+                        'zh-CN': string;
+                        'zh-HK': string;
+                    };
+                    type: string;
+                };
+            };
+        };
+    };
+    conditions: {
+        operator: string;
+        rules: ({
+            type: string;
+            field: string;
+            value: string;
+            operator: string;
+        } | {
+            type: string;
+            field: string;
+            value: {
+                product_id: number;
+                product_variant_id: number;
+            }[];
+            operator: string;
+        })[];
+        actionIds: string[];
+    };
+    actions: {
+        id: string;
+        type: string;
+        value: {
+            rewardMethod: string;
+            rewardValue: number;
+            quantityRule: string;
+            triggerQuantity: number;
+            rewardQuantity: number;
+            maxRewardQuantity: number;
+        };
+        valueType: string;
+        target: string;
+        priority: number;
+        config: {
+            rewardTargets: {
+                product_id: number;
+                product_variant_id: number;
+            }[];
+            targetSelection: string;
+        };
+    }[];
+};

package/lib/model/strategy/adapter/promotion/examples.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var examples_exports = {};
 __export(examples_exports, {
   BUY_X_GET_Y_FREE_STRATEGY: () => BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY: () => ITEM_REWARD_STRATEGY,
   X_ITEMS_FOR_Y_PRICE_STRATEGY: () => X_ITEMS_FOR_Y_PRICE_STRATEGY
 });
 module.exports = __toCommonJS(examples_exports);
@@ -185,8 +186,98 @@ var BUY_X_GET_Y_FREE_STRATEGY = {
     }
   ]
 };
+var ITEM_REWARD_STRATEGY = {
+  metadata: {
+    id: "STRATEGY_003",
+    name: {
+      en: "Infant ticket free with child ticket",
+      "zh-CN": "儿童票触发婴儿票免费",
+      "zh-HK": "兒童票觸發嬰兒票免費"
+    },
+    type: "promotion",
+    custom: {
+      display: {
+        product_card: {
+          text: {
+            en: "Infant ticket free",
+            "zh-CN": "婴儿票免费",
+            "zh-HK": "嬰兒票免費"
+          },
+          type: "tag"
+        }
+      }
+    }
+  },
+  conditions: {
+    operator: "and",
+    rules: [
+      {
+        type: "operator",
+        field: "currentDateTime",
+        value: "2023-01-01 00:00:00",
+        operator: ">="
+      },
+      {
+        type: "operator",
+        field: "currentDateTime",
+        value: "2030-01-01 00:00:00",
+        operator: "<="
+      },
+      {
+        type: "operator",
+        field: "productIdAndVariantId",
+        value: [
+          {
+            product_id: 1001,
+            // 条件商品：儿童票
+            product_variant_id: 0
+            // 0 = 匹配任意变体
+          }
+        ],
+        operator: "product_match"
+      }
+    ],
+    actionIds: ["1"]
+  },
+  actions: [
+    {
+      id: "1",
+      type: "ITEM_REWARD",
+      value: {
+        rewardMethod: "free",
+        // free | percent_off | amount_off | fixed_price
+        rewardValue: 0,
+        // free 可省略；其他 rewardMethod 使用
+        quantityRule: "per_condition_quantity",
+        // per_condition_quantity | all_targets | max_per_order
+        triggerQuantity: 1,
+        // N：每满足 N 个条件商品
+        rewardQuantity: 1,
+        // Y：奖励 Y 个目标商品
+        maxRewardQuantity: 1
+        // max_per_order 使用；本例保留为配置示意
+      },
+      valueType: "object",
+      target: "product",
+      priority: 1,
+      config: {
+        rewardTargets: [
+          {
+            product_id: 2001,
+            // 奖励对象：婴儿票
+            product_variant_id: 0
+            // 0 = 匹配任意变体
+          }
+        ],
+        targetSelection: "consumer_best"
+        // consumer_best = 按可节省金额从高到低选择
+      }
+    }
+  ]
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY,
   X_ITEMS_FOR_Y_PRICE_STRATEGY
 });

package/lib/model/strategy/adapter/promotion/index.d.ts

@@ -1,4 +1,4 @@
 export { PromotionEvaluator } from './evaluator';
 export { PromotionAdapter } from './adapter';
 export { default } from './adapter';
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, } from './examples';
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY, } from './examples';

package/lib/model/strategy/adapter/promotion/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var promotion_exports = {};
 __export(promotion_exports, {
   BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
   PromotionAdapter: () => import_adapter.PromotionAdapter,
   PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
   X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
@@ -43,6 +44,7 @@ var import_examples = require("./examples");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BUY_X_GET_Y_FREE_STRATEGY,
+  ITEM_REWARD_STRATEGY,
   PromotionAdapter,
   PromotionEvaluator,
   X_ITEMS_FOR_Y_PRICE_STRATEGY

package/lib/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/lib/model/strategy/adapter/promotion/type.js

@@ -28,6 +28,8 @@ 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",
   /** 固定减价 */

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -142,6 +142,14 @@ function resolveMainProductPrice(product, fallback) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map((item) => {
+    return {
+      ...item,
+      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+    };
+  });
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -191,7 +199,9 @@ function buildCacheItemFromOrderLine(input) {
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
-    bundle: Array.isArray(product.product_bundle) ? [...product.product_bundle] : []
+    bundle: mapOrderBundleToOtherBundle(
+      Array.isArray(product.product_bundle) ? product.product_bundle : []
+    )
   };
   const extend = {
     start_date: startDate ? (0, import_dayjs.default)(startDate) : void 0,

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

@@ -154,10 +154,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private getLastOrderDepositSnapshot;
+    private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
+    private applyLastOrderDepositSnapshot;
     private isDepositOrder;
     private getOrderExpectedAmount;
     private isDepositCovered;
+    getPaymentCompletion(payments?: OrderPaymentSource[]): {
+        isFullyPaid: boolean;
+        isOrderFullyPaid: boolean;
+        isDepositFullyPaid: boolean;
+        paymentStage: 'deposit' | 'normal';
+        depositAmount: string;
+        orderExpectedAmount: string;
+    };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
     private normalizePaymentSource;
@@ -186,6 +197,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;
@@ -219,6 +231,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * const ids = this.collectBookingHolderRecords(booking);
      */
     private collectBookingHolderRecords;
+    private setProductHolderFromBooking;
+    private syncLinkedBookingHoldersToProducts;
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
      *
@@ -301,13 +315,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
+    private confirmPendingVoucherPaymentsInList;
+    private discardPendingVoucherPaymentsFromList;
+    private prepareVoucherPaymentsForSubmit;
+    private applyPaymentLifecycleChange;
+    confirmPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
+    discardPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
     /**
      * 覆盖当前订单中的 wallet pass 支付项。
      *
      * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
      * 视为 wallet pass；其它支付项保持不变。
      */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -407,6 +435,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
@@ -418,6 +447,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private runSubmitTempOrder;
@@ -431,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;
@@ -497,5 +527,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
+    getVouchers(): any[];
 }
 export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';