@pisell/pisellos 2.2.171 → 2.2.173

package/lib/server/modules/order/utils/filterOrders.js

@@ -33,6 +33,13 @@ __export(filterOrders_exports, {
 });
 module.exports = __toCommonJS(filterOrders_exports);
 var import_dayjs = __toESM(require("dayjs"));
+function getOrderPaymentCodes(order) {
+  const payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map((item) => item == null ? void 0 : item.code).filter((code) => typeof code === "string" && code.length > 0);
+}
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -133,26 +140,27 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      const orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
+      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/lib/server/modules/products/index.js

@@ -177,7 +177,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a, _b, _c;
+    var _a;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -190,15 +190,25 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       this.quotationPriceBridge = quotation;
     }
     if (params.scheduleModule) {
-      const scheduleList = ((_c = (_b = params.scheduleModule).getScheduleList) == null ? void 0 : _c.call(_b)) || [];
-      const scheduleMap = new Map(
-        scheduleList.map((schedule) => [schedule.id, schedule])
-      );
+      const scheduleCache = /* @__PURE__ */ new Map();
+      let hasLoadedScheduleList = false;
       this.quotationPriceBridge.setScheduleResolver((id) => {
-        var _a2, _b2;
-        if (scheduleMap.has(id))
-          return scheduleMap.get(id);
-        const schedules = ((_b2 = (_a2 = params.scheduleModule).getScheduleByIds) == null ? void 0 : _b2.call(_a2, [id])) || [];
+        var _a2, _b, _c, _d, _e, _f;
+        const scheduleId = String(id);
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
+        if (!hasLoadedScheduleList) {
+          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+          for (const schedule of scheduleList) {
+            scheduleCache.set(String(schedule.id), schedule);
+          }
+          hasLoadedScheduleList = true;
+        }
+        if (scheduleCache.has(scheduleId))
+          return scheduleCache.get(scheduleId);
+        const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
+        if (schedules[0])
+          scheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
@@ -258,10 +268,11 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       customer_id: customerId
     });
     const productPrice = quotedPrice ?? product.price;
+    const productBasePrice = quotedPrice ?? product.base_price ?? product.price ?? 0;
     return {
       id: product.id,
       price: String(productPrice ?? 0),
-      base_price: String(product.base_price ?? product.price ?? 0),
+      base_price: String(productBasePrice),
       variant: this.buildVariantPriceData(product, datetime, customerId),
       bundle_group: this.buildBundleGroupPriceData(product, datetime, customerId)
     };
@@ -278,7 +289,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         customer_id: customerId
       });
       const price = quotedPrice ?? variant.price ?? product.price ?? 0;
-      const basePrice = variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
+      const basePrice = quotedPrice ?? variant.base_price ?? variant.price ?? product.base_price ?? product.price ?? 0;
       return {
         id: Number(variant.id),
         product_id: Number(variant.product_id ?? product.id),
@@ -303,7 +314,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
           customer_id: customerId
         });
         const price = quotedPrice ?? item.price ?? 0;
-        const basePrice = item.base_price ?? item.price ?? 0;
+        const basePrice = quotedPrice ?? item.base_price ?? item.price ?? 0;
         return {
           id: Number(item.id),
           product_id: Number(item.product_id ?? product.id),

package/lib/server/modules/schedule/index.js

@@ -183,8 +183,9 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
       return [];
     }
     const result = [];
+    const scheduleList = this.store.scheduleList || [];
     for (const id of ids) {
-      const schedule = this.store.map.get(id);
+      const schedule = this.store.map.get(id) || scheduleList.find((item) => String(item.id) === String(id));
       if (schedule) {
         result.push(schedule);
       }

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;
@@ -36,10 +39,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     window: WindowPlugin;
     request: RequestPlugin;
     protected currentSalesDetail: ISalesDetail | null;
+    protected discountConfigCacheKey: string | null;
+    protected hasManualDiscountSelection: boolean;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
-     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment。
+     * 默认包含通用销售模块：products / order / salesSummary / schedule / payment / quotation。
      */
     protected getRegisteredModuleNames(): readonly string[];
     /**
@@ -55,6 +60,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 +76,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 +102,59 @@ 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;
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
+    setEnableTempOrderPersist(enabled: boolean): void;
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
+    isTempOrderPersistEnabled(): boolean;
     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;
+    private mergeCurrentDiscountSelectionState;
+    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 +226,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。