@pisell/pisellos 2.3.39 → 2.3.41

package/lib/modules/Payment/walletpass.js

@@ -24,6 +24,74 @@ __export(walletpass_exports, {
 module.exports = __toCommonJS(walletpass_exports);
 var import_types = require("./types");
 var import_utils = require("./utils");
+var WALLET_PAYMENT_ASSET_TAGS = /* @__PURE__ */ new Set([
+  "product_voucher",
+  "gift_card",
+  "point_card"
+]);
+function isWalletPaymentAsset(asset) {
+  return WALLET_PAYMENT_ASSET_TAGS.has(
+    String((asset == null ? void 0 : asset.tag) || "").toLowerCase()
+  );
+}
+function getWalletAssetId(asset) {
+  return (asset == null ? void 0 : asset.id) ?? (asset == null ? void 0 : asset.voucher_id) ?? (asset == null ? void 0 : asset.code);
+}
+function getWalletAssetKey(assetOrId) {
+  const id = assetOrId && typeof assetOrId === "object" ? getWalletAssetId(assetOrId) : assetOrId;
+  return id === void 0 || id === null ? "" : String(id);
+}
+function isWalletAssetAvailable(asset) {
+  if (!asset)
+    return false;
+  if (asset.unified_available_status !== void 0 && Number(asset.unified_available_status) !== 1) {
+    return false;
+  }
+  if (asset._unified_available_status !== void 0 && Number(asset._unified_available_status) !== 1) {
+    return false;
+  }
+  if (asset.available === false || asset.isDisabled === true)
+    return false;
+  return true;
+}
+function getWalletAssetDeductionAmount(asset) {
+  const value = (asset == null ? void 0 : asset.actualDeduction) ?? (asset == null ? void 0 : asset._available_max_amount) ?? (asset == null ? void 0 : asset.edit_current_amount) ?? (asset == null ? void 0 : asset.recommended_usage_amount) ?? (asset == null ? void 0 : asset.available_max_amount) ?? (asset == null ? void 0 : asset.amount) ?? 0;
+  const amount = Number(value);
+  return Number.isFinite(amount) && amount > 0 ? amount : 0;
+}
+function mergeWalletAssets(...groups) {
+  const merged = [];
+  const indexByKey = /* @__PURE__ */ new Map();
+  groups.flat().forEach((asset) => {
+    const key = getWalletAssetKey(asset);
+    if (!key)
+      return;
+    const existedIndex = indexByKey.get(key);
+    if (existedIndex === void 0) {
+      indexByKey.set(key, merged.length);
+      merged.push(asset);
+      return;
+    }
+    merged[existedIndex] = {
+      ...merged[existedIndex],
+      ...asset
+    };
+  });
+  return merged;
+}
+function createInitialWalletAssetsState() {
+  return {
+    status: "idle",
+    items: [],
+    selectedIds: [],
+    selectedItems: [],
+    committedIds: [],
+    selectionSources: {},
+    totalSelectedAmount: 0,
+    error: null,
+    revision: 0
+  };
+}
 var WalletPassPaymentImpl = class {
   constructor(paymentModule) {
     this.paymentModule = paymentModule;
@@ -32,6 +100,12 @@ var WalletPassPaymentImpl = class {
     this.searchResults = [];
     this.walletParams = null;
     this.walletInitData = null;
+    this.walletAssetsState = createInitialWalletAssetsState();
+    this.walletAssetsRequestSequence = 0;
+    this.walletAssetsCalculationContext = {
+      orderTotalAmount: 0,
+      products: []
+    };
   }
   /**
    * 发送事件的辅助方法
@@ -48,6 +122,145 @@ var WalletPassPaymentImpl = class {
       });
     }
   }
+  publishWalletAssetsState(patch) {
+    this.walletAssetsState = {
+      ...this.walletAssetsState,
+      ...patch,
+      items: [...patch.items ?? this.walletAssetsState.items],
+      selectedIds: [
+        ...patch.selectedIds ?? this.walletAssetsState.selectedIds
+      ],
+      selectedItems: [
+        ...patch.selectedItems ?? this.walletAssetsState.selectedItems
+      ],
+      committedIds: [
+        ...patch.committedIds ?? this.walletAssetsState.committedIds
+      ],
+      selectionSources: {
+        ...patch.selectionSources ?? this.walletAssetsState.selectionSources
+      },
+      revision: this.walletAssetsState.revision + 1
+    };
+    const state = this.getWalletAssetsState();
+    this.emitEvent(import_types.WalletPassHooks.OnWalletAssetsStateChanged, { state });
+    return state;
+  }
+  recalculateWalletAssets(items, requestedIds, selectionSources) {
+    var _a, _b;
+    const committedKeys = new Set(
+      this.walletAssetsState.committedIds.map((id) => String(id))
+    );
+    const requestedKeys = new Set(
+      requestedIds.map((id) => String(id)).filter((id) => !committedKeys.has(id))
+    );
+    const requested = items.filter(
+      (item) => requestedKeys.has(getWalletAssetKey(item)) && isWalletAssetAvailable(item)
+    );
+    let nextItems = items;
+    let selectedItems = requested;
+    const evaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+    if (evaluator == null ? void 0 : evaluator.recalculateVouchers) {
+      try {
+        const result = evaluator.recalculateVouchers(
+          items,
+          requested,
+          this.walletAssetsCalculationContext.orderTotalAmount,
+          this.walletAssetsCalculationContext.products
+        );
+        nextItems = mergeWalletAssets(items, (result == null ? void 0 : result.allWithUpdatedStatus) || []);
+        selectedItems = ((result == null ? void 0 : result.selectedWithDetails) || []).filter(
+          (item) => isWalletAssetAvailable(item) && getWalletAssetDeductionAmount(item) > 0
+        );
+      } catch (error) {
+        this.paymentModule.logWarning(
+          "[WalletPass] 共享钱包资产重新计算失败，回退接口可用状态",
+          {
+            error: error instanceof Error ? error.message : String(error)
+          }
+        );
+      }
+    }
+    const selectedIds = selectedItems.map((item) => getWalletAssetId(item)).filter((id) => id !== void 0 && id !== null);
+    const selectedKeys = new Set(selectedIds.map((id) => String(id)));
+    const nextSources = Object.entries(selectionSources).reduce((result, [key, source]) => {
+      if (selectedKeys.has(key))
+        result[key] = source;
+      return result;
+    }, {});
+    const totalSelectedAmount = selectedItems.reduce(
+      (total, item) => total + getWalletAssetDeductionAmount(item),
+      0
+    );
+    return this.publishWalletAssetsState({
+      status: "ready",
+      items: nextItems,
+      selectedIds,
+      selectedItems,
+      selectionSources: nextSources,
+      totalSelectedAmount,
+      error: null
+    });
+  }
+  /**
+   * 使用最新订单参数重验扫码搜索过的支付类 Wallet 资产。
+   * 请求失败或暂时无匹配结果时保留旧资产，避免商品变化造成列表闪空。
+   */
+  async revalidateSearchedWalletAssets(requestSequence) {
+    const cachedAssets = this.searchResults.filter(isWalletPaymentAsset);
+    const searchCodes = [
+      ...new Set(
+        cachedAssets.map((item) => String((item == null ? void 0 : item.code) || "").trim()).filter(Boolean)
+      )
+    ];
+    if (searchCodes.length === 0)
+      return cachedAssets;
+    const preparePayments = this.formatWalletPassList2PreparePayments(
+      this.walletAssetsState.selectedItems
+    );
+    const refreshedGroups = await Promise.all(
+      searchCodes.map(async (searchCode) => {
+        try {
+          const result = await this.searchIdentificationCodeAsync(
+            {
+              ...this.walletParams || {},
+              code: searchCode,
+              prepare_payments: preparePayments
+            },
+            { noCache: true }
+          );
+          return {
+            searchCode,
+            items: result.type === "normalCode" ? result.data.filter(isWalletPaymentAsset) : []
+          };
+        } catch (error) {
+          this.paymentModule.logWarning(
+            "[WalletPass] 重验扫码 Wallet 资产失败，保留旧结果",
+            {
+              code: searchCode,
+              error: error instanceof Error ? error.message : String(error)
+            }
+          );
+          return { searchCode, items: [] };
+        }
+      })
+    );
+    if (requestSequence !== this.walletAssetsRequestSequence) {
+      return cachedAssets;
+    }
+    const replacedCodes = new Set(
+      refreshedGroups.filter((group) => group.items.length > 0).map((group) => group.searchCode.toUpperCase())
+    );
+    const refreshedAssets = refreshedGroups.flatMap((group) => group.items);
+    if (refreshedAssets.length > 0) {
+      this.searchResults = [
+        ...this.searchResults.filter(
+          (item) => !replacedCodes.has(String((item == null ? void 0 : item.code) || "").trim().toUpperCase())
+        ),
+        ...refreshedAssets
+      ];
+    }
+    return mergeWalletAssets(cachedAssets, refreshedAssets);
+  }
   /**
    * 生成钱包API默认参数
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -75,7 +288,7 @@ var WalletPassPaymentImpl = class {
       // 订单小计金额
       order_product_amount: subTotal,
       // 订单待支付金额
-      order_wait_pay_amount: order_wait_pay_amount || ((amountInfo == null ? void 0 : amountInfo.isDeposit) ? Number(amountInfo == null ? void 0 : amountInfo.depositAmount) : totalAmount),
+      order_wait_pay_amount: order_wait_pay_amount ?? ((amountInfo == null ? void 0 : amountInfo.isDeposit) ? Number(amountInfo == null ? void 0 : amountInfo.depositAmount) : totalAmount),
       // order_behavior_count_customer_id: 1,
       products,
       prepare_payments: [],
@@ -356,7 +569,6 @@ var WalletPassPaymentImpl = class {
    * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
    */
   async searchIdentificationCodeAsync(params, config = {}) {
-    var _a;
     try {
       const { code } = params;
       this.paymentModule.logInfo("[WalletPass] 开始搜索识别码", {
@@ -394,14 +606,14 @@ var WalletPassPaymentImpl = class {
       const baseWalletParams = this.walletParams;
       const searchParams = {
         // 基础钱包参数
-        sale_channel: params.sale_channel || (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel) || "pos",
-        customer_id: params.customer_id || (baseWalletParams == null ? void 0 : baseWalletParams.customer_id),
-        order_expect_amount: params.order_expect_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_expect_amount),
-        order_product_amount: params.order_product_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_product_amount),
-        order_wait_pay_amount: params.order_wait_pay_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_wait_pay_amount),
-        order_behavior_count_customer_id: params.order_behavior_count_customer_id || (baseWalletParams == null ? void 0 : baseWalletParams.order_behavior_count_customer_id) || params.customer_id || (baseWalletParams == null ? void 0 : baseWalletParams.customer_id),
-        products: params.products || (baseWalletParams == null ? void 0 : baseWalletParams.products),
-        prepare_payments: params.prepare_payments || (baseWalletParams == null ? void 0 : baseWalletParams.prepare_payments),
+        sale_channel: params.sale_channel ?? (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel) ?? "pos",
+        customer_id: params.customer_id ?? (baseWalletParams == null ? void 0 : baseWalletParams.customer_id),
+        order_expect_amount: params.order_expect_amount ?? (baseWalletParams == null ? void 0 : baseWalletParams.order_expect_amount),
+        order_product_amount: params.order_product_amount ?? (baseWalletParams == null ? void 0 : baseWalletParams.order_product_amount),
+        order_wait_pay_amount: params.order_wait_pay_amount ?? (baseWalletParams == null ? void 0 : baseWalletParams.order_wait_pay_amount),
+        order_behavior_count_customer_id: params.order_behavior_count_customer_id ?? (baseWalletParams == null ? void 0 : baseWalletParams.order_behavior_count_customer_id) ?? params.customer_id ?? (baseWalletParams == null ? void 0 : baseWalletParams.customer_id),
+        products: params.products ?? (baseWalletParams == null ? void 0 : baseWalletParams.products) ?? [],
+        prepare_payments: params.prepare_payments ?? (baseWalletParams == null ? void 0 : baseWalletParams.prepare_payments) ?? [],
         multiple: 1,
         // 搜索特有参数
         code: params.code,
@@ -417,17 +629,10 @@ var WalletPassPaymentImpl = class {
       if (typeof searchParams.payment_order_id === "string" && searchParams.payment_order_id.startsWith("LOCAL_")) {
         searchParams.payment_order_id = void 0;
       }
-      let response;
-      if (!searchParams.products || ((_a = searchParams.products || []) == null ? void 0 : _a.length) === 0) {
-        response = {
-          data: []
-        };
-      } else {
-        response = await this.paymentModule.request.post(
-          "/machinecode/prepare/deduction/search",
-          searchParams
-        );
-      }
+      const response = await this.paymentModule.request.post(
+        "/machinecode/prepare/deduction/search",
+        searchParams
+      );
       const searchResults = (response == null ? void 0 : response.data) || [];
       if (config.noCache) {
         return {
@@ -469,6 +674,243 @@ var WalletPassPaymentImpl = class {
       throw error;
     }
   }
+  /**
+   * 刷新购物车与结账共享的钱包资产。
+   *
+   * 与 legacy initializeWalletDataFromBusinessAsync 不同，这里维护选择状态；
+   * 推荐结果只作为可用性/金额计算输入，不会自动成为 selectedIds。
+   */
+  async refreshWalletAssetsFromBusinessAsync(businessData, options = {}) {
+    const requestSequence = ++this.walletAssetsRequestSequence;
+    const nextCustomerId = businessData.customer_id;
+    const previousCustomerId = this.walletAssetsState.customerId;
+    const customerChanged = String(previousCustomerId ?? "") !== String(nextCustomerId ?? "");
+    const preserveSelection = options.preserveSelection !== false && !customerChanged;
+    if (customerChanged) {
+      this.clearSearchResults();
+    }
+    const committedKeys = new Set(
+      this.walletAssetsState.committedIds.map((id) => String(id))
+    );
+    const committedItems = this.walletAssetsState.items.filter(
+      (item) => committedKeys.has(getWalletAssetKey(item))
+    );
+    const selectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
+    const selectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
+    this.publishWalletAssetsState({
+      status: "loading",
+      customerId: nextCustomerId,
+      items: preserveSelection ? this.walletAssetsState.items : committedItems,
+      selectedIds,
+      selectedItems: preserveSelection ? this.walletAssetsState.selectedItems : [],
+      selectionSources,
+      totalSelectedAmount: preserveSelection ? this.walletAssetsState.totalSelectedAmount : 0,
+      error: null
+    });
+    try {
+      const result = await this.initializeWalletDataFromBusinessAsync(
+        businessData
+      );
+      if (requestSequence !== this.walletAssetsRequestSequence) {
+        return this.getWalletAssetsState();
+      }
+      this.walletAssetsCalculationContext = {
+        orderTotalAmount: Number(businessData.order_wait_pay_amount || 0),
+        products: result.products || businessData.products || []
+      };
+      const searchedWalletAssets = preserveSelection ? await this.revalidateSearchedWalletAssets(requestSequence) : [];
+      if (requestSequence !== this.walletAssetsRequestSequence) {
+        return this.getWalletAssetsState();
+      }
+      const recommendedKeys = new Set(
+        (result.walletRecommendList || []).map(
+          (asset) => getWalletAssetKey(asset)
+        )
+      );
+      const items = mergeWalletAssets(
+        preserveSelection ? this.walletAssetsState.selectedItems : [],
+        searchedWalletAssets,
+        result.transformList || [],
+        result.noApplicableVoucher || []
+      ).map((asset) => ({
+        ...asset,
+        _wallet_asset_recommended: recommendedKeys.has(
+          getWalletAssetKey(asset)
+        )
+      }));
+      const latestSelectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
+      const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
+      return this.recalculateWalletAssets(
+        items,
+        latestSelectedIds,
+        latestSelectionSources
+      );
+    } catch (error) {
+      if (requestSequence !== this.walletAssetsRequestSequence) {
+        return this.getWalletAssetsState();
+      }
+      return this.publishWalletAssetsState({
+        status: "error",
+        items: preserveSelection ? this.walletAssetsState.items : committedItems,
+        selectedIds: preserveSelection ? this.walletAssetsState.selectedIds : [],
+        selectedItems: preserveSelection ? this.walletAssetsState.selectedItems : [],
+        selectionSources: preserveSelection ? this.walletAssetsState.selectionSources : {},
+        totalSelectedAmount: preserveSelection ? this.walletAssetsState.totalSelectedAmount : 0,
+        customerId: nextCustomerId,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  getWalletAssetsState() {
+    return {
+      ...this.walletAssetsState,
+      items: [...this.walletAssetsState.items],
+      selectedIds: [...this.walletAssetsState.selectedIds],
+      selectedItems: [...this.walletAssetsState.selectedItems],
+      committedIds: [...this.walletAssetsState.committedIds],
+      selectionSources: { ...this.walletAssetsState.selectionSources }
+    };
+  }
+  exportWalletAssetsSnapshot() {
+    return {
+      state: this.getWalletAssetsState(),
+      searchResults: [...this.searchResults],
+      walletParams: this.walletParams ? { ...this.walletParams } : null,
+      calculationContext: {
+        orderTotalAmount: this.walletAssetsCalculationContext.orderTotalAmount,
+        products: [...this.walletAssetsCalculationContext.products]
+      }
+    };
+  }
+  importWalletAssetsSnapshot(snapshot) {
+    var _a, _b;
+    if (!(snapshot == null ? void 0 : snapshot.state))
+      return this.getWalletAssetsState();
+    this.walletAssetsRequestSequence += 1;
+    this.searchResults = Array.isArray(snapshot.searchResults) ? [...snapshot.searchResults] : [];
+    this.walletParams = snapshot.walletParams ? { ...snapshot.walletParams } : null;
+    this.walletAssetsCalculationContext = {
+      orderTotalAmount: Number(
+        ((_a = snapshot.calculationContext) == null ? void 0 : _a.orderTotalAmount) || 0
+      ),
+      products: Array.isArray((_b = snapshot.calculationContext) == null ? void 0 : _b.products) ? [...snapshot.calculationContext.products] : []
+    };
+    return this.publishWalletAssetsState({
+      ...snapshot.state,
+      items: Array.isArray(snapshot.state.items) ? snapshot.state.items : [],
+      selectedIds: Array.isArray(snapshot.state.selectedIds) ? snapshot.state.selectedIds : [],
+      selectedItems: Array.isArray(snapshot.state.selectedItems) ? snapshot.state.selectedItems : [],
+      committedIds: Array.isArray(snapshot.state.committedIds) ? snapshot.state.committedIds : [],
+      selectionSources: snapshot.state.selectionSources || {}
+    });
+  }
+  selectWalletAsset(assetId, options) {
+    const assetKey = String(assetId);
+    const committedKeys = new Set(
+      this.walletAssetsState.committedIds.map((id) => String(id))
+    );
+    if (committedKeys.has(assetKey))
+      return this.getWalletAssetsState();
+    const selectedIds = this.walletAssetsState.selectedIds.filter(
+      (id) => String(id) !== assetKey
+    );
+    const selectionSources = { ...this.walletAssetsState.selectionSources };
+    delete selectionSources[assetKey];
+    if (options.selected) {
+      const asset = this.walletAssetsState.items.find(
+        (item) => getWalletAssetKey(item) === assetKey
+      );
+      if (!asset || !isWalletAssetAvailable(asset)) {
+        return this.getWalletAssetsState();
+      }
+      selectedIds.push(assetId);
+      selectionSources[assetKey] = options.source || "manual";
+    }
+    return this.recalculateWalletAssets(
+      this.walletAssetsState.items,
+      selectedIds,
+      selectionSources
+    );
+  }
+  async scanWalletAssetAsync(code) {
+    const normalizedCode = String(code || "").trim();
+    if (!normalizedCode) {
+      return {
+        type: "normalCode",
+        selected: false,
+        state: this.getWalletAssetsState()
+      };
+    }
+    this.walletAssetsRequestSequence += 1;
+    const result = await this.searchIdentificationCodeAsync({
+      ...this.walletParams || {},
+      code: normalizedCode,
+      prepare_payments: this.formatWalletPassList2PreparePayments(
+        this.walletAssetsState.selectedItems
+      )
+    });
+    const paymentAssets = result.data.filter(isWalletPaymentAsset);
+    const asset = paymentAssets.find(
+      (item) => String((item == null ? void 0 : item.code) || "") === normalizedCode
+    ) || paymentAssets[0];
+    if (!asset || result.type === "walletCode") {
+      return {
+        type: result.type,
+        asset,
+        selected: false,
+        state: this.getWalletAssetsState()
+      };
+    }
+    const items = mergeWalletAssets(this.walletAssetsState.items, [asset]);
+    this.recalculateWalletAssets(
+      items,
+      this.walletAssetsState.selectedIds,
+      this.walletAssetsState.selectionSources
+    );
+    const assetId = getWalletAssetId(asset);
+    const selected = assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+      selected: true,
+      source: "scan"
+    }) : this.getWalletAssetsState();
+    return {
+      type: result.type,
+      asset,
+      selected: assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId)),
+      state: selected
+    };
+  }
+  clearWalletAssetSelection() {
+    return this.recalculateWalletAssets(
+      this.walletAssetsState.items,
+      [],
+      {}
+    );
+  }
+  setCommittedWalletAssets(committedIds, committedAssets = []) {
+    const committedKeys = new Set(committedIds.map((id) => String(id)));
+    const selectedIds = this.walletAssetsState.selectedIds.filter(
+      (id) => !committedKeys.has(String(id))
+    );
+    const selectionSources = Object.entries(
+      this.walletAssetsState.selectionSources
+    ).reduce(
+      (result, [key, source]) => {
+        if (!committedKeys.has(key))
+          result[key] = source;
+        return result;
+      },
+      {}
+    );
+    this.publishWalletAssetsState({
+      items: mergeWalletAssets(this.walletAssetsState.items, committedAssets),
+      committedIds
+    });
+    return this.recalculateWalletAssets(
+      this.walletAssetsState.items,
+      selectedIds,
+      selectionSources
+    );
+  }
   async processWalletPayment(amount, orderUuid, voucherId) {
     this.paymentModule.logInfo("[WalletPass] 开始处理钱包支付", {
       amount,
@@ -576,6 +1018,13 @@ var WalletPassPaymentImpl = class {
     this.searchResults = [];
     this.walletParams = null;
     this.walletInitData = null;
+    this.walletAssetsRequestSequence += 1;
+    this.walletAssetsCalculationContext = {
+      orderTotalAmount: 0,
+      products: []
+    };
+    this.walletAssetsState = createInitialWalletAssetsState();
+    this.publishWalletAssetsState({});
     this.emitEvent(import_types.WalletPassHooks.OnWalletCacheCleared, {
       clearedTypes: ["all"]
     });

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

@@ -193,7 +193,6 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
-        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/lib/modules/ProductList/index.js

@@ -106,48 +106,39 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
-    const channelMap = {
-      online_store: "online-store",
-      scan_to_order: "online-store",
-      "scan-to-order": "online-store",
-      scan_to_order_2: "mobile_order",
-      scan_to_order_3: "scantoorder3"
-    };
-    const rawApplicationCode = (_b = this.otherParams) == null ? void 0 : _b.channel;
-    const mappedApplicationCode = typeof rawApplicationCode === "string" ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-    const queryPayload = {
-      open_quotation: 1,
-      open_bundle: 0,
-      exclude_extension_type: [
-        "product_party",
-        "product_event",
-        "product_series_event",
-        "product_package_ticket",
-        "ticket",
-        "event_item"
-      ],
-      with: ["category", "collection", "resourceRelation"],
-      status,
-      num: 500,
-      skip: 1,
-      customer_id,
-      ...Array.isArray(category_ids) && category_ids.length ? { category_ids } : {},
-      ...Array.isArray(product_ids) && product_ids.length ? { ids: product_ids } : {},
-      ...Array.isArray(collection) && collection.length ? { collection } : {},
-      front_end_cache_id: cacheId,
-      ...Array.isArray(menu_list_ids) && menu_list_ids.length ? { menu_list_ids } : {},
-      with_count,
-      // client_schedule_ids: schedule_ids,
-      schedule_date,
-      application_code: mappedApplicationCode,
-      is_eject: 1,
-      with_schedule,
-      schedule_datetime,
-      extension_type
-    };
     const productsData = await this.request.post(
       `/product/query`,
-      queryPayload,
+      {
+        open_quotation: 1,
+        open_bundle: 0,
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
+        ],
+        with: ["category", "collection", "resourceRelation"],
+        status,
+        num: 500,
+        skip: 1,
+        customer_id,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: cacheId,
+        menu_list_ids,
+        with_count,
+        // client_schedule_ids: schedule_ids,
+        schedule_date,
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        is_eject: 1,
+        with_schedule,
+        schedule_datetime,
+        extension_type,
+        strategy_context
+      },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }
     );

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

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/lib/modules/Quotation/index.js

@@ -52,7 +52,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       { useCache: false, osServer: true }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => b.sort - a.sort);
+    list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
   getQuotationList() {
@@ -96,7 +96,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
    * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
    *
-   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */

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

@@ -35,6 +35,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
+    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];