@pisell/pisellos 2.2.314 → 2.2.316

package/lib/modules/Schedule/index.js

@@ -24,10 +24,18 @@ class ScheduleModule extends _BaseModule.BaseModule {
   openCache = false;
   fatherModule;
   hasLoadedScheduleList = false;
+  scheduleListPromise = null;
+  scheduleListRequestVersion = 0;
+  scheduleCatalogScope = '';
+  otherParams = {};
   constructor(name, version) {
     super(name, version);
   }
   async initialize(core, options) {
+    // The store proxies initialState, so capture its input before resets write through it.
+    const initialScheduleList = options.initialState?.scheduleList;
+    const hasInitialScheduleList = Array.isArray(initialScheduleList);
+    this.resetScheduleCatalog();
     this.core = core;
 
     // 获取依赖的插件
@@ -40,24 +48,18 @@ class ScheduleModule extends _BaseModule.BaseModule {
     //   this.state = { ...this.state, ...options.initialState }
     // }
     this.store = options?.store;
+    this.updateOtherParams(options.otherParams || {});
     if (options.initialState) {
-      this.store.scheduleList = options.initialState.scheduleList;
+      this.store.scheduleList = hasInitialScheduleList ? initialScheduleList : [];
       this.syncScheduleMap();
       this.store.availabilityDateList = options.initialState.availabilityDateList;
-      this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
+      this.hasLoadedScheduleList = hasInitialScheduleList;
     } else {
       this.store.scheduleList = [];
       this.store.map = new Map();
       this.store.availabilityDateList = [];
       this.hasLoadedScheduleList = false;
     }
-    if (options.otherParams?.cacheId) {
-      this.openCache = options.otherParams.openCache;
-      this.cacheId = options.otherParams.cacheId;
-    }
-    if (options.otherParams?.fatherModule) {
-      this.fatherModule = options.otherParams.fatherModule;
-    }
   }
 
   /**
@@ -68,9 +70,34 @@ class ScheduleModule extends _BaseModule.BaseModule {
    */
   updateOtherParams(params) {
     const otherParams = params || {};
+    this.otherParams = {
+      ...otherParams
+    };
     this.openCache = otherParams.openCache ?? false;
     this.cacheId = otherParams.cacheId;
     this.fatherModule = otherParams.fatherModule;
+    this.syncScheduleCatalogScope();
+  }
+  syncScheduleCatalogScope() {
+    const context = this.core?.context;
+    const shopId = typeof context?.getData === 'function' ? context.getData('shop_id') : context?.shop_id;
+    const params = this.otherParams;
+    const scope = JSON.stringify([this.cacheId, this.fatherModule, params.businessCode ?? params.business_code, params.channel, params.platform, params.businessTimezone, shopId].map(value => String(value ?? '').trim()));
+    if (scope !== this.scheduleCatalogScope) {
+      this.resetScheduleCatalog();
+      this.scheduleCatalogScope = scope;
+    }
+  }
+  resetScheduleCatalog() {
+    this.scheduleListRequestVersion += 1;
+    this.scheduleListPromise = null;
+    this.hasLoadedScheduleList = false;
+    this.store.scheduleList = [];
+    this.store.map = new Map();
+  }
+  destroy() {
+    this.resetScheduleCatalog();
+    super.destroy();
   }
 
   /**
@@ -79,14 +106,40 @@ class ScheduleModule extends _BaseModule.BaseModule {
    * @memberof ScheduleModule
    */
   async loadAllSchedule(options = {}) {
-    const scheduleList = await this.request.get(`/schedule`, {
+    this.syncScheduleCatalogScope();
+    const useCache = options.useCache ?? true;
+    if (useCache) {
+      if (this.scheduleListPromise) return this.scheduleListPromise;
+      if (this.hasLoadedScheduleList) return;
+    }
+    const requestVersion = ++this.scheduleListRequestVersion;
+    const promise = this.loadScheduleCatalog(useCache, requestVersion);
+    this.scheduleListPromise = promise;
+    try {
+      await promise;
+    } finally {
+      if (this.scheduleListPromise === promise) {
+        this.scheduleListPromise = null;
+      }
+    }
+  }
+  async loadScheduleCatalog(useCache, requestVersion) {
+    const response = await this.request.get(`/schedule`, {
       num: 999
     }, {
-      useCache: options.useCache ?? true
+      useCache
     });
-    this.setScheduleList(scheduleList.data?.list || []);
+    if (response.code !== undefined && Number(response.code) !== 200 || response.status === false || typeof response.status === 'number' && response.status >= 400 || response.success === false) {
+      throw new Error(response.message || 'Schedule catalog request failed');
+    }
+    this.syncScheduleCatalogScope();
+    // A refresh or a different runtime may have superseded this request.
+    if (requestVersion === this.scheduleListRequestVersion) {
+      this.setScheduleList(response.data?.list || []);
+    }
   }
   setScheduleList(list) {
+    this.syncScheduleCatalogScope();
     this.store.scheduleList = list;
     this.syncScheduleMap();
     this.hasLoadedScheduleList = true;
@@ -95,9 +148,11 @@ class ScheduleModule extends _BaseModule.BaseModule {
     this.store.map = new Map((this.store.scheduleList || []).map(schedule => [Number(schedule.id), schedule]));
   }
   getScheduleList() {
+    this.syncScheduleCatalogScope();
     return this.store.scheduleList || [];
   }
   isScheduleListLoaded() {
+    this.syncScheduleCatalogScope();
     return this.hasLoadedScheduleList;
   }
   async loadScheduleAvailableDate({
@@ -149,6 +204,7 @@ class ScheduleModule extends _BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
+    this.syncScheduleCatalogScope();
     const idSet = new Set(ids.map(id => String(id)));
     if (this.store.map instanceof Map && this.store.map.size > 0) {
       return ids.map(id => this.store.map.get(Number(id))).filter(Boolean);

package/lib/modules/index.d.ts

@@ -17,6 +17,7 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './FulfillmentTiming';
 export * from './BookingContext';
 export * from './Holder';
 export * from './ResourcePlanner';

package/lib/modules/index.js

@@ -212,6 +212,17 @@ Object.keys(_OpenData).forEach(function (key) {
     }
   });
 });
+var _FulfillmentTiming = require("./FulfillmentTiming");
+Object.keys(_FulfillmentTiming).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _FulfillmentTiming[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _FulfillmentTiming[key];
+    }
+  });
+});
 var _BookingContext = require("./BookingContext");
 Object.keys(_BookingContext).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/plugins/request.d.ts

@@ -56,6 +56,13 @@ export interface CacheProps {
  * 请求配置
  */
 export interface RequestOptions {
+    /** Customer-only, credential-free GET /open/document/{id} on picoding. */
+    publicInvoiceDocument?: boolean;
+    /** Route through the host's configured picoding environment. */
+    pisell2?: boolean;
+    /** Let the caller handle read-only preview failures without host navigation/toasts. */
+    manualErrorHandling?: boolean;
+    skipErrorHandler?: boolean;
     url?: string;
     method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS';
     headers?: Record<string, string>;

package/lib/server/index.d.ts

@@ -499,6 +499,7 @@ declare class Server {
     private buildLocalPaymentSurchargeUpdate;
     private handleGetLocalPayment;
     private handleUpdateLocalPayment;
+    private handleFinalizeLocalEftposPayment;
     private runLocalPaymentUpdateInQueue;
     private processLocalPaymentUpdate;
     private processSuccessfulLocalPayment;

package/lib/server/index.js

@@ -7,6 +7,7 @@ var _exportNames = {};
 exports.default = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
+var _localEftposState = require("../modules/Order/localEftposState");
 var _lodashEs = require("lodash-es");
 var _products = require("./modules/products");
 var _menu = require("./modules/menu");
@@ -16,6 +17,7 @@ var _resource = require("./modules/resource");
 var _floorPlan = require("./modules/floor-plan");
 var _types = require("./modules/floor-plan/types");
 var _payment = require("./modules/payment");
+var _form = require("./modules/form");
 var _schedule2 = require("./utils/schedule");
 var _time = require("./utils/time");
 var _types2 = require("./modules/products/types");
@@ -25,6 +27,7 @@ var _types3 = require("./modules/order/types");
 var _filterOrders = require("./modules/order/utils/filterOrders");
 var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
+var _templateVisibility = require("../shared/receipt/templateVisibility");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
 var _salesNotes = require("../modules/Order/salesNotes");
@@ -181,6 +184,16 @@ class Server {
         payMethods: []
       }
     },
+    form: {
+      name: 'form',
+      moduleClass: _form.FormModule,
+      moduleName: 'server_form',
+      version: '1.0.0',
+      defaultStore: {
+        list: [],
+        map: new Map()
+      }
+    },
     resource: {
       name: 'resource',
       moduleClass: _resource.ResourceModule,
@@ -527,7 +540,7 @@ class Server {
 
     // 监听 ProductsModule 同步完成事件，重新计算并推送查询结果
     this.core.effects.on(_types2.ProductsHooks.onProductsSyncCompleted, payload => {
-      this.recomputeAndNotifyProductQuery({
+      return this.recomputeAndNotifyProductQuery({
         changedIds: payload?.changedIds
       });
     });
@@ -645,7 +658,7 @@ class Server {
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
     const checkoutData = this.normalizeCheckoutCollections((0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
-    const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
+    const remoteCheckoutData = (0, _localEftposState.stripLocalEftposState)(this.buildRemoteCheckoutData(checkoutData, title));
     const deviceHeaders = await this.buildCheckoutDeviceHeaders(title);
     if (!this.app?.request?.post) {
       throw new Error('app.request 不可用');
@@ -783,7 +796,7 @@ class Server {
     }
     const freshPayments = freshRecord.payments;
     const mergedPayments = (0, _paymentUtils.mergeOrderPaymentListsByIdentity)(localPayments, freshPayments, {
-      preserveUnmatchedExistingWhen: _paymentUtils.isIdentifiedPendingOrderPayment
+      preserveUnmatchedExistingWhen: payment => (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment) || (0, _localEftposState.isLocalFinalizedPayment)(payment)
     });
     const remoteIdentityKeys = new Set(freshPayments.flatMap(payment => (0, _paymentUtils.getOrderPaymentIdentityKeys)(payment)));
     const preservedPending = localPayments.filter(payment => (0, _paymentUtils.isIdentifiedPendingOrderPayment)(payment) && !(0, _paymentUtils.getOrderPaymentIdentityKeys)(payment).some(key => remoteIdentityKeys.has(key)));
@@ -823,6 +836,9 @@ class Server {
         need_sync: 0,
         is_draft_order: 0
       };
+      if (!Array.isArray(fresh.holder_relations) && Array.isArray(checkoutData?.holder_relations)) {
+        syncedOrder.holder_relations = (0, _lodashEs.cloneDeep)(checkoutData.holder_relations);
+      }
       await this.order.upsertOrdersFromRemote([syncedOrder], 'checkoutSync');
       this.logInfo(`${title}: sync_sales 完整订单已同步到本地`, {
         order_id: fresh.order_id,
@@ -1336,6 +1352,19 @@ class Server {
       method: 'post',
       path: '/shop/local/updateLocalPayment',
       handler: this.handleUpdateLocalPayment.bind(this)
+    }, {
+      method: 'post',
+      path: '/shop/local/finalizeLocalEftposPayment',
+      handler: this.handleFinalizeLocalEftposPayment.bind(this)
+    }, {
+      method: 'post',
+      path: '/shop/local/orderPaymentReadiness',
+      handler: async ({
+        data
+      }) => ({
+        code: 200,
+        data: await this.order?.getLocalOrderForPaymentReadiness(data?.sale_id)
+      })
     }, {
       method: 'post',
       path: '/shop/machinecode/batch',
@@ -2997,7 +3026,7 @@ class Server {
         data: null
       };
     }
-    const queueKey = `${String(saleId)}:${String(paymentNumber)}`;
+    const queueKey = String(saleId);
     return this.runLocalPaymentUpdateInQueue(queueKey, () => this.processLocalPaymentUpdate({
       operationId,
       saleId,
@@ -3009,6 +3038,42 @@ class Server {
       hasSurchargeInput
     }), requestContext);
   };
+  handleFinalizeLocalEftposPayment = async ({
+    data
+  }) => {
+    const {
+      sale_id: saleId,
+      payment_number: paymentNumber,
+      result,
+      failed_transaction_numbers: numbers = []
+    } = data || {};
+    if (!saleId || !paymentNumber || !Array.isArray(numbers) || numbers.some(number => typeof number !== 'string' || !number.trim()) || result !== 'failed' && result !== 'not_started' || result === 'failed' && numbers.length === 0 || result === 'not_started' && numbers.length !== 0) {
+      return {
+        code: 400,
+        status: false,
+        message: '缺少明确的支付结果或交易编号',
+        data: null
+      };
+    }
+    return this.runLocalPaymentUpdateInQueue(String(saleId), async () => {
+      if (!this.order) throw new Error('Order 模块未注册');
+      const finalized = await this.order.finalizeLocalEftposPayment({
+        saleId,
+        paymentNumber,
+        result,
+        failedTransactionNumbers: [...new Set(numbers)]
+      });
+      return {
+        code: 200,
+        status: true,
+        local_only: true,
+        data: finalized
+      };
+    }, {
+      sale_id: saleId,
+      payment_number: paymentNumber
+    });
+  };
   async runLocalPaymentUpdateInQueue(key, task, context) {
     const queuedAt = Date.now();
     const hasPreviousTask = this.localPaymentUpdateQueues.has(key);
@@ -3768,7 +3833,7 @@ class Server {
         device_id: debugDeviceId,
         payload: {
           backendPath: params.backendPath,
-          data: params.data,
+          data: (0, _localEftposState.stripLocalEftposState)(params.data),
           invoice: this.normalizePrintInvoiceLayoutConfig(params.invoiceLayoutConfig),
           template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
           external_sale_number: params.data?.external_sale_number,
@@ -3851,7 +3916,8 @@ class Server {
     }
     const printableOrder = await this.withLocalSmallTicketData(params.order, {
       requireFullyPaid: params.requireFullyPaid,
-      invoiceTemplateSettings: params.invoiceTemplateSettings
+      invoiceTemplateSettings: params.invoiceTemplateSettings,
+      applyTemplateVisibility: true
     });
     if (!(0, _smallTicket.hasSmallTicketData)(printableOrder.payment_info?.small_ticket_data)) {
       return {
@@ -3873,9 +3939,11 @@ class Server {
       invoiceLayoutConfig: params.invoiceLayoutConfig,
       invoiceTemplateSettings: params.invoiceTemplateSettings
     });
+    // Receipt visibility belongs to this output only. Do not return a filtered
+    // snapshot to callers that may retain the order for later sync or reprints.
     return {
       printed: true,
-      order: printableOrder
+      order: (0, _templateVisibility.requiresInvoiceDataFiltering)(params.invoiceTemplateSettings) ? params.order : printableOrder
     };
   }
   shouldLookupLocalPrintOrder(input) {
@@ -4084,7 +4152,10 @@ class Server {
         small_ticket_data_flag: 1,
         payment_info: paymentInfo
       }, {
-        locales: this.normalizeRequestedReceiptLocales(input.locales)
+        locales: this.normalizeRequestedReceiptLocales(input.locales),
+        invoiceTemplateSettings: input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings),
+        applyTemplateVisibility: true,
+        includeReceiptKeys: input.template_settings !== undefined
       });
       const smallTicketData = rebuiltOrder.payment_info?.small_ticket_data;
       if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) {
@@ -4102,7 +4173,17 @@ class Server {
         status: true,
         message: '',
         data: {
-          small_ticket_data: smallTicketData
+          small_ticket_data: smallTicketData,
+          template_visibility_applied: true,
+          // These products and currency settings are the exact source used for
+          // this receipt, not the potentially newer active tempOrder.
+          source: {
+            ...rebuiltOrder,
+            payment_info: {
+              ...(rebuiltOrder.payment_info || {}),
+              small_ticket_data: undefined
+            }
+          }
         }
       };
     } catch (error) {
@@ -4307,6 +4388,16 @@ class Server {
       backendPath,
       title
     } = params;
+    const lookup = params.data?.order_id || params.data?.external_sale_number;
+    const localOrder = lookup && (await this.order?.getLocalOrderByLookup?.(lookup));
+    if ((0, _localEftposState.requiresLocalPaymentRefresh)(params.data) || (0, _localEftposState.requiresLocalPaymentRefresh)(localOrder)) {
+      return {
+        code: 409,
+        status: false,
+        message: _localEftposState.PAYMENT_REFRESH_MESSAGE,
+        data: null
+      };
+    }
     const extractedInvoice = this.extractInvoiceLayoutConfig(params.data, {
       includePublicInvoice: true
     });
@@ -4343,15 +4434,24 @@ class Server {
     });
     if (pendingResult?.status === true) {
       const pendingOrder = pendingResult.data;
-      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData,
-          order: pendingOrder,
-          response: pendingResult,
-          requireFullyPaid: true,
-          invoiceLayoutConfig,
-          invoiceTemplateSettings
-        });
+      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData, invoiceTemplateSettings) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
+        try {
+          await this.dispatchLocalReceiptPrint({
+            checkoutData,
+            order: pendingOrder,
+            response: pendingResult,
+            requireFullyPaid: true,
+            invoiceLayoutConfig,
+            invoiceTemplateSettings
+          });
+        } catch (error) {
+          // The sale is already persisted. A failed receipt must not cancel its
+          // sync task or send an unfiltered fallback to the printer.
+          pendingResult.receipt_print_error = this.getUnknownErrorMessage(error);
+          this.logError(`${title}: 小票生成失败，订单仍继续同步`, {
+            error: pendingResult.receipt_print_error
+          });
+        }
       }
       await this.dispatchCheckoutSyncTask({
         backendPath,
@@ -4409,16 +4509,24 @@ class Server {
       }
       const response = this.withSyncedOrderIdInCheckoutResponse(syncResult.normalizedResponse, syncResult.syncedOrder);
       const syncedOrder = syncResult.syncedOrder;
-      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData) && this.isSalesOrderFullyPaid(syncedOrder)) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData: syncResult.checkoutData,
-          order: syncedOrder,
-          response: syncResult.normalizedResponse,
-          requireFullyPaid: true,
-          invoiceLayoutConfig,
-          invoiceTemplateSettings
-          // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-        });
+      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData, invoiceTemplateSettings) && this.isSalesOrderFullyPaid(syncedOrder)) {
+        try {
+          await this.dispatchLocalReceiptPrint({
+            checkoutData: syncResult.checkoutData,
+            order: syncedOrder,
+            response: syncResult.normalizedResponse,
+            requireFullyPaid: true,
+            invoiceLayoutConfig,
+            invoiceTemplateSettings
+          });
+        } catch (error) {
+          // Checkout already succeeded remotely; report the receipt failure
+          // separately instead of implying that payment/order creation failed.
+          response.receipt_print_error = this.getUnknownErrorMessage(error);
+          this.logError(`${title}: 小票生成失败，订单已同步`, {
+            error: response.receipt_print_error
+          });
+        }
       }
       return response;
     } catch (error) {
@@ -4627,10 +4735,12 @@ class Server {
     if (this.core.context?.getPlatform?.() !== 'android') return true;
     return this.app?.storage?.getStorage?.(AUTO_PRINT_STORAGE_KEY) !== 'false';
   }
-  shouldBuildSmallTicketData(order) {
+  shouldBuildSmallTicketData(order, invoiceTemplateSettings) {
     if (!order || typeof order !== 'object') return false;
-    // if (hasSmallTicketData(order.payment_info?.small_ticket_data)) return false;
-    return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
+    const flag = order.small_ticket_data_flag ?? order.smallTicketDataFlag;
+    // A synced order can omit the generation flag; required display filtering
+    // still rebuilds its output. An explicit 0 retains the no-auto-print intent.
+    return Number(flag ?? 0) === 1 || flag == null && (0, _templateVisibility.requiresInvoiceDataFiltering)(invoiceTemplateSettings);
   }
   shouldPrintSyncedOrder(params) {
     if (this.hasPaymentStatus(params.syncedOrder)) {
@@ -4934,7 +5044,8 @@ class Server {
     }
   }
   async withLocalSmallTicketData(order, options) {
-    if (!this.shouldBuildSmallTicketData(order)) return order;
+    const mustApplyVisibility = options?.applyTemplateVisibility === true && (0, _templateVisibility.requiresInvoiceDataFiltering)(options.invoiceTemplateSettings);
+    if (!this.shouldBuildSmallTicketData(order) && !mustApplyVisibility) return order;
     if (options?.requireFullyPaid && !this.isSalesOrderFullyPaid(order)) return order;
     try {
       const normalizedCollections = (0, _orderCollectionIdentity.normalizeOrderCollections)(order, {
@@ -4958,7 +5069,9 @@ class Server {
         order: enrichedOrder,
         shopInfo: this.getSmallTicketShopInfo(),
         locales: [...(0, _OpenData.resolveInvoiceReceiptLocales)(options?.invoiceTemplateSettings), ...(options?.locales || [])],
-        productMap
+        productMap,
+        includeReceiptKeys: options?.includeReceiptKeys,
+        templateSettings: options?.applyTemplateVisibility ? options.invoiceTemplateSettings : undefined
       });
       return {
         ...enrichedOrder,
@@ -4971,6 +5084,7 @@ class Server {
       this.logError('withLocalSmallTicketData: 生成本地小票数据失败', {
         error: error instanceof Error ? error.message : String(error)
       });
+      if (mustApplyVisibility) throw error;
       return order;
     }
   }
@@ -5032,7 +5146,15 @@ class Server {
           order: null
         };
       }
-      await this.order.upsertOrdersFromRemote([fresh]);
+      const localBeforeRefresh = this.order.getLocalOrderFromMemoryByLookup?.(lookup) || (this.shouldForceRemoteSalesDetail(data) ? await this.order.getLocalOrderByLookup(lookup) : null);
+      if ((0, _localEftposState.requiresLocalPaymentRefresh)(localBeforeRefresh)) {
+        if (String(fresh.order_id) !== String(localBeforeRefresh.order_id)) {
+          throw new Error('远端订单身份不匹配，请重新刷新');
+        }
+        await this.order.completeLocalPaymentRefresh(fresh);
+      } else {
+        await this.order.upsertOrdersFromRemote([fresh]);
+      }
       let savedOrder = await this.order.getLocalOrderByLookup(lookup);
       if (!savedOrder && fresh.order_id !== undefined && fresh.order_id !== null && String(fresh.order_id) !== String(lookup)) {
         savedOrder = await this.order.getLocalOrderByLookup(fresh.order_id);
@@ -5349,7 +5471,7 @@ class Server {
   }
   buildOrderSalesDetailBackendPath(lookup, data) {
     const rawWith = data && typeof data === 'object' ? data.with : undefined;
-    const withFields = Array.isArray(rawWith) && rawWith.length > 0 ? rawWith : ['products', 'scheduleEvents'];
+    const withFields = Array.isArray(rawWith) && rawWith.length > 0 ? rawWith : ['all'];
     const searchParams = new URLSearchParams();
     withFields.forEach(field => {
       if (field === undefined || field === null || field === '') return;
@@ -5383,6 +5505,9 @@ class Server {
     if (fresh.order_number !== undefined && fresh.order_number !== null) {
       patch.order_number = fresh.order_number;
     }
+    if (Array.isArray(fresh.holder_relations)) {
+      patch.holder_relations = (0, _lodashEs.cloneDeep)(fresh.holder_relations);
+    }
     return patch;
   }
   buildSyncedOrderForPrint(params) {
@@ -5750,9 +5875,11 @@ class Server {
 
     // 使用 filterOrders 进行过滤、排序、分页
     const result = (0, _filterOrders.filterOrders)(rawList, data);
-    result.list.forEach(order => {
-      order.payments = order.payments?.filter(payment => !(0, _paymentUtils.isPendingOrderPayment)(payment));
-    });
+    // filterOrders retains store object references; hide pending only in the list response.
+    result.list = result.list.map(order => ({
+      ...order,
+      payments: order.payments?.filter(payment => !(0, _paymentUtils.isPendingOrderPayment)(payment))
+    }));
     this.logInfo('computeOrderQueryResult: 过滤结果', {
       rawCount: rawList.length,
       filteredCount: result.count,
@@ -6120,7 +6247,7 @@ class Server {
         const result = await this.computeProductQueryResult(subscriber.context, {
           changedIds: options?.changedIds
         });
-        subscriber.callback(result);
+        await subscriber.callback(result);
         this.logInfo('recomputeAndNotifyProductQuery: 已推送', {
           subscriberId
         });

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

@@ -0,0 +1,19 @@
+import { BaseModule } from '../../../modules/BaseModule';
+import type { Module, ModuleOptions, PisellCore } from '../../../types';
+/**
+ * 表单定义缓存。数据源负责 HTTP 与 Ably 订阅；本模块仅向 OS 消费方公开只读标题映射。
+ */
+export declare class FormModule extends BaseModule implements Module {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private store;
+    private dataSource;
+    private refreshTimer?;
+    initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    preload(): Promise<void>;
+    getTitleMap(): Record<string, Record<string, string> | string>;
+    private scheduleRefresh;
+    private refresh;
+    destroy(): Promise<void>;
+}
+export default FormModule;