@pisell/pisellos 2.3.158 → 2.3.160

package/dist/solution/BookingByStep/index.d.ts

@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -42,6 +42,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected getRegisteredModuleNames(): readonly string[];
     protected getSubmitOrderSalesChannel(): string;
+    /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+    getFormTitleMap(): Record<string, Record<string, string> | string>;
+    /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+    onFormTitlesChanged(callback: (titles: Record<string, Record<string, string> | string>) => void): () => void;
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -67,6 +71,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
+    private normalizeShortNumberMaximum;
     private normalizeIdPrefix;
     /**
      * 加载销售详情，并在父类基础上把 customer 信息装配到 CustomerModule。

package/dist/solution/BookingTicket/index.js

@@ -51,6 +51,7 @@ import { buildProductOptionStringFromOrderLine } from "../../modules/BookingCont
 import { applyBookingsStatus, applyChildBookingStatus, resolveScheduleId, resolveStatusAfterTransition, restoreBookingsStatus, restoreChildBookingStatus } from "./utils/bookingStatus";
 import { resolveBestAddTimePlan as _resolveBestAddTimePlan } from "./utils/resolveBestAddTimePlan";
 import { createUuidV4 } from "../../modules/Order/utils";
+import { FormHooks } from "../../server/modules/form/types";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 var USER_PLATFORM = ['pc', 'h5'];
@@ -206,6 +207,21 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       return !channel || channel === 'system' ? 'pos' : channel;
     }
 
+    /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+  }, {
+    key: "getFormTitleMap",
+    value: function getFormTitleMap() {
+      var _this$core2, _this$core2$getTitleM;
+      return ((_this$core2 = this.core) === null || _this$core2 === void 0 || (_this$core2 = _this$core2.server) === null || _this$core2 === void 0 || (_this$core2 = _this$core2.form) === null || _this$core2 === void 0 || (_this$core2$getTitleM = _this$core2.getTitleMap) === null || _this$core2$getTitleM === void 0 ? void 0 : _this$core2$getTitleM.call(_this$core2)) || {};
+    }
+
+    /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+  }, {
+    key: "onFormTitlesChanged",
+    value: function onFormTitlesChanged(callback) {
+      return this.core.effects.on(FormHooks.onChanged, callback);
+    }
+
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -590,7 +606,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function () {
       var _configureIdGeneratorFromOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var _openDataConfig, _openDataConfig2, _openDataConfig3, _openDataConfig4, _openDataConfig5, _openDataConfig6;
-        var idGenerator, openDataConfig, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode, _openDataConfig7;
+        var idGenerator, openDataConfig, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode, _openDataConfig7, _openDataConfig8, _openDataConfig9;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -648,10 +664,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 config: {
                   prefix: prefix,
                   deviceCode: deviceId,
-                  // TODO 现在 picoding 没这个配置的 key
-                  padReceiptSequence: false,
+                  padReceiptSequence: ((_openDataConfig7 = openDataConfig) === null || _openDataConfig7 === void 0 ? void 0 : _openDataConfig7['sale.pad_with_leading_zeros']) === true,
                   receiptSequenceLength: receiptSequenceLength,
-                  randomReceiptSequence: ((_openDataConfig7 = openDataConfig) === null || _openDataConfig7 === void 0 ? void 0 : _openDataConfig7['sale.short_number_random']) === true,
+                  receiptSequenceMax: this.normalizeShortNumberMaximum((_openDataConfig8 = openDataConfig) === null || _openDataConfig8 === void 0 ? void 0 : _openDataConfig8['sale.maximum_number']),
+                  randomReceiptSequence: ((_openDataConfig9 = openDataConfig) === null || _openDataConfig9 === void 0 ? void 0 : _openDataConfig9['sale.short_number_random']) === true,
                   resetReceiptSequenceDaily: resetReceiptSequenceDaily,
                   receiptSequenceResetTime: operatingDayBoundary === null || operatingDayBoundary === void 0 ? void 0 : operatingDayBoundary.time,
                   receiptSequenceStart: receiptSequenceStart,
@@ -683,6 +699,19 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       if (!Number.isInteger(numeric) || numeric <= 0) return fallback;
       return numeric;
     }
+  }, {
+    key: "normalizeShortNumberMaximum",
+    value: function normalizeShortNumberMaximum(value) {
+      if (value === undefined || value === null || typeof value === 'string' && !value.trim()) return null;
+      if (typeof value !== 'number' && typeof value !== 'string') {
+        throw new Error('sale.maximum_number 必须是安全正整数或空值');
+      }
+      var numeric = Number(value);
+      if (!Number.isSafeInteger(numeric) || numeric <= 0) {
+        throw new Error('sale.maximum_number 必须是安全正整数或空值');
+      }
+      return numeric;
+    }
   }, {
     key: "normalizeIdPrefix",
     value: function normalizeIdPrefix(value, fallback) {

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

@@ -74,6 +74,8 @@ export interface OpenDataConfig {
     'sale.enable_item_rules'?: boolean;
     'sale.enable_short_number'?: boolean;
     'sale.short_number_digits'?: number;
+    'sale.maximum_number'?: number | string | null;
+    'sale.pad_with_leading_zeros'?: boolean | null;
     'sale.short_number_random'?: boolean;
     'sale.short_number_daily_reset'?: boolean;
     'sale.short_number_start_number'?: number;

package/lib/server/index.js

@@ -17,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");
@@ -183,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,
@@ -1349,7 +1360,7 @@ class Server {
         data
       }) => ({
         code: 200,
-        data: await this.order?.getLocalOrderByLookup(data?.sale_id)
+        data: await this.order?.getLocalOrderForPaymentReadiness(data?.sale_id)
       })
     }, {
       method: 'post',

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;

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

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.FormModule = void 0;
+var _BaseModule = require("../../../modules/BaseModule");
+var _types = require("./types");
+const FORM_LIST_URL = '/shop/form/simple/list';
+
+/**
+ * 表单定义缓存。数据源负责 HTTP 与 Ably 订阅；本模块仅向 OS 消费方公开只读标题映射。
+ */
+class FormModule extends _BaseModule.BaseModule {
+  defaultName = 'form';
+  defaultVersion = '1.0.0';
+  store;
+  dataSource;
+  refreshTimer;
+  async initialize(core, options) {
+    this.core = core;
+    const initialStore = options?.store;
+    this.store = {
+      list: Array.isArray(initialStore?.list) ? initialStore.list : [],
+      map: initialStore?.map instanceof Map ? initialStore.map : new Map()
+    };
+    const FormDataSource = this.core.serverOptions?.All_DATA_SOURCES?.FormDataSource;
+    this.dataSource = FormDataSource ? new FormDataSource() : undefined;
+    if (this.dataSource) {
+      await this.dataSource.run({
+        pubsub: {
+          callback: () => this.scheduleRefresh()
+        }
+      });
+    }
+  }
+  async preload() {
+    await this.refresh();
+  }
+  getTitleMap() {
+    return this.store.list.reduce((result, item) => {
+      if (item.id !== undefined && item.id !== null && item.title) result[String(item.id)] = item.title;
+      return result;
+    }, {});
+  }
+  scheduleRefresh() {
+    if (this.refreshTimer) clearTimeout(this.refreshTimer);
+    this.refreshTimer = setTimeout(() => void this.refresh(), 300);
+  }
+  async refresh() {
+    try {
+      const response = this.dataSource ? await this.dataSource.run({
+        http: {
+          url: FORM_LIST_URL
+        }
+      }) : await this.core.getPlugin('request')?.get(FORM_LIST_URL);
+      const data = response?.data;
+      const list = Array.isArray(data) ? data : data?.list || data?.data || [];
+      if (!Array.isArray(list)) return;
+      this.store.list = list;
+      this.store.map = new Map(this.store.list.map(item => [String(item.id), item]));
+      await this.core.effects.emit(_types.FormHooks.onChanged, this.getTitleMap());
+    } catch {
+      // 接口尚未发布或临时失败时保留现有缓存，展示层会回退订单历史标题。
+    }
+  }
+  async destroy() {
+    if (this.refreshTimer) clearTimeout(this.refreshTimer);
+    this.dataSource?.destroy?.();
+  }
+}
+exports.FormModule = FormModule;
+var _default = exports.default = FormModule;

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

@@ -0,0 +1,13 @@
+export interface FormDefinition {
+    id: string | number;
+    code?: string;
+    title?: Record<string, string> | string;
+    [key: string]: unknown;
+}
+export interface FormState {
+    list: FormDefinition[];
+    map: Map<string, FormDefinition>;
+}
+export declare const FormHooks: {
+    readonly onChanged: "form:onChanged";
+};

package/lib/server/modules/form/types.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FormHooks = void 0;
+const FormHooks = exports.FormHooks = {
+  onChanged: 'form:onChanged'
+};

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

@@ -24,4 +24,7 @@ export { FloorPlanHooks } from './floor-plan/types';
 export { ResourceModule, resourceModule } from './resource';
 export type { ResourceState, ResourceData, ResourceId, ResourceBooking, ResourcePageQuery, ResourcePageResult, QueryOptions, ScheduleEventResource, } from './resource';
 export { ResourceHooks } from './resource';
+export { FormModule } from './form';
+export type { FormDefinition, FormState } from './form/types';
+export { FormHooks } from './form/types';
 export type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, } from '../types';

package/lib/server/modules/index.js

@@ -15,6 +15,18 @@ Object.defineProperty(exports, "FloorPlanModule", {
     return _floorPlan.FloorPlanModule;
   }
 });
+Object.defineProperty(exports, "FormHooks", {
+  enumerable: true,
+  get: function () {
+    return _types6.FormHooks;
+  }
+});
+Object.defineProperty(exports, "FormModule", {
+  enumerable: true,
+  get: function () {
+    return _form.FormModule;
+  }
+});
 Object.defineProperty(exports, "MenuHooks", {
   enumerable: true,
   get: function () {
@@ -105,4 +117,6 @@ var _types4 = require("./order/types");
 var _payment = require("./payment");
 var _floorPlan = require("./floor-plan");
 var _types5 = require("./floor-plan/types");
-var _resource = require("./resource");
+var _resource = require("./resource");
+var _form = require("./form");
+var _types6 = require("./form/types");

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

@@ -105,6 +105,8 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
     private buildLocalPaymentOrderLogContext;
     getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
+    /** Read-only payment gate lookup; never hydrate the whole order list on a miss. */
+    getLocalOrderForPaymentReadiness(lookup: OrderId): Promise<OrderData | null>;
     getLocalOrderByLookup(lookup: OrderId, options?: {
         operationId?: string;
     }): Promise<OrderData | null>;

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

@@ -638,6 +638,42 @@ class OrderModule extends _BaseModule.BaseModule {
     const memoryOrder = this.store.list.find(order => this.isOrderLookupMatch(order, key));
     return memoryOrder || null;
   }
+
+  /** Read-only payment gate lookup; never hydrate the whole order list on a miss. */
+  async getLocalOrderForPaymentReadiness(lookup) {
+    if (lookup === undefined || lookup === null || lookup === '') return null;
+    const memoryOrder = this.getLocalOrderFromMemoryByLookup(lookup);
+    if (memoryOrder) return memoryOrder;
+    if (typeof this.dbManager?.find !== 'function') {
+      return this.getLocalOrderByLookup(lookup);
+    }
+    const key = this.getIdKey(lookup);
+    const fields = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+    const candidates = [];
+    for (const column of fields) {
+      // Match getAll's storage-key ordering even when aliases collide across rows.
+      // Let query errors reach the payment gate rather than treating them as a miss.
+      const rows = await this.dbManager.find(INDEXDB_STORE_NAME, {
+        filters: [{
+          column,
+          op: '=',
+          value: key
+        }],
+        orderBy: [{
+          column: '__order_storage_key',
+          dir: 'asc'
+        }],
+        limit: 1
+      });
+      if (rows?.[0] && this.isOrderLookupMatch(rows[0], key)) candidates.push(rows[0]);
+    }
+    candidates.sort((left, right) => {
+      const leftKey = String(left.__order_storage_key ?? this.getOrderStorageKey(left));
+      const rightKey = String(right.__order_storage_key ?? this.getOrderStorageKey(right));
+      return leftKey < rightKey ? -1 : leftKey > rightKey ? 1 : 0;
+    });
+    return candidates.length ? this.normalizeOrderForMemoryList(candidates[0], 'paymentReadiness.sqlite') : null;
+  }
   async getLocalOrderByLookup(lookup, options = {}) {
     const key = this.getIdKey(lookup);
     const logContext = {

package/lib/solution/BookingByStep/index.d.ts

@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -42,6 +42,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected getRegisteredModuleNames(): readonly string[];
     protected getSubmitOrderSalesChannel(): string;
+    /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+    getFormTitleMap(): Record<string, Record<string, string> | string>;
+    /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+    onFormTitlesChanged(callback: (titles: Record<string, Record<string, string> | string>) => void): () => void;
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -67,6 +71,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
+    private normalizeShortNumberMaximum;
     private normalizeIdPrefix;
     /**
      * 加载销售详情，并在父类基础上把 customer 信息装配到 CustomerModule。

package/lib/solution/BookingTicket/index.js

@@ -39,6 +39,7 @@ var _orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDis
 var _bookingStatus = require("./utils/bookingStatus");
 var _resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
 var _utils = require("../../modules/Order/utils");
+var _types2 = require("../../server/modules/form/types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
 const OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
@@ -179,6 +180,16 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     return !channel || channel === 'system' ? 'pos' : channel;
   }
 
+  /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+  getFormTitleMap() {
+    return this.core?.server?.form?.getTitleMap?.() || {};
+  }
+
+  /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+  onFormTitlesChanged(callback) {
+    return this.core.effects.on(_types2.FormHooks.onChanged, callback);
+  }
+
   /**
    * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
    * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -367,9 +378,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         config: {
           prefix,
           deviceCode: deviceId,
-          // TODO 现在 picoding 没这个配置的 key
-          padReceiptSequence: false,
+          padReceiptSequence: openDataConfig?.['sale.pad_with_leading_zeros'] === true,
           receiptSequenceLength,
+          receiptSequenceMax: this.normalizeShortNumberMaximum(openDataConfig?.['sale.maximum_number']),
           randomReceiptSequence: openDataConfig?.['sale.short_number_random'] === true,
           resetReceiptSequenceDaily,
           receiptSequenceResetTime: operatingDayBoundary?.time,
@@ -386,6 +397,17 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     if (!Number.isInteger(numeric) || numeric <= 0) return fallback;
     return numeric;
   }
+  normalizeShortNumberMaximum(value) {
+    if (value === undefined || value === null || typeof value === 'string' && !value.trim()) return null;
+    if (typeof value !== 'number' && typeof value !== 'string') {
+      throw new Error('sale.maximum_number 必须是安全正整数或空值');
+    }
+    const numeric = Number(value);
+    if (!Number.isSafeInteger(numeric) || numeric <= 0) {
+      throw new Error('sale.maximum_number 必须是安全正整数或空值');
+    }
+    return numeric;
+  }
   normalizeIdPrefix(value, fallback) {
     if (value === undefined || value === null) return fallback;
     const normalized = String(value).trim().toUpperCase();

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.158",
+  "version": "2.3.160",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",