@pisell/pisellos 2.3.85 → 2.3.87

package/lib/modules/Order/index.js

@@ -3794,6 +3794,13 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     this.store.syncState = 'submitting';
     const paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
+    const enhancePayload = (payload, ctx) => {
+      const enhancedPayload = params.enhancePayload ? params.enhancePayload(payload, ctx) : payload;
+      return {
+        ...enhancedPayload,
+        request_unique_idempotency_token: paymentSyncIdempotencyToken
+      };
+    };
     const submitParams = {
       payments: effectivePayments,
       paymentStatus,
@@ -3801,13 +3808,7 @@ class OrderModule extends _BaseModule.BaseModule {
       businessCode: params.businessCode,
       channel: params.channel,
       confirmPendingVoucherPayments: true,
-      enhancePayload: payload => {
-        const nextPayload = {
-          ...payload,
-          request_unique_idempotency_token: paymentSyncIdempotencyToken
-        };
-        return nextPayload;
-      }
+      enhancePayload
     };
     const submitResult = params.checkoutSyncTaskEnabled === false ? await this.submitTempOrderAsync(submitParams) : await this.submitTempOrder(submitParams);
     return {

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

@@ -608,6 +608,7 @@ export interface SyncPaymentsToOrderParams {
     businessCode?: string;
     channel?: string;
     confirmPendingVoucherPayments?: boolean;
+    enhancePayload?: SubmitPayloadEnhancer;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;

package/lib/server/index.d.ts

@@ -511,6 +511,10 @@ declare class Server {
     private buildCheckoutTaskIdempotencyKey;
     private isBlankCheckoutValue;
     private isLocalCheckoutOrderId;
+    private applyCheckoutFulfillmentBuzzer;
+    private buildCheckoutResourceIdentifierBuzzer;
+    private getCheckoutResourceIdentifier;
+    private stringifyCheckoutResourceIdentifier;
     private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
     private dispatchCheckoutSyncTask;

package/lib/server/index.js

@@ -40,6 +40,8 @@ Object.keys(_modules).forEach(function (key) {
   });
 });
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
+
 // 重新导出类型供外部使用
 
 /** 商品查询订阅者 */
@@ -624,7 +626,8 @@ class Server {
       title
     } = params;
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
-    const checkoutData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
+    const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
+    const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
     const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
     if (!this.app?.request?.post) {
       throw new Error('app.request 不可用');
@@ -693,6 +696,7 @@ class Server {
     const next = (0, _lodashEs.cloneDeep)(this.omitCheckoutSyncMode(data));
     if (!next || typeof next !== 'object') return next;
     const record = next;
+    delete record[OS_FULFILLMENT_REF_MODE_FIELD];
     if (!Array.isArray(record.payments)) return next;
     const originalPayments = record.payments;
     const filteredPayments = originalPayments.filter(payment => !(0, _paymentUtils.isPendingOrderPayment)(payment));
@@ -3379,6 +3383,82 @@ class Server {
   isLocalCheckoutOrderId(orderId) {
     return typeof orderId === 'string' && orderId.startsWith('LOCAL_');
   }
+  applyCheckoutFulfillmentBuzzer(data, title) {
+    if (!data || typeof data !== 'object') return data;
+    const next = {
+      ...data
+    };
+    const refMode = String(next[OS_FULFILLMENT_REF_MODE_FIELD] || '').trim();
+    delete next[OS_FULFILLMENT_REF_MODE_FIELD];
+    if (!refMode) return next;
+    if (refMode === 'manual_input') {
+      this.logInfo(`${title}: fulfillment ref mode 保留手动 buzzer`, {
+        fulfillment_ref_mode: refMode,
+        has_buzzer: !this.isBlankCheckoutValue(next.buzzer)
+      });
+      return next;
+    }
+    if (refMode === 'resource_identifier') {
+      next.buzzer = this.buildCheckoutResourceIdentifierBuzzer(next.bookings);
+    } else if (refMode === 'sale_number') {
+      next.buzzer = this.isBlankCheckoutValue(next.shop_order_number) ? '' : String(next.shop_order_number);
+    } else if (refMode === 'short_number') {
+      next.buzzer = this.isBlankCheckoutValue(next.shop_full_order_number) ? '' : String(next.shop_full_order_number);
+    } else {
+      this.logWarning(`${title}: 未识别的 fulfillment ref mode，跳过 buzzer 自动填充`, {
+        fulfillment_ref_mode: refMode
+      });
+      return next;
+    }
+    this.logInfo(`${title}: fulfillment ref mode 已填充 buzzer`, {
+      fulfillment_ref_mode: refMode,
+      buzzer: next.buzzer
+    });
+    return next;
+  }
+  buildCheckoutResourceIdentifierBuzzer(bookings) {
+    if (!Array.isArray(bookings)) return '';
+    const values = [];
+    const seen = new Set();
+    const visitResource = resource => {
+      const identifier = this.getCheckoutResourceIdentifier(resource);
+      if (identifier && !seen.has(identifier)) {
+        seen.add(identifier);
+        values.push(identifier);
+      }
+      if (Array.isArray(resource?.children)) {
+        resource.children.forEach(visitResource);
+      }
+    };
+    bookings.forEach(booking => {
+      if (Array.isArray(booking?.resources)) {
+        booking.resources.forEach(visitResource);
+      }
+    });
+    return values.join(',');
+  }
+  getCheckoutResourceIdentifier(resource) {
+    if (!resource || typeof resource !== 'object') return '';
+    const candidates = [resource.main_field, resource.name, resource.title, resource.metadata?.resource_name, resource.metadata?.name, resource.relation_id, resource.id];
+    for (const candidate of candidates) {
+      const value = this.stringifyCheckoutResourceIdentifier(candidate);
+      if (value) return value;
+    }
+    return '';
+  }
+  stringifyCheckoutResourceIdentifier(value) {
+    if (value === undefined || value === null) return '';
+    if (typeof value === 'string' || typeof value === 'number') {
+      return String(value).trim();
+    }
+    if (typeof value !== 'object' || Array.isArray(value)) return '';
+    const localeCandidates = [value.original, value.auto, value.en, value['zh-CN'], value.zh_CN, value['zh-HK'], value.zh_HK];
+    for (const candidate of localeCandidates) {
+      const normalized = this.stringifyCheckoutResourceIdentifier(candidate);
+      if (normalized) return normalized;
+    }
+    return '';
+  }
   async normalizeCheckoutSubmitData(data, title) {
     if (!data || typeof data !== 'object') return data;
     const next = {
@@ -3936,7 +4016,8 @@ class Server {
       });
     }
     const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
-    const checkoutData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
+    const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
+    const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
       backendPath,
       data: checkoutData,

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

@@ -20,6 +20,8 @@ export declare class OrderModule extends BaseModule implements Module {
     private storage;
     private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
     private recentSqliteWriteByStorageKey;
+    /** 最近一次清理过期 SQLite 去重记录的时间，避免每次写入都遍历 Map */
+    private lastRecentSqliteWriteCleanupAtMs;
     /** 最近一次 SSE 全量拉取完成时间 */
     private lastServerFullFetchAtMs;
     constructor(name?: string, version?: string);
@@ -58,6 +60,12 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private mergeAuthoritativeOrderCollection;
     private reconcileOverwriteOrderCollections;
+    /**
+     * 惰性清理已经超过去重窗口的 SQLite 写入记录。
+     *
+     * 清理频率与去重窗口一致，既限制 Map 长期增长，也不会移除仍参与去重的记录。
+     */
+    private cleanupExpiredRecentSqliteWrites;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *

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

@@ -57,6 +57,8 @@ class OrderModule extends _BaseModule.BaseModule {
   storage;
   orderSQLiteSaveQueue = Promise.resolve(); /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
   recentSqliteWriteByStorageKey = new Map();
+  /** 最近一次清理过期 SQLite 去重记录的时间，避免每次写入都遍历 Map */
+  lastRecentSqliteWriteCleanupAtMs = 0;
   /** 最近一次 SSE 全量拉取完成时间 */
   lastServerFullFetchAtMs = 0;
   constructor(name, version) {
@@ -292,6 +294,24 @@ class OrderModule extends _BaseModule.BaseModule {
     return this.normalizeOrderCollectionsForIngress((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(reconciled, uidRemaps), 'overwriteExistingOrder.reconciled');
   }
 
+  /**
+   * 惰性清理已经超过去重窗口的 SQLite 写入记录。
+   *
+   * 清理频率与去重窗口一致，既限制 Map 长期增长，也不会移除仍参与去重的记录。
+   */
+  cleanupExpiredRecentSqliteWrites(now) {
+    const elapsedSinceCleanup = now - this.lastRecentSqliteWriteCleanupAtMs;
+    if (this.lastRecentSqliteWriteCleanupAtMs > 0 && elapsedSinceCleanup >= 0 && elapsedSinceCleanup < ORDER_SQLITE_DEDUPE_MS) {
+      return;
+    }
+    for (const [storageKey, recentWrite] of this.recentSqliteWriteByStorageKey) {
+      if (now - recentWrite.ts >= ORDER_SQLITE_DEDUPE_MS) {
+        this.recentSqliteWriteByStorageKey.delete(storageKey);
+      }
+    }
+    this.lastRecentSqliteWriteCleanupAtMs = now;
+  }
+
   /**
    * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
    *
@@ -300,6 +320,7 @@ class OrderModule extends _BaseModule.BaseModule {
    */
   recordRecentSqliteWrite(source, orders) {
     const now = Date.now();
+    this.cleanupExpiredRecentSqliteWrites(now);
     for (const order of orders) {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey) continue;
@@ -1264,6 +1285,8 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     this.isProcessingSyncBatch = false;
     this.pendingSyncMessages = [];
+    this.recentSqliteWriteByStorageKey.clear();
+    this.lastRecentSqliteWriteCleanupAtMs = 0;
     if (this.orderDataSource?.destroy) this.orderDataSource.destroy();
     super.destroy();
   }

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

@@ -151,6 +151,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getAuthoritativeBundleUnitPrice;
     private mergeProductForPriceQuery;
     protected getSubmitOrderSalesChannel(): string | undefined;
+    private getFulfillmentRefModeConfigs;
+    private getFulfillmentRefMode;
+    private buildSubmitPayloadEnhancerWithFulfillmentRefMode;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），

package/lib/solution/BaseSales/index.js

@@ -36,6 +36,7 @@ var _transformBaseProductToOrderProduct = require("./utils/transformBaseProductT
 var _quotationPrice = require("./utils/quotationPrice");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SERVER_ORDER_CHANGED_EVENT = 'order:onOrdersChanged';
+const OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 const WALLET_PAYMENT_CODE_BY_TAG = {
   product_voucher: 'PRODUCTVOUCHER',
   gift_card: 'GIFTCARD',
@@ -1041,6 +1042,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   getSubmitOrderSalesChannel() {
     return this.otherParams?.channel;
   }
+  getFulfillmentRefModeConfigs() {
+    const candidates = [this.otherParams?.openData, this.otherParams?.dineInConfig, this.store?.openData?.getOpenData?.()];
+    return candidates.filter(candidate => candidate && typeof candidate === 'object' && !Array.isArray(candidate));
+  }
+  getFulfillmentRefMode() {
+    for (const config of this.getFulfillmentRefModeConfigs()) {
+      const mode = config['fulfillment.fulfillment_ref_mode'];
+      if (mode === undefined || mode === null) continue;
+      const normalized = String(mode).trim();
+      if (normalized) return normalized;
+    }
+    return undefined;
+  }
+  buildSubmitPayloadEnhancerWithFulfillmentRefMode(enhancePayload) {
+    const fulfillmentRefMode = this.getFulfillmentRefMode();
+    if (!fulfillmentRefMode) return enhancePayload;
+    return (payload, ctx) => {
+      const enhancedPayload = enhancePayload ? enhancePayload(payload, ctx) : payload;
+      return {
+        ...enhancedPayload,
+        [OS_FULFILLMENT_REF_MODE_FIELD]: fulfillmentRefMode
+      };
+    };
+  }
 
   /**
    * 工厂入口：根据子模块名实例化对应模块。
@@ -2018,6 +2043,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     // this.store.order.persistTempOrder();
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
     const smallTicketDataFlag = params?.smallTicketDataFlag ?? this.getDefaultCheckoutSmallTicketDataFlag();
+    const enhancePayload = this.buildSubmitPayloadEnhancerWithFulfillmentRefMode(params?.enhancePayload);
     const submitParams = {
       cacheId: this.cacheId,
       platform: this.otherParams?.platform,
@@ -2037,8 +2063,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       ...(params?.confirmPendingVoucherPayments !== undefined ? {
         confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
       } : {}),
-      ...(params?.enhancePayload !== undefined ? {
-        enhancePayload: params.enhancePayload
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
@@ -2064,6 +2090,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
     const smallTicketDataFlag = params?.smallTicketDataFlag ?? this.getDefaultCheckoutSmallTicketDataFlag();
+    const enhancePayload = this.buildSubmitPayloadEnhancerWithFulfillmentRefMode(params?.enhancePayload);
     const submitParams = {
       cacheId: this.cacheId,
       platform: this.otherParams?.platform,
@@ -2083,8 +2110,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       ...(params?.confirmPendingVoucherPayments !== undefined ? {
         confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
       } : {}),
-      ...(params?.enhancePayload !== undefined ? {
-        enhancePayload: params.enhancePayload
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     return this.store.order.submitTempOrderAsync(submitParams);
@@ -2157,6 +2184,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     const businessCode = params.businessCode ?? this.otherParams?.businessCode ?? this.otherParams?.business_code;
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
+    const enhancePayload = this.buildSubmitPayloadEnhancerWithFulfillmentRefMode(params.enhancePayload);
     const syncParams = {
       ...params,
       checkoutSyncTaskEnabled: this.shouldUseCheckoutSyncTask(),
@@ -2165,6 +2193,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       } : {}),
       ...(channel !== undefined ? {
         channel
+      } : {}),
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     const syncState = this.store.order.getOrderSyncState();

package/lib/solution/BookingTicket/index.js

@@ -275,7 +275,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const prefix = this.normalizeIdPrefix(openDataConfig?.['sale.short_number_prefix'], '');
     const shopOrderPrefix = this.normalizeIdPrefix(openDataConfig?.['sale.sale_number_prefix'], '');
     const resetReceiptSequenceDaily = typeof openDataConfig?.['sale.short_number_daily_reset'] === 'boolean' ? openDataConfig?.['sale.short_number_daily_reset'] : false;
-    const operatingDayBoundary = this.getAppData('operating_day_boundary');
+    const operatingDayBoundary = this.getAppData('operating_day_boundary') || {
+      "type": "start_time",
+      "time": "00:00"
+    };
     const deviceId = await this.getShortNumberOrDeviceId();
     this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
@@ -293,7 +296,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           padReceiptSequence: false,
           receiptSequenceLength,
           resetReceiptSequenceDaily,
-          receiptSequenceResetTime: operatingDayBoundary.time,
+          receiptSequenceResetTime: operatingDayBoundary?.time,
           receiptSequenceStart,
           shopOrderPrefix
         }

package/lib/solution/UnifiedBookingSales/index.js

@@ -986,6 +986,7 @@ const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cu
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
 'missing_resource']);
+const POS_NO_RESOURCE_ID = 0;
 function matchesForcedSelectionGroup(selection, group) {
   const hasGroupId = typeof selection.requirementGroupId === 'string' && selection.requirementGroupId.trim().length > 0;
   const hasFormId = selection.formId !== undefined && selection.formId !== null;
@@ -1066,6 +1067,19 @@ function buildPosForcedAvailabilityAssignments(params) {
       return;
     }
     selectedResourceIds.forEach(resourceId => {
+      if (sameAvailabilityId(resourceId, POS_NO_RESOURCE_ID)) {
+        assignments.push({
+          productId: product.id,
+          resourceId: POS_NO_RESOURCE_ID,
+          formId: group.formId ?? selection.formId,
+          startAt: candidate.bookingStartAt || candidate.startAt,
+          endAt: candidate.bookingEndAt || candidate.endAt,
+          capacityRequired: Math.max(1, partySize),
+          scheduleId: candidate.primaryScheduleRef?.scheduleId,
+          timeSlotId: candidate.primaryScheduleRef?.timeSlotId
+        });
+        return;
+      }
       const resource = resources.find(item => sameAvailabilityId(item.id, resourceId));
       const belongsToGroup = Boolean(resource && !(group.formId !== undefined && resource.formId !== undefined && !sameAvailabilityId(group.formId, resource.formId)) && !(group.resourceIds?.length && !group.resourceIds.some(id => sameAvailabilityId(id, resourceId))));
       if (!resource || !belongsToGroup) {

package/package.json

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