@pisell/pisellos 2.2.309 → 2.2.311

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

@@ -29,6 +29,10 @@ export interface RulesCalcDiscountOptions {
     discountId?: number;
     selectedList?: SetDiscountSelectedParams[];
     scan?: boolean;
+    /** 本次扫码优先使用的次卡实例；普通重算不传，继续保留商品行当前选择。 */
+    preferredEntitlementPassIds?: number[];
+    /** 普通重算保留商品行已应用的次卡；最优选择传 false 恢复自动排序。 */
+    preserveEntitlementSelection?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
     /** Reweighed order lines only: reapply selected wallet discounts against their new amount. */

package/lib/server/index.js

@@ -29,6 +29,7 @@ var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
 var _salesNotes = require("../modules/Order/salesNotes");
 var _orderCollectionIdentity = require("../modules/Order/utils/orderCollectionIdentity");
+var _osPrivatePayload = require("../utils/os-private-payload");
 var _OpenData = require("../modules/OpenData");
 var _modules = require("./modules");
 Object.keys(_modules).forEach(function (key) {
@@ -643,7 +644,7 @@ class Server {
     } = params;
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+    const checkoutData = this.normalizeCheckoutCollections((0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
     const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
     const deviceHeaders = await this.buildCheckoutDeviceHeaders(title);
     if (!this.app?.request?.post) {
@@ -715,11 +716,9 @@ class Server {
     return next;
   }
   buildRemoteCheckoutData(data, title) {
-    const next = (0, _lodashEs.cloneDeep)(this.omitCheckoutSyncMode(data));
+    const next = (0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.omitCheckoutSyncMode(data));
     if (!next || typeof next !== 'object') return next;
     const record = next;
-    delete record[OS_FULFILLMENT_REF_MODE_FIELD];
-    delete record[OS_INVOICE_LAYOUT_CONFIG_FIELD];
     this.applyKioskCheckoutOperator(record);
     if (!Array.isArray(record.payments)) return next;
     const originalPayments = record.payments;
@@ -1297,6 +1296,10 @@ class Server {
       method: 'get',
       path: '/shop/pay/custom-payment/all',
       handler: this.handlePaymentMethods.bind(this)
+    }, {
+      method: 'get',
+      path: '/pay/custom-payment/all',
+      handler: this.handlePaymentMethods.bind(this)
     }, {
       method: 'get',
       path: '/shop/quotation/available',
@@ -4330,7 +4333,7 @@ class Server {
     }
     const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+    const checkoutData = this.normalizeCheckoutCollections((0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
       backendPath,
       data: checkoutData,

package/lib/server/modules/floor-plan/index.js

@@ -9,6 +9,30 @@ var _types = require("./types");
 const FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
 const FLOOR_PLAN_STORE_NAME = 'floor_plans';
 
+/**
+ * Request failures can be plain response objects (rather than Error instances).
+ * Keep diagnostics useful without allowing the UI bridge to stringify them as
+ * "[object Object]".
+ */
+function getRequestErrorInfo(error) {
+  if (error instanceof Error && error.message) return {
+    message: error.message
+  };
+  if (typeof error === 'string' && error) return {
+    message: error
+  };
+  const value = error;
+  const response = value?.resData?.res ?? value?.response?.data ?? value?.data ?? value;
+  const candidates = [value?.message, value?.error, response?.message, response?.error];
+  const message = candidates.find(candidate => typeof candidate === 'string' && candidate.trim() !== '');
+  return {
+    message: message || '平面图加载失败（未提供错误详情）',
+    code: response?.code ?? value?.code,
+    status: response?.status ?? value?.status,
+    httpStatus: value?.response?.status
+  };
+}
+
 /**
  * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
  */
@@ -144,8 +168,12 @@ class FloorPlanModule extends _BaseModule.BaseModule {
       const list = Array.isArray(raw) ? raw : [];
       return list;
     } catch (e) {
+      const errorInfo = getRequestErrorInfo(e);
       this.logWarning('loadListFromServer 失败', {
-        error: e instanceof Error ? e.message : String(e)
+        error: errorInfo.message,
+        code: errorInfo.code,
+        status: errorInfo.status,
+        httpStatus: errorInfo.httpStatus
       });
       return [];
     }

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

@@ -2036,6 +2036,12 @@ class OrderModule extends _BaseModule.BaseModule {
       mergedRecord[field] = (0, _lodashEs.cloneDeep)(incomingRecord[field]);
     }
 
+    // order_meta_list 是一次性生成的完整业务快照。incoming 明确携带时
+    // 必须整体覆盖（包括 null / 空对象 / 空数组）；省略时才保留 existing。
+    if (Object.prototype.hasOwnProperty.call(incomingRecord, 'order_meta_list')) {
+      mergedRecord.order_meta_list = (0, _lodashEs.cloneDeep)(incomingRecord.order_meta_list);
+    }
+
     // 子项数组遵循完整快照语义：incoming 自有且为数组（包括 []）时权威替换；
     // 字段缺席或不是数组时视为稀疏 patch，继续保留 existing。
     for (const field of ORDER_AUTHORITATIVE_COLLECTION_FIELDS) {

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

@@ -36,6 +36,8 @@ export type OrderSurchargeType = string;
 export interface OrderProductDiscountMetadata {
     /** 设备端本地唯一标识，用于与服务端记录对齐 */
     unique_identification_number?: string;
+    /** 月卡扣除本单新增使用后的剩余次数；不限次数时为 null。 */
+    balance?: number | null;
     [key: string]: unknown;
 }
 /**
@@ -452,10 +454,20 @@ export interface OrderData {
             id: number | string;
             tag: 'point_card';
             product_id?: number | string;
+            code?: string;
             product_name: string;
             par_value: string;
             used_par_value: string;
         }>;
+        virtual_currency_snapshot?: Array<{
+            id: number | string;
+            tag: 'virtual_currency';
+            product_id?: number | string;
+            product_name: string;
+            par_value: string;
+            used_par_value: string;
+            name: Record<string, string>;
+        }>;
     };
     /**
      * 金额汇总（仅输出）。

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

@@ -7,22 +7,41 @@ export declare class PaymentServerModule extends BaseModule implements Module {
     private request;
     private app;
     private logger;
+    private dbManager;
     private store;
-    private payMethodMemoryCache;
-    private payMethodListInFlight;
+    private paymentDataSource;
+    private initialLoadInFlight;
+    private refreshInFlight;
+    private hasLoadedPayMethods;
+    private hasEmittedLoaded;
+    private syncTimer;
+    private pendingMessageUuids;
+    private queuedTrailingRefresh;
+    private trailingMessageUuids;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    preload(): Promise<void>;
     getPayMethodListAsync(options?: {
         shouldFilter?: boolean;
     }): Promise<PaymentMethod[]>;
-    clearPayMethodCache(): void;
-    private loadPayMethodListAsync;
+    private ensureInitialPayMethods;
+    private initPaymentDataSource;
+    private setupPaymentMethodSync;
+    private schedulePaymentMethodRefresh;
+    private refreshPayMethodsSingleFlight;
+    private performRemoteRefresh;
     private fetchRemotePayMethods;
-    private shouldFilterPayMethods;
+    private loadPayMethodsFromSQLite;
+    private replacePayMethodsInSQLite;
+    private resolveCurrentShopScope;
+    private stripSnapshotFields;
+    private arePayMethodsEqual;
     private resolvePayMethods;
     private filterPayMethods;
-    private setPayMethodCache;
+    private setPayMethodMirror;
+    private getErrorMessage;
     private logInfo;
     private logWarning;
     private logError;
+    destroy(): void;
 }