@pisell/pisellos 2.2.163 → 2.2.165

package/lib/modules/Order/utils.js

@@ -47,6 +47,8 @@ __export(utils_exports, {
   normalizeBookingSubType: () => normalizeBookingSubType,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
   sumOptionUnitPrice: () => sumOptionUnitPrice
 });
@@ -80,6 +82,36 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata)
+    return void 0;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  const priceOverride = metadata.price_override;
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "") {
+    return true;
+  }
+  return void 0;
+}
+function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _a, _b;
+  const metadata = params.metadata || {};
+  const priceOverride = metadata.price_override;
+  if (priceOverride === void 0 || priceOverride === null || priceOverride === "") {
+    return fallbackCompositeOriginal;
+  }
+  const refTotal = (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.origin_total;
+  if (refTotal === void 0 || refTotal === null || refTotal === "") {
+    return fallbackCompositeOriginal;
+  }
+  const parsed = Number(refTotal);
+  if (!Number.isFinite(parsed)) {
+    return fallbackCompositeOriginal;
+  }
+  const num = Number(params.num) > 0 ? Number(params.num) : 1;
+  return new import_decimal.default(parsed).dividedBy(num).toDecimalPlaces(2).toFixed(2);
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -87,7 +119,7 @@ function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: (product) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
       const metadataAny = product.metadata || {};
       const optionSum = sumOptionUnitPrice(product.product_option_item);
       let sourcePrice;
@@ -135,9 +167,11 @@ function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_b = product.metadata) == null ? void 0 : _b.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_c = product.metadata) == null ? void 0 : _c.is_manual_discount) || false,
-        holder_id: (_d = product.metadata) == null ? void 0 : _d.holder_id,
-        startDate: ((_e = product.metadata) == null ? void 0 : _e.start_date) || ((_f = product.metadata) == null ? void 0 : _f.startDate)
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: (_c = product.metadata) == null ? void 0 : _c.holder_id,
+        startDate: ((_d = product.metadata) == null ? void 0 : _d.start_date) || ((_e = product.metadata) == null ? void 0 : _e.startDate)
       };
     },
     setProduct: (product, values) => {
@@ -160,10 +194,14 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
+        { num: nextNum, metadata: metadataAny },
+        composedOriginalPrice
+      );
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -425,18 +463,18 @@ function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: "",
-    order_number: "",
-    shop_order_number: "",
-    shop_full_order_number: "",
-    type: "appointment_booking",
-    business_code: "appointment_booking",
+    order_number: null,
+    shop_order_number: null,
+    shop_full_order_number: null,
+    type: "",
+    business_code: void 0,
     platform: "h5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
     status: "normal",
     payment_status: "payment_processing",
     shipping_status: "unfulfilled",
-    customer_id: null,
+    customer_id: 0,
     customer_name: "",
     country_calling_code: "",
     phone: "",
@@ -471,6 +509,7 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
+  var _a;
   const {
     tempOrder,
     cacheId,
@@ -496,7 +535,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,
@@ -504,12 +542,23 @@ function buildSubmitPayload(params) {
     holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
+  let submitType = type ?? tempOrder.type;
+  if (!submitType) {
+    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
+      submitType = "appointment_booking";
+    } else {
+      submitType = "virtual";
+    }
+  }
   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",
-    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
+    type: submitType,
+    business_code: businessCode ?? tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
@@ -526,7 +575,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 || [],
@@ -630,6 +679,8 @@ function formatV1Product(products) {
   normalizeBookingSubType,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag,
   resolveSubmitCollectPax,
   sumOptionUnitPrice
 });

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, BaseSalesUpdateOrderProductQuantityParams, 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,54 @@ 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>;
+    updateRemoteOrderNote(orderId: number | string, note: string): void;
     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>;
+    /**
+     * 仅清空 tempOrder 购物车行（products / bookings / discount_list）。
+     * 同步清空内存中的 salesDetail 商品/预约视图，避免编辑态仍读到旧 bookings。
+     */
+    clearOrderCartLines(): Promise<OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
     getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
+    private getHistoricalProductDiscountList;
+    private isPersistedOrderProduct;
+    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 +219,11 @@ 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[]>;
+    updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
      * 多行同 SKU 时必须传入与删除/更新一致的 unique_identification_number。