@pisell/pisellos 2.2.309 → 2.2.311

package/dist/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/dist/server/index.js

@@ -45,6 +45,7 @@ import { BaseSalesImpl } from "../solution/BaseSales";
 import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity } from "../modules/Order/payment-utils";
 import { finalizeSalesNotesForCheckout } from "../modules/Order/salesNotes";
 import { normalizeOrderCollections } from "../modules/Order/utils/orderCollectionIdentity";
+import { stripOsPrivatePayloadFields } from "../utils/os-private-payload";
 import { getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales } from "../modules/OpenData";
 var OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 var OS_INVOICE_LAYOUT_CONFIG_FIELD = '_os_invoice_layout_config';
@@ -2574,7 +2575,7 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 6:
               numberedData = _context32.sent;
-              checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+              checkoutData = this.normalizeCheckoutCollections(stripOsPrivatePayloadFields(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
               remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
               _context32.next = 11;
               return this.buildCheckoutDeviceHeaders(title);
@@ -2676,11 +2677,9 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "buildRemoteCheckoutData",
     value: function buildRemoteCheckoutData(data, title) {
-      var next = cloneDeep(this.omitCheckoutSyncMode(data));
+      var next = stripOsPrivatePayloadFields(this.omitCheckoutSyncMode(data));
       if (!next || _typeof(next) !== 'object') return next;
       var 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;
       var originalPayments = record.payments;
@@ -3543,6 +3542,10 @@ var Server = /*#__PURE__*/function () {
         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',
@@ -6414,7 +6417,7 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 14:
               numberedData = _context62.sent;
-              checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+              checkoutData = this.normalizeCheckoutCollections(stripOsPrivatePayloadFields(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
               _context62.next = 18;
               return this.handlePendingSyncCheckoutOrder({
                 backendPath: backendPath,

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

@@ -31,6 +31,33 @@ import { FloorPlanHooks } from "./types";
 var FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
 var 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) {
+  var _ref, _ref2, _value$resData$res, _value$resData, _value$response, _response$code, _response$status, _value$response2;
+  if (error instanceof Error && error.message) return {
+    message: error.message
+  };
+  if (typeof error === 'string' && error) return {
+    message: error
+  };
+  var value = error;
+  var response = (_ref = (_ref2 = (_value$resData$res = value === null || value === void 0 || (_value$resData = value.resData) === null || _value$resData === void 0 ? void 0 : _value$resData.res) !== null && _value$resData$res !== void 0 ? _value$resData$res : value === null || value === void 0 || (_value$response = value.response) === null || _value$response === void 0 ? void 0 : _value$response.data) !== null && _ref2 !== void 0 ? _ref2 : value === null || value === void 0 ? void 0 : value.data) !== null && _ref !== void 0 ? _ref : value;
+  var candidates = [value === null || value === void 0 ? void 0 : value.message, value === null || value === void 0 ? void 0 : value.error, response === null || response === void 0 ? void 0 : response.message, response === null || response === void 0 ? void 0 : response.error];
+  var message = candidates.find(function (candidate) {
+    return typeof candidate === 'string' && candidate.trim() !== '';
+  });
+  return {
+    message: message || '平面图加载失败（未提供错误详情）',
+    code: (_response$code = response === null || response === void 0 ? void 0 : response.code) !== null && _response$code !== void 0 ? _response$code : value === null || value === void 0 ? void 0 : value.code,
+    status: (_response$status = response === null || response === void 0 ? void 0 : response.status) !== null && _response$status !== void 0 ? _response$status : value === null || value === void 0 ? void 0 : value.status,
+    httpStatus: value === null || value === void 0 || (_value$response2 = value.response) === null || _value$response2 === void 0 ? void 0 : _value$response2.status
+  };
+}
+
 /**
  * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
  */
@@ -230,7 +257,7 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadListFromServer",
     value: function () {
       var _loadListFromServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var res, body, raw, list;
+        var res, body, raw, list, errorInfo;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -248,11 +275,15 @@ export var FloorPlanModule = /*#__PURE__*/function (_BaseModule) {
             case 10:
               _context2.prev = 10;
               _context2.t0 = _context2["catch"](0);
+              errorInfo = getRequestErrorInfo(_context2.t0);
               this.logWarning('loadListFromServer 失败', {
-                error: _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0)
+                error: errorInfo.message,
+                code: errorInfo.code,
+                status: errorInfo.status,
+                httpStatus: errorInfo.httpStatus
               });
               return _context2.abrupt("return", []);
-            case 14:
+            case 15:
             case "end":
               return _context2.stop();
           }

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

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

package/dist/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/dist/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;
 }