@pisell/pisellos 2.2.204 → 2.2.206

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

@@ -456,6 +456,7 @@ export interface OrderPaymentData {
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
     wallet_pass_use_value?: string | number | null;
+    fund_record?: Record<string, any>;
     metadata: OrderPaymentMetadata;
     rounding_amount?: string;
     service_charge?: {
@@ -477,6 +478,7 @@ export interface LoadSalesDetailParams {
     externalSaleNumber?: string;
     external_sale_number?: string;
     forceRemote?: boolean;
+    merge?: boolean;
 }
 export interface SalesOrderLookupParams {
     lookup: number | string;
@@ -597,6 +599,14 @@ export interface OrderModuleAPI {
     getOrderSnapshot: () => OrderSnapshot | null;
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
+    buildCurrentSubmitPayloadForLocalPrint: (params?: {
+        cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+    }) => OrderSubmitPayload;
+    applyLocalPrintOrderNumbers: (order?: Record<string, any> | null) => Promise<OrderTempOrder>;
     getTempOrderNote: () => string;
     updateTempOrderNote: {
         (note: string): string;

package/lib/modules/Order/utils.js

@@ -748,9 +748,9 @@ function buildSubmitPayload(params) {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || "Select a customer",
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
+    order_number: tempOrder.order_number ?? null,
+    shop_order_number: tempOrder.shop_order_number ?? null,
+    shop_full_order_number: tempOrder.shop_full_order_number ?? null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
     type: submitType,
@@ -825,6 +825,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
     ...item.payment_time !== void 0 ? { payment_time: item.payment_time } : {},
     ...item.wallet_pass_usage_unit !== void 0 ? { wallet_pass_usage_unit: item.wallet_pass_usage_unit } : {},
     ...item.wallet_pass_use_value !== void 0 ? { wallet_pass_use_value: item.wallet_pass_use_value } : {},
+    ...item.fund_record && typeof item.fund_record === "object" && !Array.isArray(item.fund_record) ? { fund_record: { ...item.fund_record } } : {},
     metadata,
     ...item.rounding_amount !== void 0 ? { rounding_amount: String(item.rounding_amount) } : {},
     ...item.service_charge !== void 0 ? { service_charge: item.service_charge } : {},

package/lib/modules/Payment/index.d.ts

@@ -25,9 +25,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private dbManager;
     private logger;
     private voucherUpdateLockByOrderUuid;
-    private payMethodMemoryCache;
-    private payMethodListInFlight;
-    private isRefreshingPaymentMethods;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
@@ -57,20 +54,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      *
      */
     private registerNetworkHandlers;
-    private filterPayMethods;
     /**
      * 获取支付方式列表
      */
     getPayMethodListAsync(): Promise<PaymentMethod[]>;
-    private loadPayMethodListAsync;
-    /**
-     * 后台刷新支付方式列表
-     */
-    private refreshPaymentMethodsInBackground;
-    /**
-     * 检查支付方式列表是否有变化
-     */
-    private hasPaymentMethodsChanged;
     /**
      * 获取订单列表
      */

package/lib/modules/Payment/index.js

@@ -76,9 +76,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
     this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
-    this.payMethodMemoryCache = null;
-    this.payMethodListInFlight = null;
-    this.isRefreshingPaymentMethods = false;
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
@@ -213,66 +210,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     });
   }
-  async filterPayMethods(payMethods) {
-    payMethods = payMethods.filter((method) => method.status === 1 && method.disable === 0);
-    const walletPassMethod = payMethods.find((method) => method.code === "WALLET_PASS");
-    if (walletPassMethod) {
-      payMethods.forEach((method) => {
-        if (method.code === "PRODUCTVOUCHER" || method.code === "GIFTCARD" || method.code === "POINTCARD") {
-          method.channel_application = walletPassMethod.channel_application;
-        }
-      });
-    } else {
-      payMethods = payMethods.filter((method) => method.code !== "PRODUCTVOUCHER" && method.code !== "GIFTCARD" && method.code !== "POINTCARD");
-    }
-    return payMethods;
-  }
   /**
    * 获取支付方式列表
    */
   async getPayMethodListAsync() {
-    var _a;
     this.logInfo("Starting getPayMethodListAsync");
-    if ((_a = this.payMethodMemoryCache) == null ? void 0 : _a.length) {
-      return this.payMethodMemoryCache;
-    }
-    if (this.payMethodListInFlight) {
-      return this.payMethodListInFlight;
-    }
-    this.payMethodListInFlight = this.loadPayMethodListAsync().finally(() => {
-      this.payMethodListInFlight = null;
-    });
-    return this.payMethodListInFlight;
-  }
-  async loadPayMethodListAsync() {
     try {
-      let cachedMethods = [];
-      try {
-        cachedMethods = await this.dbManager.getAll("pay_method");
-      } catch (dbError) {
-        console.warn("[PaymentModule] pay_method 表不存在，将从服务器获取数据");
-      }
-      const hasCache = cachedMethods.length > 0;
-      if (hasCache) {
-        this.payMethodMemoryCache = cachedMethods;
-        this.refreshPaymentMethodsInBackground(cachedMethods);
-        return cachedMethods;
-      }
-      const response = await this.request.get("/pay/custom-payment/all");
-      response.data = await this.filterPayMethods(response.data);
-      const payMethods = response.data || [];
-      this.payMethodMemoryCache = payMethods;
-      try {
-        for (const method of payMethods) {
-          await this.dbManager.update("pay_method", method);
-        }
-      } catch (dbError) {
-        console.warn("[PaymentModule] 无法缓存支付方式，pay_method 表不存在");
-      }
-      await this.core.effects.emit(
-        `${this.name}:onPaymentMethodsLoaded`,
-        payMethods
-      );
+      const response = await this.request.get("/pay/custom-payment/all", {
+        filterPaymentMethods: true
+      }, {
+        osServer: true
+      });
+      const payMethods = (response == null ? void 0 : response.data) || response || [];
       this.logInfo("getPayMethodListAsync completed successfully", {
         payMethods
       });
@@ -283,98 +232,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
-  /**
-   * 后台刷新支付方式列表
-   */
-  async refreshPaymentMethodsInBackground(cachedMethods) {
-    if (this.isRefreshingPaymentMethods)
-      return;
-    this.isRefreshingPaymentMethods = true;
-    this.logInfo("Starting refreshPaymentMethodsInBackground", {
-      cachedMethodsCount: cachedMethods.length
-    });
-    try {
-      console.log("[PaymentModule] 后台刷新支付方式列表...");
-      const response = await this.request.get("/pay/custom-payment/all");
-      response.data = await this.filterPayMethods(response.data);
-      const newPayMethods = response.data || [];
-      this.payMethodMemoryCache = newPayMethods;
-      const hasChanges = this.hasPaymentMethodsChanged(
-        cachedMethods,
-        newPayMethods
-      );
-      if (hasChanges) {
-        console.log("[PaymentModule] 支付方式列表已更新");
-        this.logInfo("Payment methods updated in background", {
-          oldCount: cachedMethods.length,
-          newCount: newPayMethods.length
-        });
-        try {
-          for (const method of cachedMethods) {
-            await this.dbManager.delete("pay_method", method.id);
-          }
-          for (const method of newPayMethods) {
-            await this.dbManager.update("pay_method", method);
-          }
-        } catch (dbError) {
-          console.warn("[PaymentModule] 无法更新支付方式缓存", dbError);
-        }
-        const eventData = {
-          oldMethods: cachedMethods,
-          newMethods: newPayMethods
-        };
-        await this.core.effects.emit(
-          `${this.name}:onPaymentMethodsChanged`,
-          eventData
-        );
-      } else {
-        console.log("[PaymentModule] 支付方式列表无变化");
-      }
-    } catch (error) {
-      console.error("[PaymentModule] 后台刷新支付方式失败", error);
-    } finally {
-      this.isRefreshingPaymentMethods = false;
-    }
-  }
-  /**
-   * 检查支付方式列表是否有变化
-   */
-  hasPaymentMethodsChanged(oldMethods, newMethods) {
-    if (oldMethods.length !== newMethods.length) {
-      return true;
-    }
-    const oldMethodsMap = new Map(
-      oldMethods.map((method) => [method.id, method])
-    );
-    for (const newMethod of newMethods) {
-      const oldMethod = oldMethodsMap.get(newMethod.id);
-      if (!oldMethod) {
-        return true;
-      }
-      if (oldMethod.code !== newMethod.code || oldMethod.name !== newMethod.name || oldMethod.type !== newMethod.type || oldMethod.description !== newMethod.description || oldMethod.status !== newMethod.status || oldMethod.disable !== newMethod.disable || oldMethod.is_surcharge !== newMethod.is_surcharge || oldMethod.fixed !== newMethod.fixed || oldMethod.percentage !== newMethod.percentage || oldMethod.enabled !== newMethod.enabled || JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) || JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) || JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {})) {
-        console.log(`[PaymentModule] 支付方式 ${newMethod.id} (${newMethod.code}) 发生变化:`, {
-          id: newMethod.id,
-          changes: {
-            code: oldMethod.code !== newMethod.code ? { old: oldMethod.code, new: newMethod.code } : void 0,
-            name: oldMethod.name !== newMethod.name ? { old: oldMethod.name, new: newMethod.name } : void 0,
-            type: oldMethod.type !== newMethod.type ? { old: oldMethod.type, new: newMethod.type } : void 0,
-            description: oldMethod.description !== newMethod.description ? { old: oldMethod.description, new: newMethod.description } : void 0,
-            status: oldMethod.status !== newMethod.status ? { old: oldMethod.status, new: newMethod.status } : void 0,
-            disable: oldMethod.disable !== newMethod.disable ? { old: oldMethod.disable, new: newMethod.disable } : void 0,
-            is_surcharge: oldMethod.is_surcharge !== newMethod.is_surcharge ? { old: oldMethod.is_surcharge, new: newMethod.is_surcharge } : void 0,
-            fixed: oldMethod.fixed !== newMethod.fixed ? { old: oldMethod.fixed, new: newMethod.fixed } : void 0,
-            percentage: oldMethod.percentage !== newMethod.percentage ? { old: oldMethod.percentage, new: newMethod.percentage } : void 0,
-            enabled: oldMethod.enabled !== newMethod.enabled ? { old: oldMethod.enabled, new: newMethod.enabled } : void 0,
-            channel_application: JSON.stringify(oldMethod.channel_application || []) !== JSON.stringify(newMethod.channel_application || []) ? { old: oldMethod.channel_application, new: newMethod.channel_application } : void 0,
-            companies: JSON.stringify(oldMethod.companies || []) !== JSON.stringify(newMethod.companies || []) ? { old: oldMethod.companies, new: newMethod.companies } : void 0,
-            metadata: JSON.stringify(oldMethod.metadata || {}) !== JSON.stringify(newMethod.metadata || {}) ? { old: oldMethod.metadata, new: newMethod.metadata } : void 0
-          }
-        });
-        return true;
-      }
-    }
-    return false;
-  }
   /**
    * 获取订单列表
    */

package/lib/plugins/request.d.ts

@@ -69,6 +69,7 @@ export interface RequestOptions {
     customToast?: () => void;
     cache?: CacheProps;
     osServer?: boolean;
+    prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
 }

package/lib/server/index.d.ts

@@ -4,6 +4,7 @@ import { QuotationModule } from './modules/quotation';
 import { ScheduleModuleEx } from './modules/schedule';
 import { ResourceModule } from './modules/resource';
 import { FloorPlanModule } from './modules/floor-plan';
+import { PaymentServerModule } from './modules/payment';
 import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../types';
 import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
 import { OrderModule } from './modules/order';
@@ -23,6 +24,9 @@ declare class Server {
     resource?: ResourceModule;
     order?: OrderModule;
     floor_plan?: FloorPlanModule;
+    payment?: PaymentServerModule;
+    private paymentRouteModule?;
+    private paymentRouteModuleInFlight?;
     /** GET 前缀路由（最长前缀优先匹配） */
     private prefixRouterGet;
     router: Router;
@@ -33,6 +37,8 @@ declare class Server {
     private bookingRemoteCache;
     private readonly BOOKING_REMOTE_CACHE_TTL_MS;
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
+    private salesSearchSubscribers;
+    private deviceTaskActionsRegistered;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -85,6 +91,8 @@ declare class Server {
         config: ModuleRegistryConfig;
         shouldPreload: boolean;
     }[]>;
+    private registerDeviceTaskActions;
+    private handleSyncSalesTask;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
      */
@@ -167,6 +175,8 @@ declare class Server {
      * @private
      */
     private registerServerRoutes;
+    private getPaymentRouteModule;
+    private handlePaymentMethods;
     /**
      * 根据 subscriberId 移除商品查询订阅者
      */
@@ -194,6 +204,84 @@ declare class Server {
      * 取消订单列表查询订阅（HTTP 路由入口）
      */
     private handleUnsubscribeOrderQuery;
+    /**
+     * 处理 sales 单模块搜索：请求透传后端，仅在 OS 层维护已返回订单号集合。
+     *
+     * @example
+     * await this.handleSalesSearchModule({ url: '/shop/es/search/sales', method: 'post', data: { keyword: 'A' } })
+     */
+    private handleSalesSearchModule;
+    /**
+     * 处理 sales 聚合搜索：请求透传后端，仅订阅 sales 分组的已返回订单号。
+     *
+     * @example
+     * await this.handleSalesSearchAggregate({ url: '/shop/es/search', method: 'post', data: { modules: [] } })
+     */
+    private handleSalesSearchAggregate;
+    /**
+     * 取消 sales 搜索订阅。
+     *
+     * @example
+     * await this.handleUnsubscribeSalesSearch({ data: { subscriberId: 'global-search-order' } } as any)
+     */
+    private handleUnsubscribeSalesSearch;
+    /**
+     * 执行 sales 搜索并登记可见订单号。
+     * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
+     *
+     * @example
+     * const result = await this.handleSalesSearchRequest('single', '/shop/es/search/sales', { keyword: '1001' }, {})
+     */
+    private handleSalesSearchRequest;
+    /**
+     * 透传调用后端 sales 搜索接口。
+     *
+     * @example
+     * const res = await this.fetchSalesSearchFromAPI('/shop/es/search/sales', { keyword: '1001' })
+     */
+    private fetchSalesSearchFromAPI;
+    /**
+     * 构建搜索订阅签名；页码变化不重置，可继续累计 visibleOrderIds。
+     *
+     * @example
+     * const signature = this.buildSalesSearchSignature('single', { keyword: 'A', page: 2 })
+     */
+    private buildSalesSearchSignature;
+    /**
+     * 移除页码参数，保留 page size、keyword、filters、sort 等查询语义参数。
+     *
+     * @example
+     * this.stripSalesSearchPageParams({ page: 2, per_page: 20, keyword: 'A' })
+     */
+    private stripSalesSearchPageParams;
+    /**
+     * 提取响应 data，兼容 OS 包装结构与后端直接响应结构。
+     *
+     * @example
+     * const data = this.extractSalesSearchResponseData(result)
+     */
+    private extractSalesSearchResponseData;
+    /**
+     * 从搜索响应中提取 sales 命中的订单号。
+     *
+     * @example
+     * const ids = this.extractSalesSearchOrderIds('single', result)
+     */
+    private extractSalesSearchOrderIds;
+    /**
+     * 查找聚合搜索响应中的 sales 分组。
+     *
+     * @example
+     * const group = this.findSalesSearchAggregateGroup({ results: [{ module: 'sales' }] })
+     */
+    private findSalesSearchAggregateGroup;
+    /**
+     * 从订单或搜索命中项中取订单号。
+     *
+     * @example
+     * const id = this.getSalesSearchOrderId({ order_id: 1001 })
+     */
+    private getSalesSearchOrderId;
     /**
      * 从查询值中提取 YYYY-MM-DD 日期串。
      *
@@ -286,9 +374,33 @@ declare class Server {
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
     private handleOrderCheckout;
+    private getDeviceTaskPlugin;
+    private getIdGeneratorPlugin;
+    private getAppData;
+    private getSmallTicketShopInfo;
+    private taskOk;
+    private taskFail;
+    private taskTimeout;
+    private resolveCheckoutTaskDeviceId;
+    private buildCheckoutTaskIdempotencyKey;
+    private ensureCheckoutOrderNumbers;
+    private dispatchCheckoutSyncTask;
+    private dispatchPrintOtherReceiptTask;
+    private buildPrintOtherReceiptIdempotencyKey;
+    private getPrintOrderIdentity;
+    private dispatchLocalReceiptPrint;
+    private handleLocalPrintOrder;
     private handleOrderCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    private shouldBuildSmallTicketData;
+    private shouldPrintSyncedOrder;
+    private hasPaymentStatus;
+    private isSalesOrderFullyPaid;
+    private sumPaidOrderPayments;
+    private toAmountNumber;
+    private buildSmallTicketProductMap;
+    private withLocalSmallTicketData;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
@@ -321,6 +433,7 @@ declare class Server {
     private buildOrderSalesDetailBackendPath;
     private extractOrderDataFromCheckoutResponse;
     private normalizeCheckoutResponse;
+    private isCheckoutResponseRejected;
     private extractBackendErrorResponse;
     private isExplicitBackendErrorResponse;
     /**
@@ -377,6 +490,35 @@ declare class Server {
      * 订单数据变更后，遍历订阅者重新计算并通过 callback 推送
      */
     private recomputeAndNotifyOrderQuery;
+    /**
+     * 订单变更后通知 sales 搜索订阅者。
+     * 仅回传当前查询已返回订单号集合中的变更订单。
+     *
+     * @example
+     * this.notifySalesSearchSubscribers({ list: [], changedOrders: [order], source: 'pubsub.bodyUpsert' })
+     */
+    private notifySalesSearchSubscribers;
+    /**
+     * 从订单变更事件中提取明确 delta。
+     *
+     * @example
+     * const list = this.extractChangedOrdersFromPayload(payload)
+     */
+    private extractChangedOrdersFromPayload;
+    /**
+     * 构建与当前搜索接口一致的 delta 响应。
+     *
+     * @example
+     * const response = this.buildSalesSearchDeltaResponse(subscriber, [order])
+     */
+    private buildSalesSearchDeltaResponse;
+    /**
+     * 构建聚合搜索接口的 sales 分组 delta 响应。
+     *
+     * @example
+     * const response = this.buildAggregateSalesSearchDeltaResponse(subscriber, [order])
+     */
+    private buildAggregateSalesSearchDeltaResponse;
     /**
      * 预约数据变更后，遍历订阅者重新计算并通过 callback 推送
      */