@pisell/pisellos 2.3.164 → 2.3.166

package/dist/model/strategy/adapter/promotion/evaluator.js

@@ -269,6 +269,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       var productResults = this.evaluateProducts(input);
 
       // 2. 收集所有适用的促销（去重）
+      // strategyId is metadata and is not guaranteed to be unique. Use the actual
+      // configuration as the key so one strategy cannot overwrite another strategy's
+      // label/action when their IDs happen to be the same.
       var promotionMap = new Map();
       var _iterator3 = _createForOfIteratorHelper(productResults),
         _step3;
@@ -280,7 +283,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           try {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var promo = _step4.value;
-              var existing = promotionMap.get(promo.strategyId);
+              var existing = promotionMap.get(promo.strategyConfig);
               var product = productResult.product;
 
               // 计算促销数量：如果是 bundle 子商品匹配，数量 = 主商品数量 × 子商品数量
@@ -303,7 +306,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
                 // 新促销
                 var productMatchedBundleIndexMap = new Map();
                 productMatchedBundleIndexMap.set(product.id, promo.matchedBundleIndex);
-                promotionMap.set(promo.strategyId, _objectSpread(_objectSpread({}, promo), {}, {
+                promotionMap.set(promo.strategyConfig, _objectSpread(_objectSpread({}, promo), {}, {
                   applicableProducts: [product],
                   totalQuantity: promoQuantity,
                   totalAmount: product.price * product.quantity,
@@ -367,7 +370,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       var cartResult = this.evaluateCart(input);
 
       // 2. 按 action priority 排序促销组（从 strategyConfig 获取 priority）
-      var sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups, cartResult.applicablePromotions);
+      var sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups);
 
       // 3. 追踪已处理的商品（避免重复处理）
       // key: `${product_id}_${product_variant_id}`
@@ -664,30 +667,12 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
      */
   }, {
     key: "sortPromotionGroupsByPriority",
-    value: function sortPromotionGroupsByPriority(groups, promotions) {
-      // 创建策略ID到优先级的映射
-      var priorityMap = new Map();
-      var _iterator9 = _createForOfIteratorHelper(promotions),
-        _step9;
-      try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var _promo$strategyConfig2, _actions$0$priority, _actions$;
-          var promo = _step9.value;
-          var actions = ((_promo$strategyConfig2 = promo.strategyConfig) === null || _promo$strategyConfig2 === void 0 ? void 0 : _promo$strategyConfig2.actions) || [];
-          var priority = (_actions$0$priority = (_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.priority) !== null && _actions$0$priority !== void 0 ? _actions$0$priority : 999;
-          priorityMap.set(promo.strategyId, priority);
-        }
-
-        // 按优先级排序（数值越小优先级越高）
-      } catch (err) {
-        _iterator9.e(err);
-      } finally {
-        _iterator9.f();
-      }
+    value: function sortPromotionGroupsByPriority(groups) {
+      // 按优先级排序（数值越小优先级越高）
       return _toConsumableArray(groups).sort(function (a, b) {
-        var _priorityMap$get, _priorityMap$get2;
-        var priorityA = (_priorityMap$get = priorityMap.get(a.strategyId)) !== null && _priorityMap$get !== void 0 ? _priorityMap$get : 999;
-        var priorityB = (_priorityMap$get2 = priorityMap.get(b.strategyId)) !== null && _priorityMap$get2 !== void 0 ? _priorityMap$get2 : 999;
+        var _a$strategyConfig$act, _a$strategyConfig, _b$strategyConfig$act, _b$strategyConfig;
+        var priorityA = (_a$strategyConfig$act = (_a$strategyConfig = a.strategyConfig) === null || _a$strategyConfig === void 0 || (_a$strategyConfig = _a$strategyConfig.actions) === null || _a$strategyConfig === void 0 || (_a$strategyConfig = _a$strategyConfig[0]) === null || _a$strategyConfig === void 0 ? void 0 : _a$strategyConfig.priority) !== null && _a$strategyConfig$act !== void 0 ? _a$strategyConfig$act : 999;
+        var priorityB = (_b$strategyConfig$act = (_b$strategyConfig = b.strategyConfig) === null || _b$strategyConfig === void 0 || (_b$strategyConfig = _b$strategyConfig.actions) === null || _b$strategyConfig === void 0 || (_b$strategyConfig = _b$strategyConfig[0]) === null || _b$strategyConfig === void 0 ? void 0 : _b$strategyConfig.priority) !== null && _b$strategyConfig$act !== void 0 ? _b$strategyConfig$act : 999;
         return priorityA - priorityB;
       });
     }
@@ -720,11 +705,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 1. 展开所有商品为单件列表（排除已处理的数量）
       // 每个单件记录来自哪个原商品（通过 product.id）
       var unitProducts = [];
-      var _iterator10 = _createForOfIteratorHelper(groupProducts),
-        _step10;
+      var _iterator9 = _createForOfIteratorHelper(groupProducts),
+        _step9;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var product = _step10.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var product = _step9.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -741,9 +726,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator10.f();
+        _iterator9.f();
       }
       if (unitProducts.length === 0) {
         return {
@@ -775,25 +760,25 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
       // 5. 按原商品 id 统计参与促销和不参与的数量
       var promotionQtyByProductId = new Map();
-      var _iterator11 = _createForOfIteratorHelper(inPromotionUnits),
-        _step11;
+      var _iterator10 = _createForOfIteratorHelper(inPromotionUnits),
+        _step10;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var _unit = _step11.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var _unit = _step10.value;
           var id = _unit.productId;
           promotionQtyByProductId.set(id, (promotionQtyByProductId.get(id) || 0) + 1);
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator11.f();
+        _iterator10.f();
       }
       var remainingQtyByProductId = new Map();
-      var _iterator12 = _createForOfIteratorHelper(notInPromotionUnits),
-        _step12;
+      var _iterator11 = _createForOfIteratorHelper(notInPromotionUnits),
+        _step11;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _unit2 = _step12.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var _unit2 = _step11.value;
           var _id = _unit2.productId;
           remainingQtyByProductId.set(_id, (remainingQtyByProductId.get(_id) || 0) + 1);
         }
@@ -802,9 +787,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         // 按组内原价比例均摊
         // 记录每个原商品的均摊价格累加（用于后续聚合）
       } catch (err) {
-        _iterator12.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator12.f();
+        _iterator11.f();
       }
       var allocatedPricesByProductId = new Map();
       for (var g = 0; g < groupCount; g++) {
@@ -836,11 +821,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       }
 
       // 7. 为每个原商品生成结果
-      var _iterator13 = _createForOfIteratorHelper(groupProducts),
-        _step13;
+      var _iterator12 = _createForOfIteratorHelper(groupProducts),
+        _step12;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var _product = _step13.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var _product = _step12.value;
           var _key = this.getProductKey(_product);
           var _processedQty = processedQuantityMap.get(_key) || 0;
           var _availableQty = _product.quantity - _processedQty;
@@ -928,9 +913,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 8. 尾差调整：确保促销商品的 finalPrice × quantity 之和精确等于 groupPrice × groupCount
       } catch (err) {
-        _iterator13.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator13.f();
+        _iterator12.f();
       }
       if (groupCount > 0) {
         var expectedPromoTotal = new Decimal(groupPrice).mul(groupCount);
@@ -938,17 +923,17 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           return p.inPromotion;
         });
         var actualPromoTotal = new Decimal(0);
-        var _iterator14 = _createForOfIteratorHelper(promoItems),
-          _step14;
+        var _iterator13 = _createForOfIteratorHelper(promoItems),
+          _step13;
         try {
-          for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-            var _p = _step14.value;
+          for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+            var _p = _step13.value;
             actualPromoTotal = actualPromoTotal.plus(new Decimal(_p.finalPrice).mul(_p.quantity));
           }
         } catch (err) {
-          _iterator14.e(err);
+          _iterator13.e(err);
         } finally {
-          _iterator14.f();
+          _iterator13.f();
         }
         var roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
         if (!roundingDiff.eq(0)) {
@@ -979,17 +964,17 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
           // 重新计算 finalAmount
           finalAmount = new Decimal(0);
-          var _iterator15 = _createForOfIteratorHelper(result),
-            _step15;
+          var _iterator14 = _createForOfIteratorHelper(result),
+            _step14;
           try {
-            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-              var p = _step15.value;
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+              var p = _step14.value;
               finalAmount = finalAmount.plus(new Decimal(p.finalPrice).mul(p.quantity));
             }
           } catch (err) {
-            _iterator15.e(err);
+            _iterator14.e(err);
           } finally {
-            _iterator15.f();
+            _iterator14.f();
           }
         }
       }
@@ -1027,11 +1012,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 对于 bundle 子商品匹配，促销数量 = 主商品数量 × bundle子商品数量
       var totalPromoQty = 0;
       var productInfoMap = new Map();
-      var _iterator16 = _createForOfIteratorHelper(groupProducts),
-        _step16;
+      var _iterator15 = _createForOfIteratorHelper(groupProducts),
+        _step15;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var product = _step16.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var product = _step15.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1057,18 +1042,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 2. 判断是否满足促销条件
       } catch (err) {
-        _iterator16.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator16.f();
+        _iterator15.f();
       }
       var isFulfilled = totalPromoQty >= buyQuantity;
 
       // 3. 生成商品结果（第二次遍历）
-      var _iterator17 = _createForOfIteratorHelper(groupProducts),
-        _step17;
+      var _iterator16 = _createForOfIteratorHelper(groupProducts),
+        _step16;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var _product2 = _step17.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var _product2 = _step16.value;
           var _key2 = this.getProductKey(_product2);
           var info = productInfoMap.get(_key2);
           if (!info || info.availableQty <= 0) continue;
@@ -1096,9 +1081,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 4. 计算赠品数量（使用促销数量）
       } catch (err) {
-        _iterator17.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator17.f();
+        _iterator16.f();
       }
       var giftCount = 0;
       if (isFulfilled) {
@@ -1173,11 +1158,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         return b.originalPrice.minus(a.originalPrice).toNumber();
       }).slice(0, rewardLimit);
       var selectedByProductId = new Map();
-      var _iterator18 = _createForOfIteratorHelper(selectedUnits),
-        _step18;
+      var _iterator17 = _createForOfIteratorHelper(selectedUnits),
+        _step17;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var unit = _step18.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var unit = _step17.value;
           var existing = selectedByProductId.get(unit.product.id);
           if (existing) {
             existing.quantity += 1;
@@ -1190,18 +1175,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator18.f();
+        _iterator17.f();
       }
       var result = [];
       var originalAmount = new Decimal(0);
       var finalAmount = new Decimal(0);
-      var _iterator19 = _createForOfIteratorHelper(targetProducts),
-        _step19;
+      var _iterator18 = _createForOfIteratorHelper(targetProducts),
+        _step18;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var product = _step19.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var product = _step18.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1240,9 +1225,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           processedQuantityMap.set(key, processedQty + availableQty);
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator19.f();
+        _iterator18.f();
       }
       return {
         products: result,
@@ -1260,11 +1245,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getAvailablePromotionQuantity",
     value: function getAvailablePromotionQuantity(products, processedQuantityMap, matchedBundleIndexMap) {
       var total = 0;
-      var _iterator20 = _createForOfIteratorHelper(products),
-        _step20;
+      var _iterator19 = _createForOfIteratorHelper(products),
+        _step19;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var product = _step20.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var product = _step19.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1278,9 +1263,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator20.f();
+        _iterator19.f();
       }
       return total;
     }
@@ -1288,11 +1273,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "buildItemRewardTargetUnits",
     value: function buildItemRewardTargetUnits(products, processedQuantityMap, detail) {
       var units = [];
-      var _iterator21 = _createForOfIteratorHelper(products),
-        _step21;
+      var _iterator20 = _createForOfIteratorHelper(products),
+        _step20;
       try {
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          var product = _step21.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var product = _step20.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1311,9 +1296,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator21.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator21.f();
+        _iterator20.f();
       }
       return units;
     }
@@ -1369,11 +1354,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getRemainingProducts",
     value: function getRemainingProducts(allProducts, processedQuantityMap) {
       var result = [];
-      var _iterator22 = _createForOfIteratorHelper(allProducts),
-        _step22;
+      var _iterator21 = _createForOfIteratorHelper(allProducts),
+        _step21;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var product = _step22.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var product = _step21.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var remainingQty = product.quantity - processedQty;
@@ -1388,9 +1373,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator22.f();
+        _iterator21.f();
       }
       return result;
     }

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.d.ts

@@ -1,8 +1,10 @@
-import type { OrderProduct } from '../../Order/types';
+import type { OrderHolderRelation, OrderProduct } from '../../Order/types';
 export interface BuildNormalProductCacheItemFromOrderLineInput {
     /** tempOrder.products 中的一行（普通商品，无关联 booking） */
     product: OrderProduct;
     /** 商品 catalog / 详情，用于 variant / option / bundle 模板字段 */
     sourceProduct?: Record<string, any> | null;
+    /** 整单关系集合，按商品行 UID 回填。 */
+    holder_relations?: OrderHolderRelation[];
 }
 export declare function buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -7,13 +7,16 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { cloneDeep } from 'lodash-es';
+import { getProductHolderRelations } from "../../Order/holderRelations";
 import { getProductSkuOptions } from "../../Order/utils";
 import { isEntitlementPass } from "../../Discount/entitlementPass";
+import { resolveProductHolderConfig } from "../../Holder/utils";
 import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
  *
- * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；不含 resource / duration / holder 等预约字段。
+ * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；Holder 从订单关系回填，不生成预约字段。
  */
 /**
  * 解析 v2 主商品 source 价（不含 option、不含 bundle），供 SkuDetailModal / transform 使用。
@@ -85,7 +88,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$metadata3, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata4, _originExtend$priceOv, _product$metadata5, _ref7, _title2, _ref8, _cover, _price3, _product$order_detail, _product$product_sku;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$metadata3, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata4, _originExtend$priceOv, _product$metadata5, _ref7, _resolveProductHolder, _ref8, _title2, _ref9, _cover, _price3, _product$order_detail, _product$product_sku;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -94,6 +97,23 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
   var uid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
   var originExtend = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 || (_product$metadata2 = _product$metadata2.origin) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._extend;
+  var holderRelations = cloneDeep(getProductHolderRelations(input, product));
+  var formRelations = holderRelations.filter(function (relation) {
+    return relation.holder_type === 'form';
+  });
+  var holderIds = formRelations.map(function (relation) {
+    return relation.holder_id;
+  });
+  var holderNames = formRelations.map(function (relation) {
+    var _relation$metadata;
+    return (_relation$metadata = relation.metadata) === null || _relation$metadata === void 0 ? void 0 : _relation$metadata.name;
+  }).filter(function (name) {
+    return typeof name === 'string' && name.length > 0;
+  });
+  var holder = formRelations.length > 0 ? _objectSpread(_objectSpread({}, formRelations[0].metadata || {}), {}, {
+    form_record: holderIds,
+    name: holderNames.join(',')
+  }) : null;
   var shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && ((originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined || ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.price_override) != null);
   var hasPriceOverride = (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined || shouldPreserveEntitlementPriceOverride;
   var option = getProductSkuOptions(product);
@@ -125,6 +145,9 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    holder_relations: holderRelations,
+    holder: holder,
+    holder_id: holderIds,
     metadata: {
       product_add_schedule_time: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.product_add_schedule_time
     }
@@ -140,11 +163,12 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+    holder_config: (_ref7 = (_resolveProductHolder = resolveProductHolderConfig(sourceProduct)) !== null && _resolveProductHolder !== void 0 ? _resolveProductHolder : resolveProductHolderConfig(product)) !== null && _ref7 !== void 0 ? _ref7 : undefined,
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
-    title: (_ref7 = (_title2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title2 !== void 0 ? _title2 : product.product_title) !== null && _ref7 !== void 0 ? _ref7 : '',
-    cover: (_ref8 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref8 !== void 0 ? _ref8 : '',
+    title: (_ref8 = (_title2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title2 !== void 0 ? _title2 : product.product_title) !== null && _ref8 !== void 0 ? _ref8 : '',
+    cover: (_ref9 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref9 !== void 0 ? _ref9 : '',
     price: (_price3 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price3 !== void 0 ? _price3 : sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price

package/dist/modules/Holder/utils.d.ts

@@ -1,5 +1,7 @@
 import { ProductData } from '../Product/types';
 import { IFormItemData, IHolderConfig } from './types';
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+export declare function resolveProductHolderConfig(product?: ProductData | Record<string, any> | null): Record<string, any> | null;
 export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
 export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
 export declare function normalizeFormId(formId: number | string): number;

package/dist/modules/Holder/utils.js

@@ -1,7 +1,37 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+export function resolveProductHolderConfig(product) {
+  var _source$metadata, _source$origin, _source$metadata2, _source$_origin, _source$_extend, _source$_extend2, _source$_extend3, _source$_extend4, _source$_extend5, _source$_extend6, _source$_extend7, _source$origin2, _source$metadata3, _source$_origin2, _source$_extend8, _source$_extend9, _source$_extend10, _source$_extend11, _legacy$custom, _legacy$custom2;
+  if (!product || _typeof(product) !== 'object') return null;
+  var source = product;
+  var configSources = [source.holder_config, (_source$metadata = source.metadata) === null || _source$metadata === void 0 ? void 0 : _source$metadata.holder_config, (_source$origin = source.origin) === null || _source$origin === void 0 ? void 0 : _source$origin.holder_config, (_source$metadata2 = source.metadata) === null || _source$metadata2 === void 0 || (_source$metadata2 = _source$metadata2.origin) === null || _source$metadata2 === void 0 ? void 0 : _source$metadata2.holder_config, (_source$_origin = source._origin) === null || _source$_origin === void 0 ? void 0 : _source$_origin.holder_config, (_source$_extend = source._extend) === null || _source$_extend === void 0 ? void 0 : _source$_extend.holder_config, (_source$_extend2 = source._extend) === null || _source$_extend2 === void 0 || (_source$_extend2 = _source$_extend2.product) === null || _source$_extend2 === void 0 ? void 0 : _source$_extend2.holder_config, (_source$_extend3 = source._extend) === null || _source$_extend3 === void 0 || (_source$_extend3 = _source$_extend3.product) === null || _source$_extend3 === void 0 || (_source$_extend3 = _source$_extend3.origin) === null || _source$_extend3 === void 0 ? void 0 : _source$_extend3.holder_config, (_source$_extend4 = source._extend) === null || _source$_extend4 === void 0 || (_source$_extend4 = _source$_extend4.product) === null || _source$_extend4 === void 0 || (_source$_extend4 = _source$_extend4.metadata) === null || _source$_extend4 === void 0 ? void 0 : _source$_extend4.holder_config, (_source$_extend5 = source._extend) === null || _source$_extend5 === void 0 || (_source$_extend5 = _source$_extend5.product) === null || _source$_extend5 === void 0 || (_source$_extend5 = _source$_extend5.metadata) === null || _source$_extend5 === void 0 || (_source$_extend5 = _source$_extend5.origin) === null || _source$_extend5 === void 0 ? void 0 : _source$_extend5.holder_config, (_source$_extend6 = source._extend) === null || _source$_extend6 === void 0 || (_source$_extend6 = _source$_extend6.product) === null || _source$_extend6 === void 0 || (_source$_extend6 = _source$_extend6._origin) === null || _source$_extend6 === void 0 ? void 0 : _source$_extend6.holder_config, (_source$_extend7 = source._extend) === null || _source$_extend7 === void 0 || (_source$_extend7 = _source$_extend7.product) === null || _source$_extend7 === void 0 || (_source$_extend7 = _source$_extend7._extend) === null || _source$_extend7 === void 0 ? void 0 : _source$_extend7.holder_config];
+  var config = configSources.find(function (value) {
+    return value !== null && _typeof(value) === 'object';
+  });
+  if (config) return config;
+
+  // metadata.holder / _extend.holder 是选择结果，不能作为商品配置读取。
+  var legacySources = [source.holder, (_source$origin2 = source.origin) === null || _source$origin2 === void 0 ? void 0 : _source$origin2.holder, (_source$metadata3 = source.metadata) === null || _source$metadata3 === void 0 || (_source$metadata3 = _source$metadata3.origin) === null || _source$metadata3 === void 0 ? void 0 : _source$metadata3.holder, (_source$_origin2 = source._origin) === null || _source$_origin2 === void 0 ? void 0 : _source$_origin2.holder, (_source$_extend8 = source._extend) === null || _source$_extend8 === void 0 || (_source$_extend8 = _source$_extend8.product) === null || _source$_extend8 === void 0 ? void 0 : _source$_extend8.holder, (_source$_extend9 = source._extend) === null || _source$_extend9 === void 0 || (_source$_extend9 = _source$_extend9.product) === null || _source$_extend9 === void 0 || (_source$_extend9 = _source$_extend9.origin) === null || _source$_extend9 === void 0 ? void 0 : _source$_extend9.holder, (_source$_extend10 = source._extend) === null || _source$_extend10 === void 0 || (_source$_extend10 = _source$_extend10.product) === null || _source$_extend10 === void 0 || (_source$_extend10 = _source$_extend10.metadata) === null || _source$_extend10 === void 0 || (_source$_extend10 = _source$_extend10.origin) === null || _source$_extend10 === void 0 ? void 0 : _source$_extend10.holder, (_source$_extend11 = source._extend) === null || _source$_extend11 === void 0 || (_source$_extend11 = _source$_extend11.product) === null || _source$_extend11 === void 0 || (_source$_extend11 = _source$_extend11._origin) === null || _source$_extend11 === void 0 ? void 0 : _source$_extend11.holder];
+  var legacy = legacySources.find(function (value) {
+    return value && _typeof(value) === 'object' && !Array.isArray(value) && typeof value.type === 'string';
+  });
+  if (!legacy) return null;
+  var formId = (_legacy$custom = legacy.custom) === null || _legacy$custom === void 0 ? void 0 : _legacy$custom.custom_id;
+  if (legacy.type === 'custom' && ((_legacy$custom2 = legacy.custom) === null || _legacy$custom2 === void 0 ? void 0 : _legacy$custom2.type) === 'form' && (typeof formId === 'number' || typeof formId === 'string') && Number.isInteger(Number(formId)) && Number(formId) > 0) {
+    return {
+      status: 'enable',
+      required: 0,
+      resource_id: formId
+    };
+  }
+  return {
+    status: 'disable',
+    required: 0
+  };
+}
 export function getProductHolderConfig(product) {
-  var _product$holder_confi, _product$origin;
   if (!product) return null;
-  var config = (_product$holder_confi = product === null || product === void 0 ? void 0 : product.holder_config) !== null && _product$holder_confi !== void 0 ? _product$holder_confi : product === null || product === void 0 || (_product$origin = product.origin) === null || _product$origin === void 0 ? void 0 : _product$origin.holder_config;
+  var config = resolveProductHolderConfig(product);
   if (config !== null && config !== void 0 && config.status && (config === null || config === void 0 ? void 0 : config.status) !== 'enable') return null;
   if (!(config !== null && config !== void 0 && config.resource_id)) return null;
   return config;

package/dist/modules/OpenData/contactInfo.d.ts

@@ -0,0 +1,20 @@
+import type { OpenDataConfig } from './types';
+export declare const CONTACT_INFO_FIELDS: readonly ["first_name", "last_name", "phone", "email"];
+export type ContactInfoField = typeof CONTACT_INFO_FIELDS[number];
+export interface ContactInfoConfig {
+    enabled: boolean;
+    fields: Record<ContactInfoField, {
+        visible: boolean;
+        required: boolean;
+    }>;
+}
+export declare function resolveContactInfoConfig(data?: OpenDataConfig | null): ContactInfoConfig;
+export declare function getMissingContactInfoFields(config: ContactInfoConfig, value: unknown): ContactInfoField[];
+export declare function isContactRecord(value: unknown): value is Record<string, any>;
+/** Customer relations wrap the contact in value; sales orders store the object itself. */
+export declare function extractCustomerContactInfo(customer: unknown): Record<string, any> | null;
+export declare class ContactInfoRequiredError extends Error {
+    readonly fields: ContactInfoField[];
+    readonly code = "CONTACT_INFO_REQUIRED";
+    constructor(fields: ContactInfoField[]);
+}