@pisell/pisellos 2.2.260 → 2.2.262

package/lib/server/modules/order/types.d.ts

@@ -63,6 +63,8 @@ export interface OrderProductBundleItem {
     bundle_group_id?: number;
     /** 套餐商品 ID */
     bundle_id?: number;
+    /** 套餐子商品封面图 */
+    cover?: string | null;
     /** 套餐商品规格 ID */
     bundle_variant_id?: number;
     /** 数量 */
@@ -104,6 +106,8 @@ export interface OrderProductLineItem {
     num: number;
     /** 商品标题快照；本地待同步订单会补齐为多语言对象。 */
     product_title?: OrderProductTitleSnapshot | string | null;
+    /** 商品封面图 */
+    product_cover?: string | null;
     /** 多规格 ID。来源：Detail.product_variant_id */
     product_variant_id?: number;
     /**

package/lib/server/modules/products/index.d.ts

@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import { ProductData } from '../../../modules/Product/types';
 import type { RouteDefinition } from '../../types';
-import { ProductIdScope, ProductFormatter, ProductFormatterContext } from './types';
+import { ProductIdScope, type ProductSnapshot, ProductFormatter, ProductFormatterContext } from './types';
 /**
  * Products 模块 - 用于获取和管理完整的商品详细数据
  * 相比 ProductList 模块，Products 会获取所有详细信息并缓存
@@ -204,6 +204,10 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 获取商品列表（深拷贝，供外部安全使用）
      */
     getProducts(): Promise<ProductData[]>;
+    /**
+     * 批量获取商品轻量快照，供订单详情等响应补齐展示协议字段。
+     */
+    getProductSnapshotsByIds(ids: number[]): Promise<Record<string, ProductSnapshot>>;
     /**
      * 内部获取商品列表的直接引用（无拷贝）
      * 仅供内部 formatter 流程使用，因为 formatter 会创建新对象

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

@@ -693,6 +693,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         channel: strategyContext.channel,
         orderType: strategyContext.orderType || strategyContext.order_type,
         businessCode: strategyContext.business_code ?? strategyContext.businessCode,
+        availableWalletIds: strategyContext.available_wallet_ids,
         custom: strategyContext
       };
       const result = evaluator.resolveProducts(businessData);
@@ -934,6 +935,26 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     (0, import_product.perfMark)("ProductsModule.getProducts(structuredClone)", performance.now() - t0, { count: result.length });
     return result;
   }
+  /**
+   * 批量获取商品轻量快照，供订单详情等响应补齐展示协议字段。
+   */
+  async getProductSnapshotsByIds(ids) {
+    const snapshots = {};
+    const seen = /* @__PURE__ */ new Set();
+    for (const id of ids) {
+      if (!Number.isFinite(id) || seen.has(id))
+        continue;
+      seen.add(id);
+      const product = this.store.map.get(id);
+      if (!product)
+        continue;
+      snapshots[String(id)] = {
+        cover: product.cover,
+        holder_config: product.holder_config
+      };
+    }
+    return snapshots;
+  }
   /**
    * 内部获取商品列表的直接引用（无拷贝）
    * 仅供内部 formatter 流程使用，因为 formatter 会创建新对象

package/lib/server/modules/products/types.d.ts

@@ -28,6 +28,10 @@ export interface ProductIdScope {
     /** 指定商品集合 ID */
     collectionIds?: number[];
 }
+export interface ProductSnapshot {
+    cover?: ProductData['cover'];
+    holder_config?: ProductData['holder_config'];
+}
 /**
  * 加载报价单商品价格参数
  */

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

@@ -30,7 +30,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
-    private logger;
+    protected logger: any;
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
@@ -46,6 +46,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected hasManualDiscountSelection: boolean;
     private readonly reusedSharedSubModuleNames;
     private paymentMethodsCache;
+    private queuedAutoPaymentSync;
+    private autoPaymentSyncFlushing;
+    private autoPaymentSyncTimer;
+    private salesDetailLoadInFlightCount;
+    private salesDetailLoadSequence;
+    private salesDetailHydrateQueue;
+    private serverOrderChangeUnsubscribe;
+    private serverOrderChangeHydrateInFlight;
+    private queuedServerOrderChanges;
+    private serverOrderChangeSyncEnabled;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -66,6 +76,13 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 记录错误日志
      */
     private logError;
+    private isCurrentSalesOrderRecord;
+    setServerOrderChangeSyncEnabled(enabled: boolean): void;
+    private queueLatestServerOrderChange;
+    private drainQueuedServerOrderChanges;
+    private syncCurrentSalesDetailFromServerOrderChange;
+    private registerServerOrderChangeSync;
+    private hydrateLatestLoadedSalesDetail;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;
@@ -176,12 +193,24 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     }): Promise<{
         productList: Record<string, any>[];
         discountList: Discount[];
+        availableWalletIds: number[];
     }>;
+    getAvailableWalletIds(): number[];
     bestDiscount(cb?: (result: any) => void): Promise<{
         productList: Record<string, any>[];
         discountList: Discount[];
     }>;
     getDiscountList(): Discount[];
+    /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+    getOriginalDiscountList(): Discount[];
+    /**
+     * 同步写入 Discount 模块的 discountList / originalDiscountList。
+     * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+     */
+    replaceDiscountStoreLists(params: {
+        discountList: Discount[];
+        originalDiscountList?: Discount[];
+    }): Promise<void>;
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
@@ -195,6 +224,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     /**
@@ -207,12 +237,14 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
@@ -222,6 +254,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderPayments(): OrderPaymentData[];
     /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private getPaymentStatusForSync;
+    private queueLatestAutoPaymentSync;
+    private scheduleQueuedAutoPaymentSyncFlush;
+    private flushQueuedAutoPaymentSync;
     /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
     /** 更新当前订单中的指定支付项。 */
@@ -229,7 +265,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
+    confirmPendingVoucherPayments(): OrderPaymentData[];
+    discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
     initWalletData(params?: {
         order_wait_pay_amount?: number;