@pisell/pisellos 2.3.159 → 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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -71,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

@@ -606,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:
@@ -664,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,
@@ -699,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/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -1360,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/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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -71,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

@@ -378,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,
@@ -397,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.159",
+  "version": "2.3.160",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",