@pisell/pisellos 0.10.16 → 0.10.18

package/dist/solution/UnifiedBookingSales/types.d.ts

@@ -1,4 +1,4 @@
-import type { OpenDataConfig } from '../../modules/OpenData';
+import type { InvoiceLayoutConfig, InvoiceTemplateSettings, OpenDataConfig } from '../../modules/OpenData';
 import type { ProductListLoadProductsParams } from '../../modules/ProductList';
 import type { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import type { AvailabilityDateRange, AvailabilityErrorCode, AvailabilityId, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProjection, AvailabilityQuery, AvailabilityRequirementSelection, AvailabilityResource, AvailabilitySelectionValidationResult, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, ResourceAvailabilityGroup, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem } from '../../modules/ResourcePlanner';
@@ -201,7 +201,13 @@ export interface UnifiedBookingSalesDiscountResult {
 }
 export interface UnifiedBookingSalesApi {
     loadOpenData: (params: UnifiedBookingSalesLoadOpenDataParams) => Promise<OpenDataConfig>;
+    /** Returns the latest OpenData payload cached by this solution instance. */
     getOpenData: () => Promise<OpenDataConfig | null>;
+    /** Returns the normalized Documents Invoice layout for the active target. */
+    getInvoiceLayoutConfig: () => Promise<InvoiceLayoutConfig>;
+    /** Returns the Native Invoice template settings for the active target. */
+    getInvoiceTemplateSettings: () => Promise<InvoiceTemplateSettings>;
+    /** Date-first calendar availability backed by ScheduleModule. */
     loadScheduleAvailableDate: (params: LoadScheduleAvailableDateParams) => Promise<unknown>;
     loadProductsByScheduleDate: (params: UnifiedBookingSalesLoadProductsByScheduleDateParams) => Promise<unknown[]>;
     stageRetailProducts: (params: UnifiedBookingSalesStageRetailProductsParams) => Promise<Record<string, any> | null>;

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"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; }
+"use strict";

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

@@ -1,9 +1,9 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import type { ScheduleModule } from '../Schedule';
-import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult } from './types';
+import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export * from './types';
-export { computeAvailability } from './utils';
+export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, } from './utils';
 export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -15,6 +15,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     private openCache;
     private fatherModule;
     private otherParams;
+    private fetchRevision;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -26,6 +27,8 @@ export declare class OpenDataModule extends BaseModule implements Module {
     updateOtherParams(params: Record<string, any>): void;
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
+    getInvoiceLayoutConfig(): InvoiceLayoutConfig;
+    getInvoiceTemplateSettings(): InvoiceTemplateSettings;
     getLastFetchedAt(): number | null;
     /** 清除内存与 sessionStorage 镜像中的 OpenData，供宿主切店时调用。 */
     clearCache(): void;

package/lib/modules/OpenData/index.js

@@ -5,7 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   OpenDataModule: true,
-  computeAvailability: true
+  computeAvailability: true,
+  getDefaultInvoiceLayoutConfig: true,
+  getDefaultInvoiceTemplateSettings: true,
+  normalizeInvoiceLayoutConfig: true,
+  normalizeInvoiceTemplateSettings: true,
+  normalizeRawInvoiceTemplateSettings: true
 };
 exports.OpenDataModule = void 0;
 Object.defineProperty(exports, "computeAvailability", {
@@ -14,6 +19,36 @@ Object.defineProperty(exports, "computeAvailability", {
     return _utils.computeAvailability;
   }
 });
+Object.defineProperty(exports, "getDefaultInvoiceLayoutConfig", {
+  enumerable: true,
+  get: function () {
+    return _utils.getDefaultInvoiceLayoutConfig;
+  }
+});
+Object.defineProperty(exports, "getDefaultInvoiceTemplateSettings", {
+  enumerable: true,
+  get: function () {
+    return _utils.getDefaultInvoiceTemplateSettings;
+  }
+});
+Object.defineProperty(exports, "normalizeInvoiceLayoutConfig", {
+  enumerable: true,
+  get: function () {
+    return _utils.normalizeInvoiceLayoutConfig;
+  }
+});
+Object.defineProperty(exports, "normalizeInvoiceTemplateSettings", {
+  enumerable: true,
+  get: function () {
+    return _utils.normalizeInvoiceTemplateSettings;
+  }
+});
+Object.defineProperty(exports, "normalizeRawInvoiceTemplateSettings", {
+  enumerable: true,
+  get: function () {
+    return _utils.normalizeRawInvoiceTemplateSettings;
+  }
+});
 var _BaseModule = require("../BaseModule");
 var _utils = require("./utils");
 var _types = require("./types");
@@ -39,6 +74,7 @@ class OpenDataModule extends _BaseModule.BaseModule {
   openCache = false;
   fatherModule;
   otherParams = {};
+  fetchRevision = 0;
   constructor(name, version) {
     super(name, version);
   }
@@ -75,6 +111,7 @@ class OpenDataModule extends _BaseModule.BaseModule {
     this.fatherModule = this.otherParams.fatherModule;
   }
   async fetchOpenData(params) {
+    const fetchRevision = ++this.fetchRevision;
     const getData = this.appPlugin?.getData?.();
     const shopId = getData?.('shop_id');
     if (!shopId) throw new Error('[OpenDataModule] 无法获取 shop_id');
@@ -95,19 +132,29 @@ class OpenDataModule extends _BaseModule.BaseModule {
       throw new Error(response?.message || '获取 OpenData 配置失败');
     }
     const data = response?.data || {};
-    this.store.data = data;
-    this.store.lastFetchedAt = Date.now();
+    // clearCache() 或后续请求发生后，旧响应不得复活已失效的 target 配置。
+    if (fetchRevision === this.fetchRevision) {
+      this.store.data = data;
+      this.store.lastFetchedAt = Date.now();
+    }
     return data;
   }
   getOpenData() {
     return this.store.data;
   }
+  getInvoiceLayoutConfig() {
+    return (0, _utils.normalizeInvoiceLayoutConfig)(this.store.data);
+  }
+  getInvoiceTemplateSettings() {
+    return (0, _utils.normalizeInvoiceTemplateSettings)(this.store.data);
+  }
   getLastFetchedAt() {
     return this.store.lastFetchedAt ?? null;
   }
 
   /** 清除内存与 sessionStorage 镜像中的 OpenData，供宿主切店时调用。 */
   clearCache() {
+    this.fetchRevision += 1;
     this.store.data = null;
     this.store.lastFetchedAt = null;
   }

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

@@ -8,6 +8,40 @@ export interface MultiLangObject {
     original?: string;
     [key: string]: string | undefined;
 }
+export declare const INVOICE_MODULE_KEYS: readonly ["reference", "brand", "custom_1", "order", "handover", "customer", "line_groups", "settlement", "custom_2", "payment", "card", "total_savings", "custom_3", "barcode"];
+export type InvoiceModuleKey = (typeof INVOICE_MODULE_KEYS)[number];
+/**
+ * Documents Registry 中的 Invoice 模块配置。
+ *
+ * 模块 key、显隐值及模块私有字段均由 Registry/Native 约定，OS 不做枚举收窄或改写。
+ */
+export interface InvoiceTemplateModuleConfig {
+    key: string;
+    is_show?: unknown;
+    [key: string]: unknown;
+}
+export interface InvoiceModuleConfig extends InvoiceTemplateModuleConfig {
+}
+export interface InvoiceLayoutConfig {
+    locale?: string;
+    module: InvoiceModuleConfig[];
+}
+export interface InvoiceTemplateSettings {
+    template: string;
+    language: Record<string, number>;
+    modules: InvoiceTemplateModuleConfig[];
+    [key: string]: unknown;
+}
+export type RawInvoiceEditConfig = string | {
+    language?: unknown;
+    modules?: unknown;
+    [key: string]: unknown;
+};
+export type RawInvoiceLayoutConfig = string | {
+    locale?: unknown;
+    module?: unknown[];
+    [key: string]: unknown;
+};
 export interface OpenDataConfig {
     'basic.enable'?: boolean;
     'basic.code'?: string | null;
@@ -45,6 +79,14 @@ export interface OpenDataConfig {
         label: string;
         value: number;
     }>;
+    'documents.invoice_template'?: string;
+    'documents.invoice_edit'?: RawInvoiceEditConfig;
+    /** @deprecated 仅保留旧调用方的类型兼容，Invoice 读取逻辑不再消费该字段。 */
+    'documents.invoice'?: RawInvoiceLayoutConfig;
+    /** @deprecated Invoice 读取逻辑只消费扁平的 documents.invoice_* 字段。 */
+    documents?: {
+        invoice?: RawInvoiceLayoutConfig;
+    };
     [key: string]: any;
 }
 export interface OpenDataState {

package/lib/modules/OpenData/types.js

@@ -2,4 +2,12 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.INVOICE_MODULE_KEYS = void 0;
+const INVOICE_MODULE_KEYS = exports.INVOICE_MODULE_KEYS = ['reference', 'brand', 'custom_1', 'order', 'handover', 'customer', 'line_groups', 'settlement', 'custom_2', 'payment', 'card', 'total_savings', 'custom_3', 'barcode'];
+
+/**
+ * Documents Registry 中的 Invoice 模块配置。
+ *
+ * 模块 key、显隐值及模块私有字段均由 Registry/Native 约定，OS 不做枚举收窄或改写。
+ */

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

@@ -1,2 +1,16 @@
-import type { OpenDataAvailabilityResult, ComputeAvailabilityParams } from './types';
+import type { OpenDataConfig, OpenDataAvailabilityResult, ComputeAvailabilityParams, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
+export declare function getDefaultInvoiceLayoutConfig(): InvoiceLayoutConfig;
+export declare function getDefaultInvoiceTemplateSettings(): InvoiceTemplateSettings;
+/**
+ * 规范化已经提取出的公开 template_settings 值，供打印入口复用。
+ */
+export declare function normalizeRawInvoiceTemplateSettings(value: unknown): InvoiceTemplateSettings;
+/**
+ * 从 OpenData Documents section 的两个扁平字段中构造 Native Invoice 配置。
+ */
+export declare function normalizeInvoiceTemplateSettings(config: OpenDataConfig | null | undefined): InvoiceTemplateSettings;
+/**
+ * 将 invoice_edit.modules 原样投影为 Web Invoice 使用的 module 字段。
+ */
+export declare function normalizeInvoiceLayoutConfig(config: OpenDataConfig | null | undefined): InvoiceLayoutConfig;
 export declare function computeAvailability(params: ComputeAvailabilityParams): OpenDataAvailabilityResult;

package/lib/modules/OpenData/utils.js

@@ -4,9 +4,94 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.computeAvailability = computeAvailability;
+exports.getDefaultInvoiceLayoutConfig = getDefaultInvoiceLayoutConfig;
+exports.getDefaultInvoiceTemplateSettings = getDefaultInvoiceTemplateSettings;
+exports.normalizeInvoiceLayoutConfig = normalizeInvoiceLayoutConfig;
+exports.normalizeInvoiceTemplateSettings = normalizeInvoiceTemplateSettings;
+exports.normalizeRawInvoiceTemplateSettings = normalizeRawInvoiceTemplateSettings;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function isRecord(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function parseInvoiceRecord(value) {
+  let parsed = value;
+  if (typeof parsed === 'string') {
+    try {
+      parsed = JSON.parse(parsed);
+    } catch {
+      return null;
+    }
+  }
+  return isRecord(parsed) ? parsed : null;
+}
+function getDefaultInvoiceLayoutConfig() {
+  return {
+    module: []
+  };
+}
+function getDefaultInvoiceTemplateSettings() {
+  return {
+    template: 'DEFAULT',
+    language: {},
+    modules: []
+  };
+}
+function normalizeInvoiceTemplate(value) {
+  if (typeof value !== 'string' || value.trim().length === 0) return 'DEFAULT';
+  return value.trim().toUpperCase() === 'DEFAULT' ? 'DEFAULT' : value;
+}
+function normalizeInvoiceLanguage(value) {
+  if (!isRecord(value)) return {};
+  if (Object.values(value).some(item => typeof item !== 'number')) return {};
+  return {
+    ...value
+  };
+}
+function normalizeInvoiceModules(value) {
+  if (!Array.isArray(value)) return [];
+  if (value.some(item => !isRecord(item) || typeof item.key !== 'string')) {
+    return [];
+  }
+  return value.map(item => ({
+    ...item
+  }));
+}
+
+/**
+ * 规范化已经提取出的公开 template_settings 值，供打印入口复用。
+ */
+function normalizeRawInvoiceTemplateSettings(value) {
+  const parsed = parseInvoiceRecord(value);
+  if (!parsed) return getDefaultInvoiceTemplateSettings();
+  return {
+    ...parsed,
+    template: normalizeInvoiceTemplate(parsed.template),
+    language: normalizeInvoiceLanguage(parsed.language),
+    modules: normalizeInvoiceModules(parsed.modules)
+  };
+}
+
+/**
+ * 从 OpenData Documents section 的两个扁平字段中构造 Native Invoice 配置。
+ */
+function normalizeInvoiceTemplateSettings(config) {
+  const parsedEdit = parseInvoiceRecord(config?.['documents.invoice_edit']);
+  return normalizeRawInvoiceTemplateSettings({
+    ...(parsedEdit ?? {}),
+    template: normalizeInvoiceTemplate(config?.['documents.invoice_template'])
+  });
+}
+
+/**
+ * 将 invoice_edit.modules 原样投影为 Web Invoice 使用的 module 字段。
+ */
+function normalizeInvoiceLayoutConfig(config) {
+  return {
+    module: normalizeInvoiceTemplateSettings(config).modules
+  };
+}
 function toBoolean(value) {
   if (typeof value === 'boolean') return value;
   if (typeof value === 'string') return value === 'true' || value === '1';

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

@@ -182,6 +182,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private normalizeDepositFlag;
+    private getHistoricalDepositSnapshot;
     private getLastOrderDepositSnapshot;
     private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
@@ -526,7 +528,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -1044,19 +1044,26 @@ class OrderModule extends _BaseModule.BaseModule {
   normalizeDepositAmount(amount) {
     return _decimal.default.max(new _decimal.default(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
   }
-  getLastOrderDepositSnapshot() {
-    const lastOrderInfo = this.store.lastOrderInfo;
-    if (!lastOrderInfo || typeof lastOrderInfo !== 'object') return null;
-    const rawDepositAmount = lastOrderInfo.deposit_amount ?? lastOrderInfo.summary?.deposit_amount;
+  normalizeDepositFlag(value) {
+    if (value === 0 || value === '0') return 0;
+    if (value === 1 || value === '1') return 1;
+    return null;
+  }
+  getHistoricalDepositSnapshot(source) {
+    if (!source || typeof source !== 'object') return null;
+    const record = source;
+    const rawDepositAmount = record.deposit_amount ?? record.summary?.deposit_amount;
     const depositAmount = this.normalizeDepositAmount(rawDepositAmount ?? 0);
-    const hasDepositAmount = new _decimal.default(depositAmount).gt(0);
-    const isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
-    if (!isDeposit || !hasDepositAmount) return null;
+    if (!new _decimal.default(depositAmount).gt(0)) return null;
     return {
-      isDeposit: 1,
+      // 兼容历史数据：旧快照缺少 is_deposit 时，沿用正定金金额的推导规则。
+      isDeposit: this.normalizeDepositFlag(record.is_deposit) ?? 1,
       depositAmount
     };
   }
+  getLastOrderDepositSnapshot() {
+    return this.getHistoricalDepositSnapshot(this.store.lastOrderInfo);
+  }
   getLastOrderSubmitSnapshot() {
     const lastOrderInfo = this.store.lastOrderInfo;
     if (!lastOrderInfo || typeof lastOrderInfo !== 'object') return {};
@@ -1104,7 +1111,7 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     };
     tempOrder.deposit_amount = snapshot.depositAmount;
-    tempOrder.is_deposit = tempOrder.is_deposit === 0 && new _decimal.default(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+    tempOrder.is_deposit = snapshot.isDeposit;
     return nextSummary;
   }
   isDepositOrder(tempOrder, depositAmount) {
@@ -1641,10 +1648,17 @@ class OrderModule extends _BaseModule.BaseModule {
       ...(0, _lodashEs.cloneDeep)(snapshot.summary || {})
     };
     const shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+    const historicalDepositSnapshot = this.getHistoricalDepositSnapshot(snapshot);
     if (shouldUseManualDepositOverride) {
       summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
-    } else if (manualDepositOverride) {
-      this.clearManualDepositOverride(tempOrder);
+    } else {
+      if (manualDepositOverride) {
+        this.clearManualDepositOverride(tempOrder);
+      }
+      if (historicalDepositSnapshot) {
+        summary = this.applyDepositAmountToSummary(tempOrder, summary, historicalDepositSnapshot.depositAmount);
+        tempOrder.is_deposit = historicalDepositSnapshot.isDeposit;
+      }
     }
     const isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
     if (!isPayableAmountUnchanged) return null;
@@ -1661,8 +1675,8 @@ class OrderModule extends _BaseModule.BaseModule {
       tempOrder.surcharges = (0, _lodashEs.cloneDeep)(snapshot.surcharges);
     }
     tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
-    tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-    tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+    tempOrder.deposit_amount = this.normalizeDepositAmount(summary.deposit_amount || 0);
+    tempOrder.is_deposit = shouldUseManualDepositOverride ? new _decimal.default(tempOrder.deposit_amount).gt(0) ? 1 : 0 : historicalDepositSnapshot?.isDeposit ?? (new _decimal.default(tempOrder.deposit_amount).gt(0) ? 1 : 0);
     const previousSummary = this.store.summary;
     this.store.summary = summary;
     this.updateTempOrderPaymentStatus(tempOrder, {
@@ -2120,7 +2134,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const isExistingDepositDisabled = tempOrder.is_deposit === 0 && new _decimal.default(tempOrder.deposit_amount || 0).gt(0);
     tempOrder.deposit_amount = depositAmount;
     tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
-    return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
+    return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
     const tempOrder = options?.createIfMissing ? this.ensureTempOrder() : this.store.tempOrder;
@@ -3971,6 +3985,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,
@@ -3978,13 +3999,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 {
@@ -4363,6 +4378,7 @@ class OrderModule extends _BaseModule.BaseModule {
       externalSaleNumber: nextTempOrder.external_sale_number
     };
     const rawSummary = raw.summary && typeof raw.summary === 'object' ? raw.summary : {};
+    const historicalDepositSnapshot = this.getHistoricalDepositSnapshot(sourceLastOrderInfo);
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(s => ({
       ...(s || {})
     })) : (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []);
@@ -4381,6 +4397,10 @@ class OrderModule extends _BaseModule.BaseModule {
         surcharges: (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []),
         shop_discount: nextTempOrder.shop_discount || '0.00',
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || []),
+        ...(historicalDepositSnapshot ? {
+          is_deposit: historicalDepositSnapshot.isDeposit,
+          deposit_amount: historicalDepositSnapshot.depositAmount
+        } : {}),
         // merged record 的 summary 仍是远端旧值，保留快照仅用于完整重算的价格清理基线。
         ...(isMergedSalesDetailHydrate ? {
           requiresFullSummaryRecalculation: true

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;
@@ -612,6 +614,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

@@ -202,23 +202,26 @@ class ProductList extends _BaseModule.BaseModule {
       strategy_context
     };
     const handledByOsServer = this.isProductQueryHandledByOsServer();
-    const callback = !handledByOsServer && typeof options?.callback === 'function' ? result => {
+    const originalCallback = options?.callback;
+    const subscriptionCallback = originalCallback ? async result => {
       const callbackList = result?.data?.list;
       if (!Array.isArray(callbackList)) {
-        options.callback?.(result);
+        originalCallback(result);
         return;
       }
-      options.callback?.({
+      const resolvedCallbackList = this.resolveClientDataVariants(callbackList, queryPayload, handledByOsServer);
+      await this.addProduct(resolvedCallbackList);
+      originalCallback(resolvedCallbackList === callbackList ? result : {
         ...result,
         data: {
           ...result.data,
-          list: this.resolveClientDataVariants(callbackList, queryPayload, false)
+          list: resolvedCallbackList
         }
       });
-    } : options?.callback;
+    } : undefined;
     const productsData = await this.request.post(`/product/query`, queryPayload, {
       osServer: true,
-      callback,
+      callback: subscriptionCallback,
       subscriberId: options?.subscriberId,
       customToast: () => {}
     });

package/lib/modules/Rules/index.js

@@ -1961,7 +1961,7 @@ class RulesModule extends _BaseModule.BaseModule {
     // 套餐适用范围配置
     const packageScope = usageRules?.package_scope;
     const {
-      type: scopeType,
+      type: scopeType = 'product_all',
       exclude_bundle_product_ids = [],
       include_bundle_product_ids = [],
       filter = 0
@@ -1969,6 +1969,8 @@ class RulesModule extends _BaseModule.BaseModule {
     const isMainProduct = flatItem.type === 'main'; // 单独购买
     const isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
     const bundleMainProductId = flatItem.product?.product_id;
+    // 主商品id
+    const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
 
     // 主商品直接可用
     if (isMainProduct) {
@@ -1985,7 +1987,7 @@ class RulesModule extends _BaseModule.BaseModule {
         const priceType = flatItem.bundleItem?.price_type;
         const priceTypeExt = flatItem.bundleItem?.price_type_ext;
         // 主商品id
-        const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
+        // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
         // original_price 对应：
         // 1. price_type: "markup" && price_type_ext: "product_price"
         // markup_price 对应：
@@ -2010,13 +2012,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用
@@ -2078,13 +2080,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用

package/lib/modules/SalesSummary/index.js

@@ -134,7 +134,9 @@ class SalesSummaryModule extends _BaseModule.BaseModule {
       await this.getSurchargeList(summaryChannel);
     }
     const taxConfig = this.getTaxConfig();
-    const summarySchedule = this.core.getModule(`${this.name.split('_')[0]}_schedule`);
+    const fatherModuleName = this.otherParams?.fatherModule || this.name.replace(/_salesSummary$/, '');
+    const scheduleModuleName = `${fatherModuleName}_schedule`;
+    const summarySchedule = this.core.getModule(scheduleModuleName);
     const needScheduleIds = (this.store.surchargeList?.map(item => item.available_schedule_ids)?.flat() || []).filter(id => id !== undefined && id !== null && id !== '');
     const scheduleList = needScheduleIds.length > 0 ? summarySchedule?.getScheduleListByIds(needScheduleIds) : [];
     const scheduleById = {};