@pisell/pisellos 2.2.284 → 2.2.286

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView } from '../../modules/Order/types';
+import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,7 +260,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null, options?: {
+        source?: OrderCustomerChangePayload['source'];
+    }): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -451,7 +453,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -540,7 +540,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
                 });
                 customerModule.setSelectedCustomer(customer);
-                this.setOrderCustomer(customer);
+                // 详情 hydrate 后仍需广播一次，让 CustomerContext 等 UI 订阅方拿到刚补齐的
+                // customerSnapshot；但它不是用户主动切换客户。通过 source 明确标记初始化事件，
+                // 商品报价/折扣订阅方即可跳过 prepare/config，其他旧订阅方仍可照常刷新 UI。
+                this.setOrderCustomer(customer, {
+                  source: 'detailHydrate'
+                });
                 // await this.store.order.saveDraft();
               }
               return _context6.abrupt("return", sales);
@@ -1562,7 +1567,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
      */
   }, {
     key: "setOrderCustomer",
-    value: function setOrderCustomer(customer) {
+    value: function setOrderCustomer(customer, options) {
       var _this$store$order$get3,
         _this3 = this;
       if (!customer) {
@@ -1585,12 +1590,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         var snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
         if (snapshotReplenished) {
           var _next2 = this.buildOrderCustomerPayload();
-          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2);
+          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2 && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, _next2), {}, {
+            source: options.source
+          }) : _next2);
         }
         return;
       }
       var next = this.buildOrderCustomerPayload();
-      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
+      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, next), {}, {
+        source: options.source
+      }) : next);
       this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
       // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
       var promotionRefreshTask = this.store.order.applyPromotion().then(function () {

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/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

@@ -157,11 +157,13 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
+    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
@@ -606,6 +608,7 @@ export interface SyncPaymentsToOrderParams {
     businessCode?: string;
     channel?: string;
     confirmPendingVoucherPayments?: boolean;
+    enhancePayload?: SubmitPayloadEnhancer;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;

package/lib/modules/Order/types.js

@@ -56,6 +56,7 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 /**

package/lib/modules/ProductList/index.js

@@ -149,9 +149,15 @@ class ProductList extends _BaseModule.BaseModule {
       extension_type,
       strategy_context
     };
+    const originalCallback = options?.callback;
+    const subscriptionCallback = originalCallback ? async result => {
+      const products = Array.isArray(result?.data?.list) ? result.data.list : [];
+      await this.addProduct(products);
+      originalCallback(result);
+    } : undefined;
     const productsData = await this.request.post(`/product/query`, queryPayload, {
       osServer: true,
-      callback: options?.callback,
+      callback: subscriptionCallback,
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });

package/lib/modules/Summary/utils.d.ts

@@ -72,7 +72,7 @@ export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

package/lib/server/index.d.ts

@@ -505,6 +505,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';
+
 // 重新导出类型供外部使用
 
 /** 商品查询订阅者 */
@@ -614,7 +616,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 不可用');
@@ -683,6 +686,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));
@@ -3342,6 +3346,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 = {
@@ -3898,7 +3978,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

@@ -56,6 +56,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) {
@@ -285,6 +287,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 回声去重使用。
    *
@@ -293,6 +313,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;
@@ -1176,6 +1197,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

@@ -136,6 +136,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

@@ -34,6 +34,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',
@@ -845,6 +846,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
+      };
+    };
+  }
 
   /**
    * 工厂入口：根据子模块名实例化对应模块。
@@ -1398,9 +1423,20 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!params.products.length) return false;
     const hasDraftProduct = params.products.some(product => !this.isPersistedOrderProduct(product));
     if (hasDraftProduct) return false;
-    const hasSelectedDiscount = params.currentDiscountList.some(discount => discount.isSelected || discount.isEditMode || discount.isManualSelect);
-    if (hasSelectedDiscount) return false;
-    return !params.nextDiscountList.some(discount => discount.isSelected || discount.isEditMode || discount.isManualSelect);
+
+    // 编辑详情 hydrate 时，商品行上的历史券卡会被还原为 isEditMode=true、
+    // isSelected=true 的只读记录。它们表示“该折扣已在原订单结算”，不是用户在
+    // 当前编辑会话中新做的选择，不能据此放行刚从 prepare/config 拉回来的折扣。
+    // 否则后续 Rules.calcDiscount 会把没有 isManualSelect 标记的可用 runtime 卡
+    // 当作自动候选，再次写入 tempOrder。这里只识别非 isEditMode 的 runtime 状态；
+    // 新建单、编辑态新增商品以及用户本次明确选择/取消折扣的原有流程保持不变。
+    const hasRuntimeDiscountSelection = params.currentDiscountList.some(discount => !discount.isEditMode && (discount.isSelected || discount.isManualSelect));
+    if (hasRuntimeDiscountSelection) return false;
+
+    // nextDiscountList 已经合并了历史只读折扣与本次获取的 runtime 折扣，
+    // 因此这里同样必须排除 isEditMode；只有 runtime 条目已有明确选择状态时，
+    // 才允许继续进入折扣重算。
+    return !params.nextDiscountList.some(discount => !discount.isEditMode && (discount.isSelected || discount.isManualSelect));
   }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length) return discountList;
@@ -1811,6 +1847,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,
@@ -1830,8 +1867,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);
@@ -1857,6 +1894,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,
@@ -1876,8 +1914,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);
@@ -1950,6 +1988,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(),
@@ -1958,6 +1997,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       } : {}),
       ...(channel !== undefined ? {
         channel
+      } : {}),
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     const syncState = this.store.order.getOrderSyncState();

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

@@ -326,7 +326,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 | 5 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView } from '../../modules/Order/types';
+import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,7 +260,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null, options?: {
+        source?: OrderCustomerChangePayload['source'];
+    }): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -451,7 +453,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -349,7 +349,12 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         country_calling_code: selectedCustomer?.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer);
+      // 详情 hydrate 后仍需广播一次，让 CustomerContext 等 UI 订阅方拿到刚补齐的
+      // customerSnapshot；但它不是用户主动切换客户。通过 source 明确标记初始化事件，
+      // 商品报价/折扣订阅方即可跳过 prepare/config，其他旧订阅方仍可照常刷新 UI。
+      this.setOrderCustomer(customer, {
+        source: 'detailHydrate'
+      });
       // await this.store.order.saveDraft();
     }
     return sales;
@@ -926,7 +931,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
-  setOrderCustomer(customer) {
+  setOrderCustomer(customer, options) {
     if (!customer) {
       this.clearOrderCustomer();
       return;
@@ -947,12 +952,18 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
       if (snapshotReplenished) {
         const next = this.buildOrderCustomerPayload();
-        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next && options?.source ? {
+          ...next,
+          source: options.source
+        } : next);
       }
       return;
     }
     const next = this.buildOrderCustomerPayload();
-    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next && options?.source ? {
+      ...next,
+      source: options.source
+    } : next);
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
     const promotionRefreshTask = this.store.order.applyPromotion().then(() => undefined);