@pisell/pisellos 2.2.274 → 2.2.276

package/dist/server/modules/index.d.ts

@@ -14,7 +14,7 @@ export { QuotationHooks } from './quotation/types';
 export { ScheduleModuleEx } from './schedule';
 export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
-export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, } from './order/types';
+export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, RemoteProductMembershipChangedPayload, RemoteProductMembershipChangeSource, } from './order/types';
 export { OrderHooks } from './order/types';
 export { PaymentServerModule } from './payment';
 export type { PaymentMethod, PaymentMethodsChangedEventData, PaymentServerState } from './payment/types';

package/dist/server/modules/order/index.d.ts

@@ -2,6 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import type { RouteDefinition } from '../../types';
 import { OrderData, OrderId } from './types';
+import { type OrderPaymentIdentityType } from '../../../modules/Order/payment-utils';
 /**
  * Order 模块 - 基础框架
  */
@@ -29,6 +30,10 @@ export declare class OrderModule extends BaseModule implements Module {
      * await this.emitOrdersChanged([freshOrder], 'pubsub.bodyUpsert')
      */
     private emitOrdersChanged;
+    /**
+     * 广播远端商品成员增删。监听器异常必须与订单落库和原有订单广播隔离。
+     */
+    private emitRemoteProductMembershipChanges;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
      * 记录信息日志
@@ -89,8 +94,31 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderById(id: OrderId): OrderData | undefined;
     /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
+    private buildLocalPaymentOrderLogContext;
     getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
-    getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
+    getLocalOrderByLookup(lookup: OrderId, options?: {
+        operationId?: string;
+    }): Promise<OrderData | null>;
+    getLocalPayment(params: {
+        saleId: OrderId;
+        paymentNumber: OrderId;
+        operationId?: string;
+    }): Promise<{
+        order: OrderData;
+        payment: Record<string, any>;
+        paymentIndex: number;
+        matchedBy: OrderPaymentIdentityType;
+    } | null>;
+    updateLocalPayment(params: {
+        saleId: OrderId;
+        paymentNumber: OrderId;
+        operationId?: string;
+        updates: Record<string, any>;
+    }): Promise<{
+        order: OrderData;
+        payment: Record<string, any>;
+        previousPayment: Record<string, any>;
+    } | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -99,6 +127,10 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     silentRefresh(): Promise<OrderData[]>;
     private normalizeOrderForMemoryList;
+    private normalizeOrdersForMemoryList;
+    private hasRealOrderId;
+    private shouldKeepOrderInMemory;
+    private withoutSyntheticDraftOrderId;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
      * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -110,7 +142,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
      * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
      */
-    upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
+    upsertOrdersFromRemote(freshOrders: OrderData[], source?: string): Promise<void>;
     markOrderSyncedByExternalSaleNumber(params: {
         externalSaleNumber: OrderId;
         patch?: Partial<OrderData>;
@@ -122,7 +154,14 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
      * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
      */
-    upsertPendingSyncOrders(pendingOrders: OrderData[]): Promise<void>;
+    upsertPendingSyncOrders(pendingOrders: OrderData[], options?: {
+        throwOnError?: boolean;
+    }): Promise<void>;
+    /**
+     * 将 POS 草稿订单按 SQLite storage key 落库。
+     * 只有具备真实 order_id 的草稿进入 store；其余草稿仅供本地恢复查询。
+     */
+    upsertLocalDraftOrders(draftOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -132,6 +171,11 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncOrdersMap;
     private getOrderMapKey;
     private isBlankIdentityValue;
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+    private preserveExistingBusinessCodeForDraft;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
     private getOrderDateKey;
@@ -191,6 +235,18 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private getProductMembershipKey;
+    private doProductsHaveStableMembershipIdentity;
+    /**
+     * 冲突提示关注逻辑商品行，而不是服务端 checkout 过程中可能被重建的 detail 记录。
+     * 通用集合合并仍以 order_detail_id 为事实主键；这里只允许相同稳定 UID 跨 detail id 对齐，
+     * 避免本机 checkout 回声被误判成“一删一增”。
+     */
+    private isSameProductMembershipItem;
+    /**
+     * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
+     */
+    private getRemoteProductMembershipChange;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
@@ -222,6 +278,12 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
+    private getProductIdentityKeys;
+    private mergeOrderProductLists;
+    private mergeOrderPaymentLists;
+    private getIdentifiedPendingPayments;
+    private shouldProtectLocalOrderFromRemoteSnapshot;
+    private getUnmatchedIdentifiedPendingPayments;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;
@@ -238,7 +300,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private setStorageItem;
     private loadOrdersFromSQLite;
     private isPendingSyncOrder;
+    private isDraftOrder;
+    private shouldProtectDraftOrderFromIncoming;
     private normalizeRemoteSyncedOrder;
+    private mergeRemoteIdentityIntoDraftOrder;
     private mergeRemoteSnapshotWithPendingOrders;
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
@@ -264,7 +329,8 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private updateOrderInSQLite;
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
+     * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
      * await this.replaceOrdersSnapshotInSQLite(orderList)