@pisell/pisellos 2.3.101 → 2.3.103

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -46,6 +46,7 @@ export interface BaseProductDetailPayload {
     original_price?: number | string;
     tax_fee?: number | string;
     is_charge_tax?: number;
+    metadata?: Record<string, any>;
     note?: string;
     [key: string]: any;
 }

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,6 +4,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
@@ -45,6 +52,54 @@ function firstNonBlank() {
     return !isBlankValue(value);
   });
 }
+
+/**
+ * 取第一份接口权威 Data Variant 命中结果并复制数组。
+ * 空数组表示规则已计算但无命中，必须与字段缺失区分。
+ */
+function cloneFirstDataVariantIds() {
+  for (var _len2 = arguments.length, values = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+    values[_key2] = arguments[_key2];
+  }
+  var ids = values.find(function (value) {
+    return Array.isArray(value);
+  });
+  return Array.isArray(ids) ? _toConsumableArray(ids) : undefined;
+}
+
+/**
+ * 在接口权威命中结果后追加本地应用及最终选中的 Data Variant ID。
+ * 以字符串身份去重，同时将新增 ID 归一为正整数。
+ */
+function appendDataVariantIds(base) {
+  var result = Array.isArray(base) ? _toConsumableArray(base) : [];
+  var seen = new Set(result.map(function (id) {
+    return String(id);
+  }));
+  for (var _len3 = arguments.length, values = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+    values[_key3 - 1] = arguments[_key3];
+  }
+  for (var _i = 0, _values = values; _i < _values.length; _i++) {
+    var value = _values[_i];
+    var candidates = Array.isArray(value) ? value : [value];
+    var _iterator = _createForOfIteratorHelper(candidates),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var candidate = _step.value;
+        var id = Number(candidate);
+        if (!Number.isFinite(id) || id <= 0 || seen.has(String(id))) continue;
+        result.push(id);
+        seen.add(String(id));
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  return Array.isArray(base) || result.length ? result : undefined;
+}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(function (optionItem) {
@@ -108,7 +163,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _origin$production_co, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _payload$metadata, _sourceProduct$metada, _callbackOrigin$metad, _origin$metadata, _payload$metadata2, _payload$_extend, _sourceProduct$metada2, _sourceProduct$_exten, _callbackOrigin$metad2, _callbackOrigin$_exte, _payload$_dataVariant, _sourceProduct$_dataV, _callbackOrigin$_data, _origin$_dataVariant, _ref15, _findVariantById, _origin$production_co, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend2, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend3, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend4, _payload$_extend5, _extend3, _payload$_extend6, _payload$_extend7, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -119,6 +174,10 @@ export function transformBaseProductToOrderProduct(params) {
   var productVariantId = toNumber((_ref13 = (_ref14 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref14 !== void 0 ? _ref14 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.product_variant_id) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant_id, 0);
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
+  var authoritativeDataVariantIds = cloneFirstDataVariantIds((_payload$metadata = payload.metadata) === null || _payload$metadata === void 0 ? void 0 : _payload$metadata.data_variant_ids, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$metada = sourceProduct.metadata) === null || _sourceProduct$metada === void 0 ? void 0 : _sourceProduct$metada.data_variant_ids, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$metad = callbackOrigin.metadata) === null || _callbackOrigin$metad === void 0 ? void 0 : _callbackOrigin$metad.data_variant_ids, origin === null || origin === void 0 || (_origin$metadata = origin.metadata) === null || _origin$metadata === void 0 ? void 0 : _origin$metadata.data_variant_ids);
+  var selectedSettlementSnapshot = firstNonBlank(payload.selected_settlement_snapshot, (_payload$metadata2 = payload.metadata) === null || _payload$metadata2 === void 0 ? void 0 : _payload$metadata2.selected_settlement_snapshot, (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 || (_payload$_extend = _payload$_extend.metadata) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.selected_settlement_snapshot, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$metada2 = sourceProduct.metadata) === null || _sourceProduct$metada2 === void 0 ? void 0 : _sourceProduct$metada2.selected_settlement_snapshot, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$_exten = sourceProduct._extend) === null || _sourceProduct$_exten === void 0 || (_sourceProduct$_exten = _sourceProduct$_exten.metadata) === null || _sourceProduct$_exten === void 0 ? void 0 : _sourceProduct$_exten.selected_settlement_snapshot, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$metad2 = callbackOrigin.metadata) === null || _callbackOrigin$metad2 === void 0 ? void 0 : _callbackOrigin$metad2.selected_settlement_snapshot, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$_exte = callbackOrigin._extend) === null || _callbackOrigin$_exte === void 0 || (_callbackOrigin$_exte = _callbackOrigin$_exte.metadata) === null || _callbackOrigin$_exte === void 0 ? void 0 : _callbackOrigin$_exte.selected_settlement_snapshot);
+  var locallyAppliedVariantIds = authoritativeDataVariantIds === undefined ? cloneFirstDataVariantIds((_payload$_dataVariant = payload._dataVariant) === null || _payload$_dataVariant === void 0 ? void 0 : _payload$_dataVariant.appliedVariantIds, sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$_dataV = sourceProduct._dataVariant) === null || _sourceProduct$_dataV === void 0 ? void 0 : _sourceProduct$_dataV.appliedVariantIds, callbackOrigin === null || callbackOrigin === void 0 || (_callbackOrigin$_data = callbackOrigin._dataVariant) === null || _callbackOrigin$_data === void 0 ? void 0 : _callbackOrigin$_data.appliedVariantIds, origin === null || origin === void 0 || (_origin$_dataVariant = origin._dataVariant) === null || _origin$_dataVariant === void 0 ? void 0 : _origin$_dataVariant.appliedVariantIds) : undefined;
+  var dataVariantIds = appendDataVariantIds(authoritativeDataVariantIds, locallyAppliedVariantIds, selectedSettlementSnapshot === null || selectedSettlementSnapshot === void 0 ? void 0 : selectedSettlementSnapshot.data_variant_id);
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
   var productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.production_code : (_origin$production_co = origin === null || origin === void 0 ? void 0 : origin.production_code) !== null && _origin$production_co !== void 0 ? _origin$production_co : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.production_code);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
@@ -126,7 +185,7 @@ export function transformBaseProductToOrderProduct(params) {
   // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
   var catalogSourcePrice = (_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_matchedVariant$price = matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _matchedVariant$price !== void 0 ? _matchedVariant$price : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price;
   var sourceProductPrice = toPriceString(hasPriceOverride ? (_ref21 = catalogSourcePrice !== null && catalogSourcePrice !== void 0 ? catalogSourcePrice : payload.price) !== null && _ref21 !== void 0 ? _ref21 : payload.selling_price : (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : catalogSourcePrice, '0.00');
-  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
+  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.total;
   var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
@@ -137,16 +196,16 @@ export function transformBaseProductToOrderProduct(params) {
   var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
   var originTotal = resolveManualDiscountOriginTotal({
     originTotal: payload.origin_total,
-    extendOriginTotal: (_payload$_extend2 = payload._extend) === null || _payload$_extend2 === void 0 ? void 0 : _payload$_extend2.origin_total,
+    extendOriginTotal: (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.origin_total,
     originExtendOriginTotal: origin === null || origin === void 0 || (_extend = origin._extend) === null || _extend === void 0 ? void 0 : _extend.origin_total,
     sourceExtendOriginTotal: sourceProduct === null || sourceProduct === void 0 || (_extend2 = sourceProduct._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total,
     catalogUnitPrice: (_ref26 = (_ref27 = (_origin$base_price = origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _origin$base_price !== void 0 ? _origin$base_price : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref27 !== void 0 ? _ref27 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref26 !== void 0 ? _ref26 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price,
     quantity: resolvedQuantity
   });
-  var sellingTotal = Number((_ref28 = (_ref29 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref29 !== void 0 ? _ref29 : (_payload$_extend3 = payload._extend) === null || _payload$_extend3 === void 0 ? void 0 : _payload$_extend3.total) !== null && _ref28 !== void 0 ? _ref28 : lineCompositeTotal);
+  var sellingTotal = Number((_ref28 = (_ref29 = (_payload$line_total2 = payload.line_total) !== null && _payload$line_total2 !== void 0 ? _payload$line_total2 : payload.total) !== null && _ref29 !== void 0 ? _ref29 : (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.total) !== null && _ref28 !== void 0 ? _ref28 : lineCompositeTotal);
   var discountReason = resolveManualDiscountReasonFromSources({
     discountReason: payload.discount_reason,
-    extendDiscountReason: (_payload$_extend4 = payload._extend) === null || _payload$_extend4 === void 0 ? void 0 : _payload$_extend4.discount_reason,
+    extendDiscountReason: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discount_reason,
     originExtendDiscountReason: origin === null || origin === void 0 || (_extend3 = origin._extend) === null || _extend3 === void 0 ? void 0 : _extend3.discount_reason
   });
   var lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
@@ -159,8 +218,8 @@ export function transformBaseProductToOrderProduct(params) {
     sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
     quantity: resolvedQuantity,
     message: discountReason,
-    discountway: (_payload$_extend5 = payload._extend) === null || _payload$_extend5 === void 0 ? void 0 : _payload$_extend5.discountway,
-    discount_per: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discount_per
+    discountway: (_payload$_extend6 = payload._extend) === null || _payload$_extend6 === void 0 ? void 0 : _payload$_extend6.discountway,
+    discount_per: (_payload$_extend7 = payload._extend) === null || _payload$_extend7 === void 0 ? void 0 : _payload$_extend7.discount_per
   })) : payload.discount_list || [];
 
   // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
@@ -172,7 +231,7 @@ export function transformBaseProductToOrderProduct(params) {
   });
   var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
-  var metadata = _objectSpread(_objectSpread({
+  var metadata = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     unique: payload.unique,
     session: payload.session,
     form: payload.form,
@@ -187,7 +246,11 @@ export function transformBaseProductToOrderProduct(params) {
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
     holder_config: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config
-  }, hasPriceOverride ? {
+  }, dataVariantIds !== undefined ? {
+    data_variant_ids: dataVariantIds
+  } : {}), selectedSettlementSnapshot ? {
+    selected_settlement_snapshot: selectedSettlementSnapshot
+  } : {}), hasPriceOverride ? {
     price_override: String(payload.price_override),
     is_manual_discount: 1
   } : {}), payload.bundle_edit !== undefined ? {

package/dist/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 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 1 | 2 | 5 | 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/dist/solution/BookingTicket/utils/addProductDecision.js

@@ -319,7 +319,7 @@ export function transformDetailToProductAndBooking(cacheItem, ctx) {
  * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
  */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _other$production_cod, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2;
+  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _other$production_cod, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2, _cacheItem$metadata$s, _cacheItem$metadata, _extend$metadata;
   var other = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.other) || {};
   var quantity = (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : 1;
   var resolvedPid = (_cacheItem$product_id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id) !== null && _cacheItem$product_id !== void 0 ? _cacheItem$product_id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id;
@@ -350,6 +350,7 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     bundle_edit: extend === null || extend === void 0 ? void 0 : extend.bundle_edit,
     discount_reason: extend === null || extend === void 0 ? void 0 : extend.discount_reason,
     discount_list: cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list,
+    selected_settlement_snapshot: (_cacheItem$metadata$s = cacheItem === null || cacheItem === void 0 || (_cacheItem$metadata = cacheItem.metadata) === null || _cacheItem$metadata === void 0 ? void 0 : _cacheItem$metadata.selected_settlement_snapshot) !== null && _cacheItem$metadata$s !== void 0 ? _cacheItem$metadata$s : extend === null || extend === void 0 || (_extend$metadata = extend.metadata) === null || _extend$metadata === void 0 ? void 0 : _extend$metadata.selected_settlement_snapshot,
     _extend: extend
   };
 }

package/lib/model/strategy/adapter/dataVariant/evaluator.d.ts

@@ -3,7 +3,7 @@ import type { ConditionScope, DataVariantBusinessData, DataVariantMenu, DataVari
 /**
  * Data Variant 评估器。
  *
- * 当前阶段只提供策略模型能力和示例验证，不接入 ProductList 业务链路。
+ * OS Server 商品路由开启时由 ProductsModule 调用；路由关闭时由 ProductList 在远端响应后调用。
  */
 export declare class DataVariantEvaluator {
     private adapter;
@@ -17,7 +17,7 @@ export declare class DataVariantEvaluator {
     /**
      * 批量解析商品 Data Variant。
      *
-     * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
+     * 优先使用商品 metadata.data_variant_ids；缺少权威命中结果时才执行本地策略判断。
      */
     resolveProducts(businessData: DataVariantBusinessData): ResolvedDataVariantResult;
     /**
@@ -34,8 +34,24 @@ export declare class DataVariantEvaluator {
      * 这里不依赖餐牌，只读取策略配置和调用方传入的 scheduleList。
      */
     buildScheduleTimePoints(strategyConfigs: StrategyConfig<DataVariantRuleMetadata>[], scheduleList: NonNullable<DataVariantBusinessData['scheduleList']>): string[];
+    /**
+     * 判断商品（含套餐子商品）是否仍需要本地执行策略条件。
+     * metadata.data_variant_ids 只要是数组，即使为空，也表示接口已经给出权威命中结果。
+     */
+    private requiresLocalStrategyEvaluation;
+    /**
+     * 将接口返回的高 -> 低优先级 Variant ID 转成数值优先级。
+     * 返回 null 表示接口没有提供该字段；空 Map 表示已计算但没有任何命中。
+     */
+    private getAuthoritativeVariantPriorities;
+    private normalizeDataVariantId;
     private buildGlobalEffectiveRuleMap;
     private resolveProduct;
+    /**
+     * 多货币 Data Variant 只生成候选列表，不参与商品字段覆盖。
+     * rule_id=0 是无条件默认价；同币种命中的条件价优先于默认价。
+     */
+    private resolveSettlementOptions;
     /**
      * 解析套餐子商品上的 Data Variant 覆盖。
      *

package/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -10,7 +10,7 @@ var _adapter = require("./adapter");
 /**
  * Data Variant 评估器。
  *
- * 当前阶段只提供策略模型能力和示例验证，不接入 ProductList 业务链路。
+ * OS Server 商品路由开启时由 ProductsModule 调用；路由关闭时由 ProductList 在远端响应后调用。
  */
 class DataVariantEvaluator {
   adapter;
@@ -32,16 +32,22 @@ class DataVariantEvaluator {
   /**
    * 批量解析商品 Data Variant。
    *
-   * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
+   * 优先使用商品 metadata.data_variant_ids；缺少权威命中结果时才执行本地策略判断。
    */
   resolveProducts(businessData) {
     const strategyConfigs = businessData.strategyConfigs ? this.normalizeStrategyConfigs(businessData.strategyConfigs) : this.strategyConfigs;
     const menuScopeMap = this.buildMenuScopeMap(businessData.menuList || []);
     const scheduleTimePoints = this.buildScheduleTimePoints(strategyConfigs, businessData.scheduleList || []);
+    // metadata.data_variant_ids 存在时，接口已经完成规则计算；只有仍有商品缺少
+    // 该权威结果时才初始化本地策略引擎，避免 OS/接口与客户端重复评估。
+    const shouldEvaluateStrategies = businessData.products.some(product => this.requiresLocalStrategyEvaluation(product));
     const {
       globalEffectiveRuleMap,
       rawResults
-    } = this.buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap);
+    } = shouldEvaluateStrategies ? this.buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap) : {
+      globalEffectiveRuleMap: new Map(),
+      rawResults: []
+    };
     const products = businessData.products.map(product => {
       const resolvedProduct = this.resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap);
       // 套餐子商品也可能携带 data_variants，需在同一策略上下文内继续评估并写回 bundle_item。
@@ -124,6 +130,46 @@ class DataVariantEvaluator {
     const matchedSchedules = scheduleList.filter(schedule => scheduleIdSet.has(Number(schedule.id)));
     return this.extractTimePointsFromSchedules(matchedSchedules);
   }
+
+  /**
+   * 判断商品（含套餐子商品）是否仍需要本地执行策略条件。
+   * metadata.data_variant_ids 只要是数组，即使为空，也表示接口已经给出权威命中结果。
+   */
+  requiresLocalStrategyEvaluation(product) {
+    const dataVariants = this.getProductDataVariants(product);
+    const hasConditionalVariant = dataVariants.some(variant => Number(variant.data_variant_rule_id) !== 0);
+    if (hasConditionalVariant && this.getAuthoritativeVariantPriorities(product) === null) {
+      return true;
+    }
+    const bundleGroups = Array.isArray(product.bundle_group) ? product.bundle_group : [];
+    return bundleGroups.some(group => {
+      const bundleItems = Array.isArray(group?.bundle_item) ? group.bundle_item : [];
+      return bundleItems.some(item => this.requiresLocalStrategyEvaluation(this.toBundleItemDataVariantProduct(item)));
+    });
+  }
+
+  /**
+   * 将接口返回的高 -> 低优先级 Variant ID 转成数值优先级。
+   * 返回 null 表示接口没有提供该字段；空 Map 表示已计算但没有任何命中。
+   */
+  getAuthoritativeVariantPriorities(product) {
+    const rawIds = product?.metadata?.data_variant_ids;
+    if (!Array.isArray(rawIds)) return null;
+    const orderedIds = [];
+    const seen = new Set();
+    for (const rawId of rawIds) {
+      const id = this.normalizeDataVariantId(rawId);
+      if (id === null || seen.has(id)) continue;
+      seen.add(id);
+      orderedIds.push(id);
+    }
+    return new Map(orderedIds.map((id, index) => [id, orderedIds.length - index]));
+  }
+  normalizeDataVariantId(value) {
+    if (value === undefined || value === null) return null;
+    const normalized = String(value).trim();
+    return normalized || null;
+  }
   buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap) {
     const globalEffectiveRuleMap = new Map();
     const rawResults = [];
@@ -155,7 +201,22 @@ class DataVariantEvaluator {
     const dataVariants = this.getProductDataVariants(product);
     if (!dataVariants.length) return product;
     const matchedVariants = [];
+    const authoritativeVariantPriorities = this.getAuthoritativeVariantPriorities(product);
+    const settlementVariants = dataVariants.filter(variant => variant.business_type === 'multi_currency_settlement' && variant.status === 'enable');
     for (const variant of dataVariants) {
+      if (variant.business_type === 'multi_currency_settlement') continue;
+      if (authoritativeVariantPriorities !== null) {
+        const variantId = this.normalizeDataVariantId(variant.id);
+        const priority = variantId === null ? undefined : authoritativeVariantPriorities.get(variantId);
+        if (priority === undefined) continue;
+        matchedVariants.push({
+          ruleId: String(variant.data_variant_rule_id),
+          priority,
+          data: variant.data || {},
+          variant
+        });
+        continue;
+      }
       const rule = globalEffectiveRuleMap.get(String(variant.data_variant_rule_id));
       if (!rule) continue;
       if (!this.evaluateProductRules(rule, product, businessData, menuScopeMap)) {
@@ -168,8 +229,76 @@ class DataVariantEvaluator {
         variant
       });
     }
-    if (!matchedVariants.length) return product;
-    return this.mergeMatchedVariants(product, matchedVariants);
+    const resolvedProduct = matchedVariants.length ? this.mergeMatchedVariants(product, matchedVariants) : product;
+    const availableSettlementOptions = this.resolveSettlementOptions(settlementVariants, product, businessData, globalEffectiveRuleMap, menuScopeMap, authoritativeVariantPriorities);
+    if (!settlementVariants.length) return resolvedProduct;
+    return {
+      ...resolvedProduct,
+      available_settlement_options: availableSettlementOptions
+    };
+  }
+
+  /**
+   * 多货币 Data Variant 只生成候选列表，不参与商品字段覆盖。
+   * rule_id=0 是无条件默认价；同币种命中的条件价优先于默认价。
+   */
+  resolveSettlementOptions(variants, product, businessData, globalEffectiveRuleMap, menuScopeMap, authoritativeVariantPriorities) {
+    if (!variants.length) return [];
+    const candidates = variants.flatMap(variant => {
+      const settlement = variant.data?.multi_currency_settlement;
+      if (!settlement || typeof settlement !== 'object') return [];
+      const ruleId = String(variant.data_variant_rule_id);
+      const isDefault = Number(variant.data_variant_rule_id) === 0;
+      const rule = isDefault ? undefined : globalEffectiveRuleMap.get(ruleId);
+      const variantId = this.normalizeDataVariantId(variant.id);
+      const authoritativePriority = variantId === null ? undefined : authoritativeVariantPriorities?.get(variantId);
+      let available;
+      let priority;
+      if (isDefault) {
+        // rule 0 是无条件默认候选，不依赖接口命中 ID 或本地策略引擎。
+        available = true;
+        priority = Number.NEGATIVE_INFINITY;
+      } else if (authoritativeVariantPriorities !== null) {
+        // 数组存在（包括 []）即表示接口已经算过规则，不再在客户端二次判断。
+        available = authoritativePriority !== undefined;
+        priority = authoritativePriority ?? rule?.priority ?? Number.NEGATIVE_INFINITY;
+      } else {
+        available = Boolean(rule && this.evaluateProductRules(rule, product, businessData, menuScopeMap));
+        priority = rule?.priority ?? Number.NEGATIVE_INFINITY;
+      }
+      const settlementType = String(settlement.settlement_type || '');
+      const currencyProductId = this.toNumber(settlement.currency_product_id);
+      const settlementKey = settlementType === 'virtual_currency' ? `virtual_currency:${currencyProductId || ''}` : settlementType || `variant:${variant.id ?? ruleId}`;
+      return [{
+        key: settlementKey,
+        priority,
+        isDefault,
+        option: {
+          ...settlement,
+          settlement_type: settlementType,
+          ...(currencyProductId ? {
+            currency_product_id: currencyProductId
+          } : {}),
+          price: String(variant.data?.price ?? '0'),
+          data_variant_id: variant.id,
+          data_variant_rule_id: variant.data_variant_rule_id,
+          available,
+          disabled_reason: available ? '' : String(settlement.disabled_reason || 'Not available for this purchase.')
+        }
+      }];
+    });
+    const grouped = new Map();
+    for (const candidate of candidates) {
+      const group = grouped.get(candidate.key) || [];
+      group.push(candidate);
+      grouped.set(candidate.key, group);
+    }
+    return Array.from(grouped.values()).map(group => {
+      const matchedConditional = group.filter(candidate => !candidate.isDefault && candidate.option.available).sort((a, b) => b.priority - a.priority)[0];
+      const defaultCandidate = group.find(candidate => candidate.isDefault);
+      const unavailableCandidate = [...group].filter(candidate => !candidate.option.available).sort((a, b) => b.priority - a.priority)[0];
+      return (matchedConditional || defaultCandidate || unavailableCandidate).option;
+    });
   }
 
   /**
@@ -222,7 +351,8 @@ class DataVariantEvaluator {
       product_variant_id: variantId,
       variant_id: variantId,
       collection: item.collection,
-      data_variants: item.data_variants
+      data_variants: item.data_variants,
+      metadata: item.metadata
     };
   }
 
@@ -453,6 +583,7 @@ class DataVariantEvaluator {
     }
     result._dataVariant = {
       appliedRuleIds,
+      appliedVariantIds: Array.from(new Set([...sortedVariants].reverse().map(matched => this.normalizeDataVariantId(matched.variant.id)).filter(id => id !== null))),
       appliedFields: Array.from(appliedFields),
       original
     };

package/lib/model/strategy/adapter/dataVariant/type.d.ts

@@ -35,6 +35,10 @@ export interface DataVariantItem {
     module_data_id?: number;
     /** 关联策略模型 metadata.id / data_variant_rule.id */
     data_variant_rule_id: number | string;
+    /** 业务类型；多货币结算候选不会走普通字段覆盖 */
+    business_type?: 'multi_currency_settlement' | string;
+    /** 数据状态；多货币结算仅处理 enable 记录 */
+    status?: 'enable' | 'disable' | string;
     /** 命中策略后需要覆盖到商品上的字段 */
     data: Record<string, any>;
     created_at?: string | null;
@@ -53,11 +57,30 @@ export interface DataVariantProduct {
         id?: number | string;
         [key: string]: any;
     }>;
+    /**
+     * 商品接口已经完成规则计算时返回的命中结果。
+     * 数组按 Data Variant 优先级从高到低排列；空数组表示已计算但无命中。
+     */
+    metadata?: {
+        data_variant_ids?: Array<number | string>;
+        [key: string]: any;
+    };
     /** 后端 /product/query with dataVariants 返回的智能定价变体列表 */
     data_variants?: DataVariantItem[];
+    /** 当前上下文解析后的可选结算货币，不覆盖商品原始多货币配置 */
+    available_settlement_options?: AvailableSettlementOption[];
     _dataVariant?: DataVariantAppliedInfo;
     [key: string]: any;
 }
+export interface AvailableSettlementOption extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency' | string;
+    currency_product_id?: number;
+    price: string;
+    data_variant_id?: number;
+    data_variant_rule_id: number | string;
+    available: boolean;
+    disabled_reason?: string;
+}
 /**
  * 餐牌商品配置项。
  */
@@ -131,6 +154,8 @@ export interface MatchedDataVariant {
  */
 export interface DataVariantAppliedInfo {
     appliedRuleIds: string[];
+    /** 本地策略实际应用的 Data Variant ID，按优先级从高到低排列。 */
+    appliedVariantIds?: Array<number | string>;
     appliedFields: string[];
     original: DataVariantProduct;
 }

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -181,6 +181,7 @@ function buildCacheItemFromOrderLine(input) {
     booking,
     sourceProduct
   } = input;
+  const holderConfig = sourceProduct?.holder_config ?? sourceProduct?.origin?.holder_config ?? product.metadata?.holder_config;
   const resolvedId = product.product_id ?? sourceProduct?.id;
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
@@ -249,6 +250,9 @@ function buildCacheItemFromOrderLine(input) {
   }
   const base = {
     ...(sourceProduct || {}),
+    ...(holderConfig !== undefined && holderConfig !== null ? {
+      holder_config: holderConfig
+    } : {}),
     id: resolvedId,
     product_id: resolvedId,
     extension_type: sourceProduct?.extension_type ?? booking?.product?.extension_type ?? sourceProduct?.extension_type,

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

@@ -25,9 +25,11 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_wallet_pass_holder: 0 | 1;
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
+        with_virtual_currency?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
+    private normalizeVirtualCurrencyList;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/lib/modules/Discount/index.js

@@ -80,21 +80,50 @@ class DiscountModule extends _BaseModule.BaseModule {
     const prepareConfig = await this.request.post(`/order/prepare/config`, {
       ...params,
       with_available_wallet_flag: params.with_available_wallet_flag ?? 1,
-      with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1
+      with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1,
+      with_virtual_currency: params.with_virtual_currency ?? 1
     });
     const rawDiscountList = [...(prepareConfig?.data?.good_pass_list || []), ...(prepareConfig?.data?.discount_card_list || [])];
     const availableWalletList = [...(prepareConfig?.data?.avaiable_wallet_list || []), ...(prepareConfig?.data?.available_wallet_list || [])];
     const availableWalletPassList = prepareConfig?.data?.available_wallet_pass_list || [];
     const availableWalletIds = this.normalizePositiveNumberIds([...availableWalletList.map(item => item?.wallet_id), ...availableWalletPassList.map(item => item?.product_id)]);
+    const virtualCurrencyList = this.normalizeVirtualCurrencyList(prepareConfig?.data?.virtual_currency_list);
     const goodPassList = this.filterEnabledDiscountList(rawDiscountList) || [];
 
     // this.setDiscountList(goodPassList);
 
     return {
       discountList: goodPassList,
-      availableWalletIds
+      availableWalletIds,
+      virtualCurrencyList
     };
   }
+  normalizeVirtualCurrencyList(value) {
+    if (!Array.isArray(value)) return [];
+    return value.flatMap(item => {
+      const id = Number(item?.id);
+      const productId = Number(item?.product_id);
+      if (!Number.isFinite(id) || id <= 0 || !Number.isFinite(productId) || productId <= 0) {
+        return [];
+      }
+      const displayExtension = Array.isArray(item?.extension_data) ? item.extension_data.find(extension => extension?.field_key === 'virtual_currency_display') : undefined;
+      let display = displayExtension?.value;
+      if (typeof display === 'string') {
+        try {
+          display = JSON.parse(display);
+        } catch {
+          display = {};
+        }
+      }
+      return [{
+        ...item,
+        id,
+        product_id: productId,
+        balance: String(item?.balance ?? '0'),
+        virtual_currency_display: display && typeof display === 'object' && !Array.isArray(display) ? display : {}
+      }];
+    });
+  }
   async batchSearch(code, options) {
     const {
       customerId,

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

@@ -71,6 +71,17 @@ export interface DiscountWithReason {
 export interface DiscountPrepareConfigResult {
     discountList: Discount[];
     availableWalletIds: number[];
+    virtualCurrencyList?: VirtualCurrencyAsset[];
+}
+export interface VirtualCurrencyAsset extends Record<string, any> {
+    id: number;
+    product_id: number;
+    balance: string;
+    product_name?: string;
+    format_title?: Record<string, any>;
+    code?: string;
+    encoded?: string;
+    virtual_currency_display?: Record<string, any>;
 }
 interface ExtensionData {
     id: number;