@pisell/pisellos 2.3.67 → 2.3.69

package/lib/modules/Order/utils.js

@@ -1206,7 +1206,6 @@ function productRequiresFormSubject(tempOrder, product) {
 }
 function resolveIsFormSubject(tempOrder, product) {
   var _a;
-  debugger;
   if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
     return true;
   if (product)

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

@@ -41,6 +41,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+    getPlatform(): string;
     private getPaymentNumberAppData;
     /**
      * 记录信息日志

package/lib/modules/Payment/index.js

@@ -139,6 +139,13 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+  /**
+   * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+   */
+  getPlatform() {
+    var _a;
+    return String(((_a = this.otherParams) == null ? void 0 : _a.platform) || "").trim().toLowerCase();
+  }
   getPaymentNumberAppData(key) {
     var _a, _b, _c, _d, _e, _f, _g;
     const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);

package/lib/modules/Payment/walletpass.js

@@ -109,6 +109,16 @@ function mergeWalletAssets(...groups) {
   });
   return merged;
 }
+function orderWalletAssetsByIds(assets, orderedIds) {
+  const assetByKey = new Map(
+    assets.map((asset) => [getWalletAssetKey(asset), asset])
+  );
+  const orderedKeys = new Set(orderedIds.map((id) => String(id)));
+  return [
+    ...orderedIds.map((id) => assetByKey.get(String(id))).filter((asset) => asset !== void 0),
+    ...assets.filter((asset) => !orderedKeys.has(getWalletAssetKey(asset)))
+  ];
+}
 function createInitialWalletAssetsState() {
   return {
     status: "idle",
@@ -543,7 +553,6 @@ var WalletPassPaymentImpl = class {
         vouchers: allList
       });
       const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
       this.walletRecommendList = recommended;
       this.walletInitData = {
         transformList,
@@ -606,8 +615,12 @@ var WalletPassPaymentImpl = class {
     const customerWalletPassList = Array.isArray(
       responseData == null ? void 0 : responseData.customer_wallet_pass_list
     ) ? responseData.customer_wallet_pass_list : [];
-    const allList = mergeWalletAssets(
+    const orderedRecalculateList = orderWalletAssetsByIds(
       recalculateList,
+      selectedIds
+    );
+    const allList = mergeWalletAssets(
+      orderedRecalculateList,
       customerWalletPassList
     );
     const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
@@ -709,6 +722,18 @@ var WalletPassPaymentImpl = class {
         this.paymentModule.logInfo("[WalletPass] 商品列表为空，跳过获取用户识别码列表");
         return [];
       }
+      const platform = this.paymentModule.getPlatform();
+      if (platform === "pc" || platform === "h5") {
+        this.userIdentificationCodes = [];
+        this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
+          userIdentificationCodes: []
+        });
+        this.paymentModule.logInfo(
+          "[WalletPass] 用户端平台跳过获取用户识别码列表",
+          { platform }
+        );
+        return [];
+      }
       if (typeof newParams.payment_order_id === "string" && newParams.payment_order_id.startsWith("LOCAL_")) {
         newParams.payment_order_id = void 0;
       }

package/lib/modules/Rules/index.js

@@ -865,10 +865,26 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         );
       }) : void 0;
       const explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== "good_pass" ? explicitlySelectedDiscount : void 0;
+      const appliedDiscountCardIds = new Set(
+        (product.discount_list || []).filter(
+          (item) => ["discount_card", "product_discount_card"].includes(
+            (item == null ? void 0 : item.tag) || (item == null ? void 0 : item.type)
+          )
+        ).map(
+          (item) => {
+            var _a3;
+            return ((_a3 = item == null ? void 0 : item.discount) == null ? void 0 : _a3.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.id);
+          }
+        ).filter((id) => id !== void 0 && id !== null).map(String)
+      );
+      const appliedDiscountCard = (options == null ? void 0 : options.scan) ? void 0 : applicableDiscounts.find((discount) => {
+        const discountType = discount.tag || discount.type;
+        return discount.isSelected === true && ["discount_card", "product_discount_card"].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+      });
       const scannedSelectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
-      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
+      const selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
       const selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
       const prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === "good_pass" ? [
         explicitlySelectedDiscount,

package/lib/server/index.js

@@ -3887,9 +3887,7 @@ var Server = class {
           checkoutData,
           order: pendingOrder,
           response: pendingResult,
-          requireFullyPaid: true,
-          // 自动小票固定使用 print_all 的收据类型 0，不随订单 type 改成券/手环类型 99。
-          isManualPrint: true
+          requireFullyPaid: true
         });
       }
       await this.dispatchCheckoutSyncTask({
@@ -3947,9 +3945,8 @@ var Server = class {
           checkoutData: syncResult.checkoutData,
           order: syncedOrder,
           response: syncResult.normalizedResponse,
-          requireFullyPaid: true,
+          requireFullyPaid: true
           // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-          isManualPrint: true
         });
       }
       return response;
@@ -4126,7 +4123,7 @@ var Server = class {
     var _a, _b, _c, _d, _e;
     if (((_b = (_a = this.core.context) == null ? void 0 : _a.getPlatform) == null ? void 0 : _b.call(_a)) !== "android")
       return true;
-    return ((_e = (_d = (_c = this.app) == null ? void 0 : _c.storage) == null ? void 0 : _d.getStorage) == null ? void 0 : _e.call(_d, AUTO_PRINT_STORAGE_KEY)) === "true";
+    return ((_e = (_d = (_c = this.app) == null ? void 0 : _c.storage) == null ? void 0 : _d.getStorage) == null ? void 0 : _e.call(_d, AUTO_PRINT_STORAGE_KEY)) !== "false";
   }
   shouldBuildSmallTicketData(order) {
     if (!order || typeof order !== "object")

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

@@ -283,6 +283,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getPersistedOrderStorageKey;
     private getOrderIdentityMatchKeys;
     private doOrdersShareIdentity;
     private findOrderIndexByIdentity;

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

@@ -39,6 +39,7 @@ var import_orderCollectionIdentity = require("../../../modules/Order/utils/order
 var import_types = require("./types");
 var import_payment_utils = require("../../../modules/Order/payment-utils");
 var INDEXDB_STORE_NAME = "orders";
+var ORDER_STORAGE_KEY_FIELD = "__order_storage_key";
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
 var ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY = "server_order_last_full_fetch_shop_id";
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
@@ -1628,6 +1629,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [];
     const remoteProductMembershipChanges = [];
     const forceWriteStorageKeys = /* @__PURE__ */ new Set();
+    const storageKeyMigrations = [];
     const mergeActions = {};
     const existingProductsHaveStableIdentity = this.store.list.map(
       (order) => this.doProductsHaveStableMembershipIdentity(
@@ -1652,6 +1654,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
         const existingOrder = updatedList[matchIndex];
+        const previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
         if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
           this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
             source,
@@ -1713,6 +1716,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             }
           }
         }
+        const nextStorageKey = this.getOrderStorageKey(mergedOrder);
+        if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
+          storageKeyMigrations.push({
+            orderId: mergedOrder.order_id ?? existingOrder.order_id ?? fresh.order_id ?? null,
+            from: previousStorageKey,
+            to: nextStorageKey
+          });
+        }
         updatedList[adjustedMatchIndex] = mergedOrder;
         existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
         if (membershipChange) {
@@ -1750,7 +1761,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       patchedOrders,
       source,
       mergeActions,
-      {},
+      { storageKeyMigrations },
       forceWriteStorageKeys
     );
     this.logInfo("mergeOrdersToStore-结束", {
@@ -1955,6 +1966,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return "";
   }
+  getPersistedOrderStorageKey(order) {
+    const persistedStorageKey = order == null ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
+    if (persistedStorageKey !== void 0 && persistedStorageKey !== null && persistedStorageKey !== "") {
+      return String(persistedStorageKey);
+    }
+    return this.getOrderStorageKey(order);
+  }
   getOrderIdentityMatchKeys(order) {
     return this.getOrderIdentityEntries(order).map((entry) => `${entry.field}:${entry.key}`);
   }
@@ -2442,7 +2460,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         throw new Error("订单 SQLite 数据库未初始化");
       return;
     }
-    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).filter((order) => this.getOrderStorageKey(order));
+    const migrationTargetStorageKeys = new Set(
+      (options.storageKeyMigrations || []).map((migration) => migration.to)
+    );
+    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || !migrationTargetStorageKeys.has(storageKey))
+        return order;
+      return {
+        ...order,
+        [ORDER_STORAGE_KEY_FIELD]: storageKey
+      };
+    }).filter((order) => this.getOrderStorageKey(order));
     if (ordersSnapshot.length === 0) {
       return;
     }
@@ -2459,6 +2488,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (compactedToWrite.length === 0) {
       return;
     }
+    const writtenStorageKeys = new Set(
+      compactedToWrite.map((order) => this.getOrderStorageKey(order)).filter(Boolean)
+    );
+    const storageKeyMigrations = /* @__PURE__ */ new Map();
+    for (const migration of options.storageKeyMigrations || []) {
+      if (!writtenStorageKeys.has(migration.to))
+        continue;
+      if (writtenStorageKeys.has(migration.from))
+        continue;
+      storageKeyMigrations.set(migration.from, migration);
+    }
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         let writeMethod = "none";
@@ -2482,6 +2522,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           throw new Error("订单 SQLite 数据库不支持写入");
         }
         this.recordRecentSqliteWrite(source, compactedToWrite);
+        if (writeMethod !== "none") {
+          for (const migration of storageKeyMigrations.values()) {
+            try {
+              await this.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+              this.recentSqliteWriteByStorageKey.delete(migration.from);
+              for (const order of orders) {
+                if (this.getOrderStorageKey(order) !== migration.to)
+                  continue;
+                const orderRecord = order;
+                if (String(orderRecord[ORDER_STORAGE_KEY_FIELD] ?? "") !== migration.from)
+                  continue;
+                orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
+              }
+            } catch (error) {
+              this.logError("删除订单旧 SQLite storage key 失败", {
+                source,
+                order_id: migration.orderId,
+                oldStorageKey: migration.from,
+                newStorageKey: migration.to,
+                error: error instanceof Error ? error.message : String(error)
+              });
+            }
+          }
+        }
         this.logInfo("patchOrdersInSQLite-完成", {
           source,
           count: compactedToWrite.length,

package/lib/server/utils/small-ticket.js

@@ -562,7 +562,7 @@ function buildOptionTitleSuffix(options) {
 function formatBundlePrice(bundle, currencySymbol) {
   const value = bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0;
   const amount = new import_decimal.default(toMoneyNumber(value));
-  const isNegative = bundle.price_type === "markdown" || bundle.price_type === "markup" && bundle.price_type_ext === "product_price";
+  const isNegative = bundle.price_type === "markdown";
   if (isNegative)
     return `-${currencySymbol}${amount.abs().toFixed(2)}`;
   return formatMoney(amount, currencySymbol);

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

@@ -119,6 +119,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
      */
     private getPriceQueryStrategyContext;
+    /**
+     * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+     */
+    protected prepareProductPriceQueryContext(_customerId?: number | string): Promise<void>;
+    /**
+     * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+     * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+     */
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
     private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
@@ -141,7 +150,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * const params = this.buildSubModuleOtherParams();
      * this.core.registerModule(orderModule, { otherParams: params });
      */
-    protected buildSubModuleOtherParams(): Record<string, any>;
+    protected isSessionStoragePersistEnabled(): boolean;
+    protected shouldUseSessionStorageForSubModule(_moduleName?: string): boolean;
+    protected buildSubModuleOtherParams(moduleName?: string): Record<string, any>;
     /**
      * 将父级 otherParams 的变更显式同步给已注册的子模块。
      *
@@ -434,6 +445,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
+    private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;

package/lib/solution/BaseSales/index.js

@@ -591,7 +591,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
-  async hydrateLatestLoadedSalesDetail(record, loadSequence) {
+  async hydrateLatestLoadedSalesDetail(record, loadSequence, hydrateSource) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
     const hydrateTask = async () => {
@@ -601,9 +601,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-        recalcOnHydrate: false
-      });
+      const sales = await this.store.order.hydrateTempOrderFromRecord(
+        record,
+        hydrateSource === "sessionStorage" ? { recalcOnHydrate: true, source: "sessionStorage" } : { recalcOnHydrate: false }
+      );
       hydratedSales = sales;
       if (loadSequence !== this.salesDetailLoadSequence)
         return;
@@ -733,8 +734,24 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (businessCode !== void 0 && businessCode !== null && String(businessCode).trim() !== "") {
       strategyContext.business_code = String(businessCode).trim();
     }
+    const availableWalletIds = this.getAvailableWalletIds();
+    if (availableWalletIds.length > 0 && !Array.isArray(strategyContext.available_wallet_ids)) {
+      strategyContext.available_wallet_ids = availableWalletIds;
+    }
     return strategyContext;
   }
+  /**
+   * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+   */
+  async prepareProductPriceQueryContext(_customerId) {
+  }
+  /**
+   * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+   * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+   */
+  preferAuthoritativeProductQueryPrice() {
+    return false;
+  }
   getPriceQuerySchedule(params) {
     const booking = params.booking || {};
     if (typeof booking.start_date === "string" && booking.start_date.trim()) {
@@ -927,12 +944,18 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * const params = this.buildSubModuleOtherParams();
    * this.core.registerModule(orderModule, { otherParams: params });
    */
-  buildSubModuleOtherParams() {
+  isSessionStoragePersistEnabled() {
+    return Boolean(this.cacheId);
+  }
+  shouldUseSessionStorageForSubModule(_moduleName) {
+    return this.isSessionStoragePersistEnabled();
+  }
+  buildSubModuleOtherParams(moduleName) {
     return {
       ...this.otherParams,
       salesSummaryModuleName: `${this.name}_salesSummary`,
       fatherModule: this.name,
-      openCache: this.cacheId ? true : false,
+      openCache: this.shouldUseSessionStorageForSubModule(moduleName),
       cacheId: this.cacheId
     };
   }
@@ -943,7 +966,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * await this.syncOtherParamsToSubModules({ channel: 'pos' });
    */
   async syncOtherParamsToSubModules(changedParams, { cover = false } = {}) {
-    const nextSubModuleOtherParams = this.buildSubModuleOtherParams();
     await Promise.all(
       Object.entries(this.store).map(async ([moduleName, subModule]) => {
         if (this.reusedSharedSubModuleNames.has(moduleName)) {
@@ -953,6 +975,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         if (!targetModule || typeof targetModule.updateOtherParams !== "function") {
           return;
         }
+        const nextSubModuleOtherParams = this.buildSubModuleOtherParams(moduleName);
         await targetModule.updateOtherParams(nextSubModuleOtherParams, {
           changedParams,
           cover
@@ -965,14 +988,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * sessionStorage 损坏时静默忽略，按空状态注册。
    */
   readSessionCacheData() {
-    if (!this.cacheId || !this.window)
+    const cacheId = this.cacheId;
+    if (!cacheId || !this.isSessionStoragePersistEnabled() || !this.window) {
       return {};
+    }
     try {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (!sessionData)
         return {};
       const data = JSON.parse(sessionData);
-      return data && data[this.cacheId] || {};
+      return data && data[cacheId] || {};
     } catch {
       return {};
     }
@@ -1074,9 +1099,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const hooks = this.getSubModuleHooks(step);
       this.store[step] = targetModule;
       this.core.registerModule(targetModule, {
-        initialState: (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {},
+        initialState: this.shouldUseSessionStorageForSubModule(step) ? (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {} : {},
         ...hooks ? { hooks } : {},
-        otherParams: this.buildSubModuleOtherParams()
+        otherParams: this.buildSubModuleOtherParams(step)
       });
     });
     if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
@@ -1143,17 +1168,21 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
-        preloadedSalesDetail ?? loadedRecord.data
-      );
+      const loadedSalesDetail = preloadedSalesDetail ?? loadedRecord.data;
+      const shouldFilterPendingPayments = params.hydrateSource !== "sessionStorage";
+      const remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
       const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
-      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
-      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
+      const record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
+      return await this.hydrateLatestLoadedSalesDetail(
+        record,
+        loadSequence,
+        params.hydrateSource
+      );
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(
         0,
@@ -3116,6 +3145,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async calculateProductBookingPrice(params) {
     const quotation = this.store.quotation;
     const customerId = params.customer_id ?? this.getCurrentOrderCustomerId();
+    await this.prepareProductPriceQueryContext(customerId);
     const authoritativeProduct = await this.loadProductForPriceQuery(params, customerId);
     const product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
     await this.loadQuotationForPriceQuery({
@@ -3128,7 +3158,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       product,
       fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
       customer_id: customerId,
-      quotation
+      quotation: authoritativeProduct && this.preferAuthoritativeProductQueryPrice() ? void 0 : quotation
     });
   }
   getQuotationCustomerScopeInfo() {
@@ -3165,11 +3195,23 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       quotationScopes
     };
   }
+  hasSmartPricingStrategies() {
+    var _a, _b;
+    const evaluator = (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator;
+    if (!evaluator || typeof evaluator.getStrategyConfigs !== "function") {
+      return false;
+    }
+    const configs = evaluator.getStrategyConfigs();
+    return Array.isArray(configs) && configs.length > 0;
+  }
   shouldRecalculateProductBookingPricesForContextChange(params) {
     const scopeInfo = this.getQuotationCustomerScopeInfo();
     const scopedCustomerIds = new Set(scopeInfo.customerIds.map((id) => String(id)));
     const previousCustomerId = this.normalizePriceContextCustomerId(params.previousCustomerId);
     const nextCustomerId = this.normalizePriceContextCustomerId(params.nextCustomerId);
+    if (this.hasSmartPricingStrategies()) {
+      return previousCustomerId !== nextCustomerId;
+    }
     const previousInScope = previousCustomerId ? scopedCustomerIds.has(previousCustomerId) : false;
     const nextInScope = nextCustomerId ? scopedCustomerIds.has(nextCustomerId) : false;
     let shouldRecalculate = false;
@@ -3190,6 +3232,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return [];
     const quotation = this.store.quotation;
     const customerId = ((_a = paramsList[0]) == null ? void 0 : _a.customer_id) ?? this.getCurrentOrderCustomerId();
+    await this.prepareProductPriceQueryContext(customerId);
     const productMapsByGroup = /* @__PURE__ */ new Map();
     const groups = /* @__PURE__ */ new Map();
     paramsList.forEach((params) => {
@@ -3247,7 +3290,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         product,
         fallback_price: authoritativeProduct ? void 0 : params.fallback_price,
         customer_id: customerId,
-        quotation
+        quotation: authoritativeProduct && this.preferAuthoritativeProductQueryPrice() ? void 0 : quotation
       });
     });
   }

package/lib/solution/BaseSales/utils.js

@@ -60,33 +60,44 @@ function createEmptySummary() {
   };
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
-    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
-  })).sort((p, q) => {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
+      option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+      num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    })).sort((p, q) => {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   const bundleArr = Array.isArray(productBundle) ? productBundle : [];
   const normalizedBundles = bundleArr.map((item) => ({
     bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
     product_id: Number(item == null ? void 0 : item.product_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).sort((p, q) => {
     if (p.bundle_id !== q.bundle_id)
       return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id)
       return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -63,6 +64,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;
@@ -282,7 +285,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
+    protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
+    protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
+    protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     /**
      * 获取客户分页信息
      * @returns 分页信息