@pisell/pisellos 2.2.178 → 2.2.180

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

@@ -2,117 +2,15 @@ import { CartItem } from '../Cart/types';
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
-import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
-import type { OrderProductDiscountItem } from '../../server/modules/order/types';
-export type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
     OnOrderCancel = "order:onOrderCancel",
     OnOrderStatusChange = "order:onOrderStatusChange",
-    OnOrderCustomerChange = "order:onOrderCustomerChange",
-    OnPromotionApplied = "order:onPromotionApplied"
-}
-/**
- * 促销评估器协议（OS 与 PromotionEvaluator 之间的桥接接口）。
- *
- * 与 `pisell_os/src/model/strategy/adapter/promotion/evaluator.ts` 中的
- * `PromotionEvaluator` 实例结构保持兼容。SalesSdkProvider 会从 `appHelper.utils.promotionEvaluator`
- * 读取实例并通过 `setPromotionEvaluator` 注入到 OrderModule。
- *
- * 这里只声明 OrderModule 需要调用的子集，避免反向依赖具体 evaluator 实现。
- */
-export interface OrderPromotionEvaluator {
-    evaluateCartWithPricing(input: {
-        products: any[];
-        channel?: string;
-    }): any;
-    getProductsApplicableStrategies(input: {
-        products: any[];
-        channel?: string;
-    }, matchVariant?: boolean): any[];
-}
-/** 赠品解析回调 context（OS → SDK 的请求体） */
-export interface OrderGiftSelectContext {
-    strategyId: string;
-    strategyName: string | Record<string, string>;
-    giftCount: number;
-    giftOptions: Array<{
-        product_id: number;
-        product_variant_id: number;
-    }>;
-    /** 触发此赠品的主商品 metadata.unique_identification_number 列表 */
-    sourceProductIds: string[];
-}
-/**
- * 赠品解析回调签名（SDK → OS 的返回值）。
- *
- * - 单选项：SDK 内部自动构造商品，不弹窗
- * - 多选项：SDK 弹窗等用户确认后构造
- * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
- *
- * 返回的 OrderProduct 必须是完整的购物车行（含 metadata._giftInfo 标记），OS 会直接 push 入 tempOrder.products。
- */
-export type OrderGiftSelectResolver = (ctx: OrderGiftSelectContext) => Promise<Partial<OrderProduct>[] | null>;
-/** 未满足的促销策略（购物车底部 alert 渲染源） */
-export interface OrderUnfulfilledPromotion {
-    strategyId: string;
-    strategyName: string | Record<string, string>;
-    actionType: string;
-    needQuantity: number;
-    currentQuantity: number;
-    requiredQuantity: number;
-    eligibleProducts: Array<{
-        product_id: number;
-        product_variant_id: number;
-    }>;
-    strategyMetadata?: any;
-    display?: {
-        text: string | Record<string, string>;
-        type: string;
-    };
-}
-/** 上一次 applyPromotion 计算出的赠品操作（仅供调试/读取使用） */
-export interface OrderLastGiftActions {
-    toAdd: Array<{
-        strategyId: string;
-        strategyName: string | Record<string, string>;
-        giftCount: number;
-        giftOptions: Array<{
-            product_id: number;
-            product_variant_id: number;
-        }>;
-        sourceProductIds: string[];
-    }>;
-    toReduce: Array<{
-        strategyId: string;
-        items: Array<{
-            uid: string;
-            currentQuantity: number;
-            newQuantity: number;
-        }>;
-    }>;
-    toRemove: string[];
-}
-/** onPromotionApplied 事件 payload */
-export interface OrderPromotionAppliedPayload {
-    unfulfilledPromotions: OrderUnfulfilledPromotion[];
-    giftActions: OrderLastGiftActions;
-    /** evaluator 返回的赠品摘要 */
-    gifts: Array<{
-        strategyId: string;
-        strategyName: string | Record<string, string>;
-        giftCount: number;
-        giftOptions: Array<{
-            product_id: number;
-            product_variant_id: number;
-        }>;
-    }>;
-    /** 处理后的商品列表 */
-    products: OrderProduct[];
+    OnOrderCustomerChange = "order:onOrderCustomerChange"
 }
 /**
  * tempOrder 上的下单客户协议字段视图。
@@ -150,13 +48,6 @@ export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
 }
-export interface OrderScanCodeResult {
-    isAvailable: boolean;
-    discountList: Discount[];
-    scannedDiscountList: Discount[];
-    type: 'server' | 'clientCalc';
-    unavailableReason?: UnavailableReason;
-}
 export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
@@ -175,7 +66,7 @@ export interface OrderProduct extends OrderProductIdentity {
     original_price: string;
     tax_fee: string;
     is_charge_tax: number;
-    discount_list: OrderProductDiscountItem[];
+    discount_list: any[];
     product_bundle: any[];
     booking_uid?: string;
     metadata: Record<string, any>;
@@ -212,14 +103,15 @@ export interface OrderSummary {
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
-    order_number: string | null;
-    shop_order_number: string | null;
-    shop_full_order_number: string | null;
+    order_number: string;
+    shop_order_number: string;
+    shop_full_order_number: string;
     type: string;
-    business_code?: string;
+    business_code: string;
     platform: string;
     sales_channel: string;
     order_sales_channel: string;
+    vouchers: any[];
     status: string;
     payment_status: string;
     shipping_status: string;
@@ -250,7 +142,7 @@ export interface OrderTempOrder {
     bookings: any[];
     payments: any[];
     surcharges: any[];
-    discount_list?: any[];
+    discount_list: any[];
     relation_forms: any[];
     contacts: any[];
     contacts_info: Record<string, any> | null;
@@ -266,7 +158,7 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: Record<string, any>;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'shop_full_order_number'> {
     platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -285,32 +177,16 @@ export interface OrderState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
-export interface ReplaceTempOrderOptions {
-    recalculateSummary?: boolean;
-    persist?: boolean;
-    saveDraft?: boolean;
-}
-export type AddProductBookingInput = Record<string, any>;
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
-export interface UpdateOrderProductParams {
+export interface UpdateProductInOrderParams {
     product_id: number | null;
     product_variant_id: number;
     updates: Partial<OrderProduct>;
     unique_identification_number?: string;
-    identity_key?: string;
     product_option_item?: any[];
     product_bundle?: any[];
-    booking?: AddProductBookingInput;
-}
-/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
-export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
-    num: number;
-    identity_key?: string;
-}
-export interface UpdateOrderBookingParams {
-    unique_identification_number: string;
-    updates: AddProductBookingInput;
 }
+export type AddProductBookingInput = Record<string, any>;
 export interface OrderProductMergeDecisionContext {
     incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
     normalizedIncoming: OrderProduct;
@@ -361,11 +237,10 @@ export interface SubmitSalesOrderParams {
     query: {
         order_id: number | null;
         external_sale_number: string;
-        order_number: string | null;
-        shop_order_number: string | null;
-        shop_full_order_number: string | null;
+        order_number: string;
+        shop_order_number: string;
         type: string;
-        business_code?: string;
+        business_code: string;
         platform: string;
         request_unique_idempotency_token?: string;
         sales_channel: string;
@@ -397,6 +272,7 @@ export interface SubmitSalesOrderParams {
         bookings: OrderSubmitBooking[];
         payments: any[];
         surcharges?: any[];
+        discount_list: any[];
         relation_forms: any[];
         form_record_ids?: OrderSubmitFormRecord[];
         contacts: any[];
@@ -475,7 +351,6 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
-    channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -572,7 +447,6 @@ export interface OrderModuleAPI {
     }) => void;
     getTempOrder: () => OrderTempOrder | null;
     ensureTempOrder: () => OrderTempOrder;
-    replaceTempOrder: (tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions) => Promise<OrderTempOrder>;
     addNewOrder: () => Promise<OrderTempOrder>;
     restoreOrder: () => OrderTempOrder;
     getOrderProducts: () => OrderProduct[];
@@ -585,26 +459,15 @@ export interface OrderModuleAPI {
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
     getTempOrderNote: () => string;
-    updateTempOrderNote: {
-        (note: string): string;
-        (note: string, sync: true): Promise<string>;
-        (note: string, sync: boolean): string | Promise<string>;
-    };
+    updateTempOrderNote: (note: string) => string;
     updateTempOrderShopDiscount: (amount: string | number) => string;
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
-    updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
-    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
-    updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
+    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<OrderProduct[]>;
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
-    setEnableTempOrderPersist: (enabled: boolean) => void;
-    /** @deprecated 固定返回 false；OrderModule 不再负责 tempOrder localStorage 持久化。 */
-    isTempOrderPersistEnabled: () => boolean;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;
@@ -654,52 +517,10 @@ export interface OrderModuleAPI {
     clearOrderCustomer: () => void;
     loadDiscountConfig: (params: {
         customerId: number;
-        action?: 'create' | 'edit';
-        orderId?: number;
-        apply?: boolean;
-    }) => Promise<Discount[]>;
+        action?: 'create';
+    }) => Promise<void>;
     getDiscountList: () => Discount[];
     applyDiscount: () => void;
-    /**
-     * 注入促销评估器。
-     *
-     * SalesSdkProvider 在初始化 bookingTicket 后会自动从 `appHelper.utils.promotionEvaluator`
-     * 读取实例并调用本方法注入。host 透明，业务 UI 不感知。
-     *
-     * @example
-     * order.setPromotionEvaluator(appHelper.utils.promotionEvaluator);
-     */
-    setPromotionEvaluator: (evaluator: OrderPromotionEvaluator | null) => void;
-    /**
-     * 注入赠品选择 resolver。OS 在 applyPromotion 内部当需要新增赠品时会 await 调用 resolver。
-     *
-     * 缺省时 OS 会 `console.warn` 并跳过新增（既有赠品的 reduce/remove 仍会执行）。
-     *
-     * @example
-     * order.setGiftSelectResolver((ctx) => giftSelectBridge.request(ctx));
-     */
-    setGiftSelectResolver: (resolver: OrderGiftSelectResolver | null) => void;
-    /**
-     * 为商品目录追加促销标签。
-     *
-     * @example
-     * const taggedProducts = order.appendPromotionTags(products);
-     */
-    appendPromotionTags: <T extends Record<string, any>>(products: T[]) => T[];
-    /**
-     * 应用购物车促销（评估 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied）。
-     *
-     * 自动在 addProductToOrder / updateOrderProductQuantity / removeProductFromOrder /
-     * clearOrderCartLines / setOrderCustomer 等写路径末尾触发，业务一般无需手动调用。
-     *
-     * 多选项赠品依赖 giftSelectResolver；如未注入则跳过且 console.warn。
-     * 内部以 `_isApplyingPromotion` flag 防递归。
-     */
-    applyPromotion: () => Promise<void>;
-    /** 读取上次 applyPromotion 产出的未满足促销提示 */
-    getUnfulfilledPromotions: () => OrderUnfulfilledPromotion[];
-    /** 读取上次 applyPromotion 产出的赠品操作 diff（toAdd / toReduce / toRemove） */
-    getLastGiftActions: () => OrderLastGiftActions | null;
     /**
    * 取消订单
    * @param params 取消订单参数

package/lib/modules/Order/types.js

@@ -28,7 +28,6 @@ var OrderHooks = /* @__PURE__ */ ((OrderHooks2) => {
   OrderHooks2["OnOrderCancel"] = "order:onOrderCancel";
   OrderHooks2["OnOrderStatusChange"] = "order:onOrderStatusChange";
   OrderHooks2["OnOrderCustomerChange"] = "order:onOrderCustomerChange";
-  OrderHooks2["OnPromotionApplied"] = "order:onPromotionApplied";
   return OrderHooks2;
 })(OrderHooks || {});
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 /**
@@ -65,37 +65,6 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
-/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
-export declare function resolveRulesManualDiscountFlag(metadata: Record<string, any> | null | undefined): boolean | undefined;
-/**
- * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
- * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
- */
-export declare function normalizeOrderProductDiscountList(discountList?: unknown[] | null): OrderProductDiscountItem[];
-/**
- * 手动改价（price_override）时行级 original_price（composite 单价）：
- * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
- * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
- *
- * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
- */
-export declare function resolveManualOverrideLineOriginalPrice(params: {
-    num?: number;
-    metadata?: Record<string, any> | null;
-    /** 已有行级 original_price（origin 被裁剪时兜底划线价） */
-    lineOriginalPrice?: string | number | null;
-}, fallbackCompositeOriginal: string): string;
-/**
- * 计算商品行「每单位有效折扣」：discount_list 合计 + 被 Rules 剥离但仍 inPromotion 的差额。
- *
- * Rules.calcDiscount 会把 type=promotion 从 discount_list 去掉，但 metadata._promotion 仍保留；
- * applyProductDiscountPrices 必须回读 _promotion，否则抬价/降价都会在第二步被 source 原价覆盖。
- *
- * @example
- * resolveEffectivePerUnitDiscount({ metadata: { _promotion: { inPromotion: true, originalPrice: 1, finalPrice: 5 } }, discount_list: [] });
- * // => -4
- */
-export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -171,22 +140,4 @@ export declare function formatV1Product(products: OrderSubmitProduct[]): {
     session: null;
     unique: string;
 }[];
-/**
- * 判断 holder_id 是否已分配（非空）。
- *
- * @example
- * hasAssignedHolderId(12); // true
- * hasAssignedHolderId([]); // false
- */
-export declare function hasAssignedHolderId(value: unknown): boolean;
-/**
- * 清空 tempOrder 购物车行上的 holder 分配（products / bookings / runtime origin）。
- * 移除或更换下单客户时调用，与 booking 页换客户清 holder 行为对齐。
- *
- * @example
- * clearTempOrderHolderAssignments(tempOrder);
- */
-export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrder): boolean;
 export { createEmptySummary } from '../../solution/ScanOrder/utils';
-export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems, } from './utils/manualProductDiscount';
-export type { ManualProductDiscountItem } from './utils/manualProductDiscount';