@pisell/pisellos 2.1.171 → 2.1.172

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

@@ -1,9 +1,4 @@
 import { CartItem } from '../Cart/types';
-import type { ScanOrderTempOrder, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary } from '../../solution/ScanOrder/types';
-import type { DiscountModule } from '../Discount';
-import type { RulesModule } from '../Rules';
-import type { Discount } from '../Discount/types';
-import type { SubmitPayloadEnhancer } from './utils';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -11,20 +6,6 @@ export declare enum OrderHooks {
     OnOrderStatusChange = "order:onOrderStatusChange"
 }
 export interface OrderState {
-    tempOrder: ScanOrderTempOrder | null;
-    discountList: any[];
-    discount: DiscountModule | null;
-    rules: RulesModule | null;
-    availableWalletIds?: number[];
-}
-/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
-export interface UpdateProductInOrderParams {
-    product_id: number | null;
-    product_variant_id: number;
-    updates: Partial<ScanOrderOrderProduct>;
-    identity_key?: string;
-    product_option_item?: any[];
-    product_bundle?: any[];
 }
 /**
  * 订单信息
@@ -39,126 +20,6 @@ export interface CommitOrderParams {
         business_code?: string;
     };
 }
-export interface SubmitScanOrderProduct {
-    order_detail_id: number | null;
-    product_id: number | null;
-    num: number;
-    product_variant_id: number;
-    product_option_item: any[];
-    /**
-     * 行 composite 券后单价。
-     * 公式：`metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
-     * 主商品（含 option、含主商品折扣）的单价存在 `metadata.main_product_selling_price`。
-     */
-    selling_price: string;
-    /**
-     * 行 composite 券前单价。
-     * 公式：`metadata.main_product_original_price` + Σ(bundle 原价 × num)。
-     * 主商品（含 option、不含折扣）的单价存在 `metadata.main_product_original_price`。
-     */
-    original_price: string;
-    /** 出站兼容字段，直接由 `selling_price` 派生，语义同 composite。 */
-    payment_price: string;
-    tax_fee: string;
-    is_charge_tax: number;
-    discount_list: any[];
-    product_bundle: any[];
-    metadata: Record<string, any>;
-    /** 商品行备注 */
-    note?: string;
-}
-export interface SubmitScanOrderSummary {
-    product_quantity: number;
-    product_original_amount: string;
-    product_amount: string;
-    product_expect_amount: string;
-    product_tax_fee: string;
-    shipping_fee: string;
-    shipping_tax_fee: string;
-    tax_fee: string;
-    surcharge_fee: string;
-    discount_amount: string;
-    deposit_amount: string;
-    expect_amount: string;
-    total_amount: string;
-    amount_gap: string;
-    rounding_amount: string;
-    pay_service_charge_amount: string;
-}
-export interface SubmitScanOrderBooking {
-    relation_id?: string;
-    form_id?: string;
-    collect_pax?: number;
-    start_time?: string;
-    end_time?: string;
-    metadata?: Record<string, any>;
-    resources?: Array<Record<string, any>>;
-    product_uid?: string;
-}
-export interface SubmitScanOrderFormRecord {
-    form_id: number | string;
-    form_record_id: number | string;
-}
-export interface SubmitScanOrderParams {
-    url?: string;
-    query: {
-        order_id: number | null;
-        relation_id?: string;
-        table_form_id?: string;
-        resource_id?: string;
-        order_number: string;
-        shop_order_number: string;
-        type: string;
-        business_code: string;
-        platform: 'H5' | 'PC';
-        request_unique_idempotency_token?: string;
-        sales_channel: string;
-        order_sales_channel: string;
-        status: string;
-        payment_status: string;
-        shipping_status: string;
-        customer_id: number | null;
-        customer_name: string;
-        country_calling_code: string;
-        phone: string;
-        email: string;
-        is_price_include_tax: number;
-        tax_title: string;
-        tax_country_code: string;
-        currency_code: string;
-        currency_symbol: string;
-        currency_format: string;
-        is_deposit: number;
-        deposit_amount: string;
-        shop_discount: string;
-        surcharge_fee: string;
-        note: string;
-        delivery_type?: string;
-        table_number?: Record<string, any>;
-        schedule_date: string;
-        created_at?: string;
-        products: SubmitScanOrderProduct[];
-        bookings: SubmitScanOrderBooking[];
-        payments: any[];
-        surcharges?: any[];
-        discount_list: any[];
-        relation_forms: any[];
-        form_record_ids?: SubmitScanOrderFormRecord[];
-        contacts: any[];
-        contacts_info: any[];
-        holder: Record<string, any> | null;
-        summary?: SubmitScanOrderSummary;
-        metadata: Record<string, any>;
-    };
-}
-export interface ScanOrderMoreParams {
-    url?: string;
-    query: {
-        order_id: number | string;
-        products: SubmitScanOrderProduct[];
-        request_unique_idempotency_token?: string;
-    };
-}
 /**
  * 支付项数据
  */
@@ -202,11 +63,23 @@ export interface CheckoutOrderParams {
  * 订单模块 API
  */
 export interface OrderModuleAPI {
+    /**
+     * 创建订单
+     * @param params 订单信息
+     * @returns 订单信息
+     */
     createOrder: (params: CommitOrderParams['query']) => any;
+    /**
+     * 检查购物车提交订单前是否符合条件
+     */
     checkBeforeSubmitOrder: (params: {
         cartItems: CartItem[];
         type: 'holder' | 'account';
     }) => boolean;
+    /**
+     * 提交订单
+     * @param params 订单信息
+     */
     submitOrder: (params: CommitOrderParams) => Promise<void>;
     /**
      * Checkout 专用：创建订单到后端
@@ -214,41 +87,4 @@ export interface OrderModuleAPI {
      * @returns 后端返回的订单数据
      */
     createOrderByCheckout: (params: CheckoutOrderParams) => Promise<any>;
-    submitScanOrder: <T = any>(params: SubmitScanOrderParams) => Promise<T>;
-    scanOrderMore: <T = any>(params: ScanOrderMoreParams) => Promise<T>;
-    initTempOrder: (params: {
-        cacheId?: string;
-        salesSummaryModuleName?: string;
-    }) => void;
-    getTempOrder: () => ScanOrderTempOrder | null;
-    ensureTempOrder: () => ScanOrderTempOrder;
-    addNewOrder: () => Promise<ScanOrderTempOrder>;
-    restoreOrder: () => ScanOrderTempOrder;
-    getOrderProducts: () => ScanOrderOrderProduct[];
-    getScanOrderSummary: () => Promise<ScanOrderSummary>;
-    recalculateSummary: (options?: {
-        createIfMissing?: boolean;
-    }) => Promise<ScanOrderSummary | null>;
-    updateTempOrderNote: (note: string) => string;
-    updateTempOrderBuzzer: (buzzer: string) => string;
-    updateTempOrderContactsInfo: (contactsInfo: any[]) => any[];
-    addProductToOrder: (product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<ScanOrderOrderProduct[]>;
-    removeProductFromOrder: (identity: ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
-    persistTempOrder: () => void;
-    submitTempOrder: <T = any>(params?: {
-        cacheId?: string;
-        platform?: string;
-        businessCode?: string;
-        channel?: string;
-        type?: string;
-        enhancePayload?: SubmitPayloadEnhancer;
-    }) => Promise<T>;
-    loadDiscountConfig: (params: {
-        customerId: number;
-        action?: 'create';
-    }) => Promise<void>;
-    getDiscountList: () => Discount[];
-    getAvailableWalletIds: () => number[];
-    applyDiscount: () => void;
 }

package/dist/modules/Order/types.js

@@ -6,8 +6,6 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
   return OrderHooks;
 }({});
 
-/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
-
 /**
  * 订单信息
  */

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

@@ -1,70 +1,4 @@
-import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
-import type { ScanOrderSubmitPayload, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
-import type { RulesParamsHooks } from '../Rules/types';
-/**
- * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
- *
- * 新语义 v2 约定：
- * - `mainPrice` 必须是**已经包含 option 的主商品单价**（即 `metadata.main_product_selling_price`
- *   或 `metadata.main_product_original_price`），option 价格不由本函数叠加。
- * - 套餐价：Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? bundle.quantity ?? 1))
- *   当 `useOriginalBundle=true` 时，改用 `bundle.original_price ?? bundle.product_price ?? bundle.price`。
- * - 返回值：保留 2 位小数的字符串，方便直接写回 `selling_price` / `original_price` 字段。
- *
- * 被 `normalizeOrderProduct`、Rules setProduct 钩子、各 Solution 的 setDiscountSelected 共用，
- * 保证合成逻辑单点来源。
- */
-export declare function composeLinePrice(params: {
-    mainPrice: string | number | null | undefined;
-    bundle?: Array<{
-        bundle_selling_price?: any;
-        price?: any;
-        num?: any;
-        quantity?: any;
-        original_price?: any;
-        product_price?: any;
-    }> | null;
-    useOriginalBundle?: boolean;
-}): string;
-/**
- * 计算 option 单价合计：Σ(option.price × option.num)。
- * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
- */
-export declare function sumOptionUnitPrice(options?: Array<{
-    price?: any;
-    num?: any;
-}> | null): Decimal;
-/**
- * OrderModule 默认 Rules 钩子工厂。
- *
- * 价格语义约定（订单域，v2 composite 口径）：
- * - `selling_price`：券后 **行 composite 单价**
- *   = `metadata.main_product_selling_price` + Σ(bundle_selling_price × num)。
- * - `original_price`：券前 **行 composite 单价**
- *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
- * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
- *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
- * - `payment_price`：出站 payload 中由 `selling_price` 派生以兼容后端（composite）。
- *
- * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
- * - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**
- *   （`metadata.source_product_price`）。Rules 内部 `getProductTotalPrice` /
- *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
- * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
- *   total（source + option + bundle）对齐。
- * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
- *   优先级：
- *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
- *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
- *     3. `values.total / num`（仅当 Rules 只给出总价时的兜底）
- *
- * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
- */
-export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem
@@ -87,55 +21,3 @@ export declare const mergeRelationForms: (relationForms: {
     form_record_ids: number[];
 }[];
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
-export declare function createUuidV4(): string;
-export declare function isTempOrder(data: any): data is ScanOrderTempOrder;
-export declare function formatDateTime(date: Date): string;
-export declare function normalizeSubmitBooking<T extends {
-    metadata?: Record<string, any>;
-}>(booking: T): T;
-/** 提交用人数：有限且为正则向下取整，否则为 1 */
-export declare function normalizeSubmitCollectPaxValue(value: unknown): number;
-/** 从临时订单 metadata 解析合成 booking 的 collect_pax */
-export declare function resolveSubmitCollectPax(tempOrder: ScanOrderTempOrder): number;
-export declare function createDefaultTempOrder(params: {
-    now: string;
-    summary?: ScanOrderSummary;
-}): ScanOrderTempOrder;
-export interface SubmitPayloadEnhancerContext {
-    tempOrder: ScanOrderTempOrder;
-    bookingUuid: string;
-    now: Date;
-}
-export type SubmitPayloadEnhancer = (payload: ScanOrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => ScanOrderSubmitPayload;
-export declare function buildSubmitPayload(params: {
-    tempOrder: ScanOrderTempOrder;
-    cacheId?: string;
-    now?: Date;
-    platform?: string;
-    businessCode?: string;
-    channel?: string;
-    type?: string;
-    enhance?: SubmitPayloadEnhancer;
-}): ScanOrderSubmitPayload;
-/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
-export declare function filterProductsForScanOrderMore(products: ScanOrderSubmitProduct[]): ScanOrderSubmitProduct[];
-/**
- * 历史 V1 加餐结构映射器。
- *
- * @deprecated 加餐（`PUT /order/order/product/:id`）已改为与正常 checkout 共用
- * `ScanOrderSubmitProduct` 新结构（见 `OrderModule.submitTempOrder` 的加餐分支）。
- * 本函数仅保留以兼容历史接入方，未来会移除。新代码请勿再调用。
- */
-export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
-    bundle: any[];
-    key: number | null;
-    option: any[];
-    product_id: number | null;
-    product_variant_id: number;
-    num: number;
-    note: string;
-    rowKey: number | null;
-    session: null;
-    unique: string;
-}[];
-export { createEmptySummary } from '../../solution/ScanOrder/utils';