@pisell/pisellos 2.2.162 → 2.2.164

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

@@ -103,9 +103,9 @@ export interface OrderSummary {
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
-    order_number: string;
-    shop_order_number: string;
-    shop_full_order_number: string;
+    order_number: string | null;
+    shop_order_number: string | null;
+    shop_full_order_number: string | null;
     type: string;
     business_code: string;
     platform: string;
@@ -157,7 +157,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' | 'shop_full_order_number'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer'> {
     platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -176,16 +176,27 @@ 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 UpdateProductInOrderParams {
+export interface UpdateOrderProductParams {
     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;
+}
+export interface UpdateOrderBookingParams {
+    unique_identification_number: string;
+    updates: AddProductBookingInput;
 }
-export type AddProductBookingInput = Record<string, any>;
 export interface OrderProductMergeDecisionContext {
     incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
     normalizedIncoming: OrderProduct;
@@ -236,8 +247,9 @@ export interface SubmitSalesOrderParams {
     query: {
         order_id: number | null;
         external_sale_number: string;
-        order_number: string;
-        shop_order_number: string;
+        order_number: string | null;
+        shop_order_number: string | null;
+        shop_full_order_number: string | null;
         type: string;
         business_code: string;
         platform: string;
@@ -446,6 +458,7 @@ export interface OrderModuleAPI {
     }) => void;
     getTempOrder: () => OrderTempOrder | null;
     ensureTempOrder: () => OrderTempOrder;
+    replaceTempOrder: (tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions) => Promise<OrderTempOrder>;
     addNewOrder: () => Promise<OrderTempOrder>;
     restoreOrder: () => OrderTempOrder;
     getOrderProducts: () => OrderProduct[];
@@ -458,13 +471,18 @@ export interface OrderModuleAPI {
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
     getTempOrderNote: () => string;
-    updateTempOrderNote: (note: string) => string;
+    updateTempOrderNote: {
+        (note: string): string;
+        (note: string, sync: true): Promise<string>;
+        (note: string, sync: boolean): string | Promise<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[]>;
-    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<OrderProduct[]>;
+    updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
+    updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {
@@ -516,8 +534,10 @@ export interface OrderModuleAPI {
     clearOrderCustomer: () => void;
     loadDiscountConfig: (params: {
         customerId: number;
-        action?: 'create';
-    }) => Promise<void>;
+        action?: 'create' | 'edit';
+        orderId?: number;
+        apply?: boolean;
+    }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
     applyDiscount: () => void;
     /**

package/lib/modules/Order/utils.js

@@ -425,9 +425,9 @@ function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: "",
-    order_number: "",
-    shop_order_number: "",
-    shop_full_order_number: "",
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
     type: "appointment_booking",
     business_code: "appointment_booking",
     platform: "h5",
@@ -436,7 +436,7 @@ function createDefaultTempOrder(params) {
     status: "normal",
     payment_status: "payment_processing",
     shipping_status: "unfulfilled",
-    customer_id: null,
+    customer_id: 0,
     customer_name: "",
     country_calling_code: "",
     phone: "",
@@ -496,7 +496,6 @@ function buildSubmitPayload(params) {
     shop_service_type: _shopServiceType,
     start_time: _startTime,
     customer: _customer,
-    shop_full_order_number: _shopFullOrderNumber,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
@@ -506,6 +505,9 @@ function buildSubmitPayload(params) {
   } = tempOrder;
   const payload = {
     ...tempOrderRest,
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
     type: type ?? tempOrder.type ?? "table-order",
@@ -526,7 +528,7 @@ function buildSubmitPayload(params) {
     schedule_date: scheduleDate,
     created_at: tempOrder.created_at || formatDateTime(now),
     bookings: (tempOrder.bookings || []).filter(
-      (booking) => Number(booking.parent_id ?? 0) !== 0
+      (booking) => Number(booking.parent_id) !== 0
     ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     // discount_list: tempOrder.discount_list || [],

package/lib/modules/SalesSummary/index.js

@@ -30,7 +30,8 @@ __reExport(SalesSummary_exports, require("./types"), module.exports);
 var salesSummaryDataKeys = {
   isPriceIncludeTax: "is_price_include_tax",
   taxRate: "tax_rate",
-  taxTitle: "tax_title"
+  taxTitle: "tax_title",
+  taxCountryCode: "tax_country_code"
 };
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -84,7 +85,8 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     return {
       isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
       taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
+      taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
     };
   }
   async getSummary(params) {

package/lib/modules/index.d.ts

@@ -16,3 +16,4 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './BookingContext';

package/lib/modules/index.js

@@ -34,6 +34,7 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
 __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
+__reExport(modules_exports, require("./BookingContext"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -53,5 +54,6 @@ __reExport(modules_exports, require("./OpenData"), module.exports);
   ...require("./Schedule"),
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
-  ...require("./OpenData")
+  ...require("./OpenData"),
+  ...require("./BookingContext")
 });

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

@@ -1,8 +1,8 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesScanCodeResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -11,6 +11,7 @@ import { ProductList } from '../../modules/ProductList';
 import { PaymentModule } from '../../modules/Payment';
 import type { SalesSummaryModule } from '../../modules/SalesSummary';
 import type { ScheduleModule } from '../../modules/Schedule';
+import { QuotationModule } from '../../modules/Quotation';
 import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
 import { type TransformBaseProductToOrderProductParams } from './utils/transformBaseProductToOrderProduct';
 export interface BaseSalesState {
@@ -19,6 +20,7 @@ export interface BaseSalesState {
     payment?: PaymentModule;
     salesSummary?: SalesSummaryModule;
     schedule?: ScheduleModule;
+    quotation?: QuotationModule;
 }
 export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -26,6 +28,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
     private logger;
+    private appPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
     protected cacheId: string | undefined;
@@ -39,7 +42,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
-     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment。
+     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment / quotation。
      */
     protected getRegisteredModuleNames(): readonly string[];
     /**
@@ -55,6 +58,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     private logError;
     get payment(): PaymentModule | undefined;
+    private getCurrentOrderCustomerId;
+    private applyQuotationScheduleResolver;
+    private loadQuotationForPriceQuery;
+    protected getSubmitOrderSalesChannel(): string | undefined;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），
@@ -67,6 +74,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * sessionStorage 损坏时静默忽略，按空状态注册。
      */
     protected readSessionCacheData(): Record<string, any>;
+    private getAppData;
+    private syncAppDataToTempOrder;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     /**
@@ -91,27 +100,47 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getPayments(): ISalesPayment[];
     /** 获取附加费用（运费/服务费/税费等）。 */
     getSurcharges(): ISalesSurcharge[];
-    getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
+    getTempOrder(): OrderTempOrder | null;
+    replaceTempOrder(tempOrder: OrderTempOrder): Promise<OrderTempOrder>;
     getOrderIdentity(): import("../../modules/Order/types").OrderIdentitySnapshot | null;
     getOrderSnapshot(): import("../../modules/Order/types").OrderSnapshot | null;
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
     updateTempOrderNote(note: string): string;
+    updateTempOrderNote(note: string, sync: true): Promise<string>;
+    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private ensureTempOrder;
-    addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    addNewOrder(): Promise<OrderTempOrder>;
     saveDraft(): Promise<void>;
-    restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    restoreOrder(): Promise<OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
     getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
+    private getHistoricalProductDiscountList;
+    private mergeHistoricalDiscountList;
+    loadDiscountConfig(params?: {
+        customerId?: number;
+        action?: 'create' | 'edit';
+    }): Promise<{
+        productList: Record<string, any>[];
+        discountList: Discount[];
+    }>;
+    bestDiscount(cb?: (result: any) => void): Promise<{
+        productList: Record<string, any>[];
+        discountList: Discount[];
+    }>;
     getDiscountList(): Discount[];
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
         isSelected: boolean;
     }): Promise<void>;
+    applyDiscountCalculationResult(result?: {
+        productList?: Record<string, any>[];
+        discountList?: Discount[];
+    }): Promise<void>;
     submitScanOrder<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
@@ -183,8 +212,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         submitBeforeSend?: boolean;
     }): Promise<T>;
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
+    calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
      * 多行同 SKU 时必须传入与删除/更新一致的 unique_identification_number。