@pisell/pisellos 0.10.67 → 0.10.69

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

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

@@ -11,6 +11,7 @@ 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。
@@ -87,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, _product$metadata6, _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;
@@ -162,12 +163,12 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
-    holder_config: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config) !== undefined ? sourceProduct.holder_config : (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.holder_config,
+    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/Rules/index.js

@@ -38,6 +38,7 @@ import { BaseModule } from "../BaseModule";
 import { UnavailableReason } from "./types";
 import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime, getDiscountTimeUnavailableReason } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
+import { resolveProductHolderConfig } from "../Holder/utils";
 import Decimal from 'decimal.js';
 import { cloneDeep, isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
@@ -142,12 +143,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkHolderMatch",
     value: function checkHolderMatch(discount, product, holderSource, holders) {
-      var _discount$holder, _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _holderSource$holder_, _holderSource$metadat, _holderSource$origin, _holderSource$metadat2, _holderSource$_origin, _holderSource$_extend, _holderSource$_extend2, _holderSource$_extend3;
+      var _discount$holder;
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
 
       // getProduct 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
-      var holderConfig = (_ref = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_ref6 = (_holderSource$holder_ = holderSource === null || holderSource === void 0 ? void 0 : holderSource.holder_config) !== null && _holderSource$holder_ !== void 0 ? _holderSource$holder_ : holderSource === null || holderSource === void 0 || (_holderSource$metadat = holderSource.metadata) === null || _holderSource$metadat === void 0 ? void 0 : _holderSource$metadat.holder_config) !== null && _ref6 !== void 0 ? _ref6 : holderSource === null || holderSource === void 0 || (_holderSource$origin = holderSource.origin) === null || _holderSource$origin === void 0 ? void 0 : _holderSource$origin.holder_config) !== null && _ref5 !== void 0 ? _ref5 : holderSource === null || holderSource === void 0 || (_holderSource$metadat2 = holderSource.metadata) === null || _holderSource$metadat2 === void 0 || (_holderSource$metadat2 = _holderSource$metadat2.origin) === null || _holderSource$metadat2 === void 0 ? void 0 : _holderSource$metadat2.holder_config) !== null && _ref4 !== void 0 ? _ref4 : holderSource === null || holderSource === void 0 || (_holderSource$_origin = holderSource._origin) === null || _holderSource$_origin === void 0 ? void 0 : _holderSource$_origin.holder_config) !== null && _ref3 !== void 0 ? _ref3 : holderSource === null || holderSource === void 0 || (_holderSource$_extend = holderSource._extend) === null || _holderSource$_extend === void 0 ? void 0 : _holderSource$_extend.holder_config) !== null && _ref2 !== void 0 ? _ref2 : holderSource === null || holderSource === void 0 || (_holderSource$_extend2 = holderSource._extend) === null || _holderSource$_extend2 === void 0 || (_holderSource$_extend2 = _holderSource$_extend2.product) === null || _holderSource$_extend2 === void 0 ? void 0 : _holderSource$_extend2.holder_config) !== null && _ref !== void 0 ? _ref : holderSource === null || holderSource === void 0 || (_holderSource$_extend3 = holderSource._extend) === null || _holderSource$_extend3 === void 0 || (_holderSource$_extend3 = _holderSource$_extend3.product) === null || _holderSource$_extend3 === void 0 || (_holderSource$_extend3 = _holderSource$_extend3.metadata) === null || _holderSource$_extend3 === void 0 ? void 0 : _holderSource$_extend3.holder_config;
+      var holderConfig = resolveProductHolderConfig(holderSource);
       var holderStatus = holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.status;
       var holderEnabled = holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
       if (!holderEnabled || (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id) === undefined || (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id) === null || (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id) === '') {
@@ -167,14 +168,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     // 判断discountList 是否可以对当前productList生效
   }, {
     key: "isDiscountListAvailable",
-    value: function isDiscountListAvailable(_ref7) {
+    value: function isDiscountListAvailable(_ref) {
       var _this2 = this;
-      var oldDiscountList = _ref7.oldDiscountList,
-        newDiscountList = _ref7.newDiscountList,
-        productList = _ref7.productList,
-        orderTotalAmount = _ref7.orderTotalAmount,
-        holders = _ref7.holders,
-        isFormSubject = _ref7.isFormSubject;
+      var oldDiscountList = _ref.oldDiscountList,
+        newDiscountList = _ref.newDiscountList,
+        productList = _ref.productList,
+        orderTotalAmount = _ref.orderTotalAmount,
+        holders = _ref.holders,
+        isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
         return {
@@ -373,14 +374,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "calcDiscount",
-    value: function calcDiscount(_ref8, options) {
+    value: function calcDiscount(_ref2, options) {
       var _options$selectedList,
         _this4 = this;
-      var discountList = _ref8.discountList,
-        productList = _ref8.productList,
-        holders = _ref8.holders,
-        isFormSubject = _ref8.isFormSubject,
-        orderTotalAmount = _ref8.orderTotalAmount;
+      var discountList = _ref2.discountList,
+        productList = _ref2.productList,
+        holders = _ref2.holders,
+        isFormSubject = _ref2.isFormSubject,
+        orderTotalAmount = _ref2.orderTotalAmount;
       var preferredEntitlementPassIds = new Set(((options === null || options === void 0 ? void 0 : options.preferredEntitlementPassIds) || []).map(String));
       var resolveIsFormSubject = function resolveIsFormSubject(product) {
         return typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
@@ -494,7 +495,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 2. 展开 bundle 子商品
           if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
             product.bundle.forEach(function (bundleItem, bundleIndex) {
-              var _ref9, _bundleItem$bundle_pr;
+              var _ref3, _bundleItem$bundle_pr;
               flattened.push({
                 type: 'bundle',
                 originProduct: originProduct,
@@ -506,7 +507,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
                 // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
                 // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
-                id: (_ref9 = (_bundleItem$bundle_pr = bundleItem.bundle_product_id) !== null && _bundleItem$bundle_pr !== void 0 ? _bundleItem$bundle_pr : bundleItem._bundle_product_id) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.product_id,
+                id: (_ref3 = (_bundleItem$bundle_pr = bundleItem.bundle_product_id) !== null && _bundleItem$bundle_pr !== void 0 ? _bundleItem$bundle_pr : bundleItem._bundle_product_id) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_id,
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
                 num: bundleItem.num || 1,
@@ -666,10 +667,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var _ref10, _a$original_price, _ref11, _b$original_price;
+        var _ref4, _a$original_price, _ref5, _b$original_price;
         // 子商品优先使用 original_price，主商品使用 price
-        var priceA = new Decimal(a.type === 'bundle' ? (_ref10 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref10 !== void 0 ? _ref10 : '0' : a.price || '0');
-        var priceB = new Decimal(b.type === 'bundle' ? (_ref11 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref11 !== void 0 ? _ref11 : '0' : b.price || '0');
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref4 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref5 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref5 !== void 0 ? _ref5 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -803,13 +804,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var buildFullCoveragePassUsageGroups = function buildFullCoveragePassUsageGroups(discounts, requestedCount) {
         var _firstGoodPass$config;
         var groups = [];
-        var pendingUsedDiscounts = new Set(Array.from(usedDiscounts.entries()).filter(function (_ref12) {
-          var _ref13 = _slicedToArray(_ref12, 2),
-            used = _ref13[1];
+        var pendingUsedDiscounts = new Set(Array.from(usedDiscounts.entries()).filter(function (_ref6) {
+          var _ref7 = _slicedToArray(_ref6, 2),
+            used = _ref7[1];
           return used;
-        }).map(function (_ref14) {
-          var _ref15 = _slicedToArray(_ref14, 1),
-            discountId = _ref15[0];
+        }).map(function (_ref8) {
+          var _ref9 = _slicedToArray(_ref8, 1),
+            discountId = _ref9[0];
           return discountId;
         }));
         var pendingEntitlementCounts = new Map(entitlementUsageCounts);
@@ -884,7 +885,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           _step6;
         try {
           for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            var _detail$discount$reso, _detail$discount, _detail$discount$prod, _detail$discount2, _detail$metadata$cust, _detail$metadata, _detail$discount3, _ref16, _detail$metadata$num, _detail$metadata2, _ref17, _existed$metadata$num, _existed$metadata;
+            var _detail$discount$reso, _detail$discount, _detail$discount$prod, _detail$discount2, _detail$metadata$cust, _detail$metadata, _detail$discount3, _ref10, _detail$metadata$num, _detail$metadata2, _ref11, _existed$metadata$num, _existed$metadata;
             var detail = _step6.value;
             if (!isEntitlementPass(detail)) {
               mergedDetails.push(detail);
@@ -896,7 +897,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               continue;
             }
             var key = [resourceId, (_detail$discount$prod = detail === null || detail === void 0 || (_detail$discount2 = detail.discount) === null || _detail$discount2 === void 0 ? void 0 : _detail$discount2.product_id) !== null && _detail$discount$prod !== void 0 ? _detail$discount$prod : '', (_detail$metadata$cust = detail === null || detail === void 0 || (_detail$metadata = detail.metadata) === null || _detail$metadata === void 0 ? void 0 : _detail$metadata.custom_product_bundle_map_id) !== null && _detail$metadata$cust !== void 0 ? _detail$metadata$cust : '', toComparableNumber(detail === null || detail === void 0 ? void 0 : detail.amount), toComparableNumber(detail === null || detail === void 0 || (_detail$discount3 = detail.discount) === null || _detail$discount3 === void 0 ? void 0 : _detail$discount3.fixed_amount)].join('|');
-            var rawUsageCount = Number((_ref16 = (_detail$metadata$num = detail === null || detail === void 0 || (_detail$metadata2 = detail.metadata) === null || _detail$metadata2 === void 0 ? void 0 : _detail$metadata2.num) !== null && _detail$metadata$num !== void 0 ? _detail$metadata$num : detail === null || detail === void 0 ? void 0 : detail._num) !== null && _ref16 !== void 0 ? _ref16 : 1);
+            var rawUsageCount = Number((_ref10 = (_detail$metadata$num = detail === null || detail === void 0 || (_detail$metadata2 = detail.metadata) === null || _detail$metadata2 === void 0 ? void 0 : _detail$metadata2.num) !== null && _detail$metadata$num !== void 0 ? _detail$metadata$num : detail === null || detail === void 0 ? void 0 : detail._num) !== null && _ref10 !== void 0 ? _ref10 : 1);
             var usageCount = Number.isFinite(rawUsageCount) && rawUsageCount > 0 ? rawUsageCount : 1;
             var mergedIndex = mergedIndexByKey.get(key);
             if (mergedIndex === undefined) {
@@ -910,7 +911,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               continue;
             }
             var existed = mergedDetails[mergedIndex];
-            var existedUsageCount = Number((_ref17 = (_existed$metadata$num = existed === null || existed === void 0 || (_existed$metadata = existed.metadata) === null || _existed$metadata === void 0 ? void 0 : _existed$metadata.num) !== null && _existed$metadata$num !== void 0 ? _existed$metadata$num : existed === null || existed === void 0 ? void 0 : existed._num) !== null && _ref17 !== void 0 ? _ref17 : 1);
+            var existedUsageCount = Number((_ref11 = (_existed$metadata$num = existed === null || existed === void 0 || (_existed$metadata = existed.metadata) === null || _existed$metadata === void 0 ? void 0 : _existed$metadata.num) !== null && _existed$metadata$num !== void 0 ? _existed$metadata$num : existed === null || existed === void 0 ? void 0 : existed._num) !== null && _ref11 !== void 0 ? _ref11 : 1);
             var totalUsageCount = existedUsageCount + usageCount;
             mergedDetails[mergedIndex] = _objectSpread(_objectSpread({}, existed), {}, {
               metadata: _objectSpread(_objectSpread({}, (existed === null || existed === void 0 ? void 0 : existed.metadata) || {}), {}, {
@@ -1078,7 +1079,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref18, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref12, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -1106,7 +1107,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
-          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref18 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref18 !== void 0 ? _ref18 : 0);
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref12 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
 
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
@@ -1244,13 +1245,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
         var optionDiscountAmount = 0;
         var discountedOptions = options.map(function (option) {
-          var _ref19, _ref20, _option$_original_pri, _ref21, _option$num, _rest$price, _option$_original_pri2;
+          var _ref13, _ref14, _option$_original_pri, _ref15, _option$num, _rest$price, _option$_original_pri2;
           // 折前单价：优先 price，缺失再 add_price；已写回折后价时用 _original_price（或旧字段 _original_add_price）
-          var rawUnit = (_ref19 = (_ref20 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref20 !== void 0 ? _ref20 : option.price) !== null && _ref19 !== void 0 ? _ref19 : option.add_price;
+          var rawUnit = (_ref13 = (_ref14 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref14 !== void 0 ? _ref14 : option.price) !== null && _ref13 !== void 0 ? _ref13 : option.add_price;
           var baseUnitNum = Number(rawUnit !== null && rawUnit !== void 0 ? rawUnit : 0);
           if (baseUnitNum <= 0) return option;
           var discountedPrice = getDiscountAmount(discount, baseUnitNum, baseUnitNum);
-          var optQty = Number((_ref21 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref21 !== void 0 ? _ref21 : 1);
+          var optQty = Number((_ref15 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref15 !== void 0 ? _ref15 : 1);
           optionDiscountAmount = new Decimal(optionDiscountAmount).plus(new Decimal(baseUnitNum).minus(discountedPrice).mul(optQty)).toNumber();
           var _original_add_price = option._original_add_price,
             rest = _objectWithoutProperties(option, _excluded);
@@ -1284,9 +1285,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var getOptionTotal = function getOptionTotal(options) {
         if (!(options !== null && options !== void 0 && options.length)) return 0;
         return options.reduce(function (sum, opt) {
-          var _ref22, _opt$price, _ref23, _opt$num;
-          var unit = Number((_ref22 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref22 !== void 0 ? _ref22 : 0);
-          var n = Number((_ref23 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref23 !== void 0 ? _ref23 : 1);
+          var _ref16, _opt$price, _ref17, _opt$num;
+          var unit = Number((_ref16 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref16 !== void 0 ? _ref16 : 0);
+          var n = Number((_ref17 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref17 !== void 0 ? _ref17 : 1);
           return new Decimal(sum).plus(new Decimal(unit).mul(n)).toNumber();
         }, 0);
       };
@@ -1439,8 +1440,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var appliedWalletDiscountIds = new Set((product.discount_list || []).filter(function (item) {
           return ['entitlement_pass', 'discount_card', 'product_discount_card'].includes((item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 ? void 0 : item.type));
         }).map(function (item) {
-          var _ref24, _item$discount$resour, _item$discount;
-          return (_ref24 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref24 !== void 0 ? _ref24 : item === null || item === void 0 ? void 0 : item.id;
+          var _ref18, _item$discount$resour, _item$discount;
+          return (_ref18 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref18 !== void 0 ? _ref18 : item === null || item === void 0 ? void 0 : item.id;
         }).filter(function (id) {
           return id !== undefined && id !== null;
         }).map(String));
@@ -1480,8 +1481,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref25;
-            return !((_ref25 = item.discount_list || []) !== null && _ref25 !== void 0 && _ref25.length);
+            var _ref19;
+            return !((_ref19 = item.discount_list || []) !== null && _ref19 !== void 0 && _ref19.length);
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
@@ -1497,8 +1498,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref26;
-              return !((_ref26 = item.discount_list || []) !== null && _ref26 !== void 0 && _ref26.length);
+              var _ref20;
+              return !((_ref20 = item.discount_list || []) !== null && _ref20 !== void 0 && _ref20.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1591,8 +1592,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref27, _product$_promotion$f, _product13, _product$origin_total;
-              var total = product.inPromotion ? (_ref27 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref27 !== void 0 ? _ref27 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref21, _product$_promotion$f, _product13, _product$origin_total;
+              var total = product.inPromotion ? (_ref21 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref21 !== void 0 ? _ref21 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -2295,7 +2296,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref29, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref23, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this4.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -2310,9 +2311,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref28, _item$bundle_selling_;
+                        var _item$price, _ref22, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref28 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref28 !== void 0 ? _ref28 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref22 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref22 !== void 0 ? _ref22 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata11;
@@ -2339,7 +2340,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref29 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref29 !== void 0 ? _ref29 : 0;
+                var mainSellingPrice = (_ref23 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref23 !== void 0 ? _ref23 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2555,15 +2556,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref30 = packageScope || {},
-        _ref30$type = _ref30.type,
-        scopeType = _ref30$type === void 0 ? 'product_all' : _ref30$type,
-        _ref30$exclude_bundle = _ref30.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref30$exclude_bundle === void 0 ? [] : _ref30$exclude_bundle,
-        _ref30$include_bundle = _ref30.include_bundle_product_ids,
-        include_bundle_product_ids = _ref30$include_bundle === void 0 ? [] : _ref30$include_bundle,
-        _ref30$filter = _ref30.filter,
-        filter = _ref30$filter === void 0 ? 0 : _ref30$filter;
+      var _ref24 = packageScope || {},
+        _ref24$type = _ref24.type,
+        scopeType = _ref24$type === void 0 ? 'product_all' : _ref24$type,
+        _ref24$exclude_bundle = _ref24.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref24$exclude_bundle === void 0 ? [] : _ref24$exclude_bundle,
+        _ref24$include_bundle = _ref24.include_bundle_product_ids,
+        include_bundle_product_ids = _ref24$include_bundle === void 0 ? [] : _ref24$include_bundle,
+        _ref24$filter = _ref24.filter,
+        filter = _ref24$filter === void 0 ? 0 : _ref24$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
       var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;

package/dist/server/modules/products/index.js

@@ -29,6 +29,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import { BaseModule } from "../../../modules/BaseModule";
+import { resolveProductHolderConfig } from "../../../modules/Holder/utils";
 import { QuotationModule as ClientQuotationModule } from "../../../modules/Quotation";
 import { ProductsHooks } from "./types";
 import { applyDetailValueToProducts, applyPriceDataToProducts, applyI18nToProducts, perfMark } from "../../utils/product";
@@ -1444,7 +1445,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "getProductSnapshotsByIds",
     value: (function () {
       var _getProductSnapshotsByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(ids) {
-        var snapshots, seen, _iterator6, _step6, id, product;
+        var snapshots, seen, _iterator6, _step6, _resolveProductHolder, id, product;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1475,7 +1476,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
             case 13:
               snapshots[String(id)] = {
                 cover: product.cover,
-                holder_config: product.holder_config
+                holder_config: (_resolveProductHolder = resolveProductHolderConfig(product)) !== null && _resolveProductHolder !== void 0 ? _resolveProductHolder : undefined
               };
             case 14:
               _context13.next = 5;

package/dist/solution/BaseSales/index.js

@@ -2954,31 +2954,37 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _validateContactInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
         var _order$_extend, _current$_extend;
-        var order, identity, customerId, config, current, missing;
+        var order, customerId, identity, config, current, missing;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               order = this.getTempOrder();
+              customerId = order === null || order === void 0 ? void 0 : order.customer_id; // Missing customer IDs and the reserved Walk-In IDs do not require contact info.
+              if (!(!Number.isFinite(Number(customerId)) || Number(customerId) <= 1)) {
+                _context26.next = 4;
+                break;
+              }
+              return _context26.abrupt("return");
+            case 4:
               identity = (order === null || order === void 0 || (_order$_extend = order._extend) === null || _order$_extend === void 0 ? void 0 : _order$_extend.localId) || (order === null || order === void 0 ? void 0 : order.external_sale_number) || (order === null || order === void 0 ? void 0 : order.order_id) || order;
-              customerId = order === null || order === void 0 ? void 0 : order.customer_id;
-              _context26.next = 5;
+              _context26.next = 7;
               return this.getContactInfoConfig();
-            case 5:
+            case 7:
               config = _context26.sent;
               current = this.getTempOrder();
               if (!(identity !== ((current === null || current === void 0 || (_current$_extend = current._extend) === null || _current$_extend === void 0 ? void 0 : _current$_extend.localId) || (current === null || current === void 0 ? void 0 : current.external_sale_number) || (current === null || current === void 0 ? void 0 : current.order_id) || current) || customerId !== (current === null || current === void 0 ? void 0 : current.customer_id))) {
-                _context26.next = 9;
+                _context26.next = 11;
                 break;
               }
               throw new Error('The order changed. Please try again.');
-            case 9:
+            case 11:
               missing = getMissingContactInfoFields(config, current === null || current === void 0 ? void 0 : current.contacts_info);
               if (!missing.length) {
-                _context26.next = 12;
+                _context26.next = 14;
                 break;
               }
               throw new ContactInfoRequiredError(missing);
-            case 12:
+            case 14:
             case "end":
               return _context26.stop();
           }

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

@@ -12,6 +12,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 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 { resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "../../../modules/Order/utils/weighedProduct";
+import { resolveProductHolderConfig } from "../../../modules/Holder/utils";
 import { isBookingProduct } from "../../../modules/BookingContext/utils/serviceTimes";
 import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
@@ -169,7 +170,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _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, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _find, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
+  var _ref12, _ref13, _ref14, _payload$product_id, _ref15, _ref16, _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, _ref17, _findVariantById, _origin$production_co, _ref18, _ref19, _ref20, _ref21, _ref22, _matchedVariant$price, _payload$product_sku, _payload$_extend$weig, _payload$_extend2, _origin$_extend, _ref23, _ref24, _payload$price, _ref25, _payload$line_total, _payload$_extend3, _ref26, _ref27, _payload$product_sku$, _payload$product_sku2, _payload$bundle, _payload$quantity, _payload$_extend4, _extend, _extend2, _ref28, _ref29, _origin$base_price, _ref30, _ref31, _payload$line_total2, _payload$_extend5, _payload$_extend6, _extend3, _payload$_extend7, _payload$_extend8, _find, _resolveProductHolder, _ref32, _ref33, _payload$tax_fee, _ref34, _ref35, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -260,7 +261,7 @@ export function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
-    holder_config: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config
+    holder_config: (_resolveProductHolder = resolveProductHolderConfig(sourceProduct)) !== null && _resolveProductHolder !== void 0 ? _resolveProductHolder : undefined
   }, dataVariantIds !== undefined ? {
     data_variant_ids: dataVariantIds
   } : {}), selectedSettlementSnapshot ? {

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 | 6 | 5 | 1 | 2 | 3 | 4;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -360,7 +360,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -479,19 +479,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

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

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

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

@@ -8,6 +8,7 @@ var _lodashEs = require("lodash-es");
 var _holderRelations = require("../../Order/holderRelations");
 var _utils = require("../../Order/utils");
 var _entitlementPass = require("../../Discount/entitlementPass");
+var _utils2 = require("../../Holder/utils");
 var _orderLineDisplay = require("./orderLineDisplay");
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
@@ -148,7 +149,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   }
   return {
     ...(sourceProduct || {}),
-    holder_config: sourceProduct?.holder_config !== undefined ? sourceProduct.holder_config : product.metadata?.holder_config,
+    holder_config: (0, _utils2.resolveProductHolderConfig)(sourceProduct) ?? (0, _utils2.resolveProductHolderConfig)(product) ?? undefined,
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,

package/lib/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/lib/modules/Holder/utils.js

@@ -8,9 +8,35 @@ exports.getFormIdFromHolderConfig = getFormIdFromHolderConfig;
 exports.getProductHolderConfig = getProductHolderConfig;
 exports.normalizeFormId = normalizeFormId;
 exports.resolveFormMetaFromHolderItem = resolveFormMetaFromHolderItem;
+exports.resolveProductHolderConfig = resolveProductHolderConfig;
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+function resolveProductHolderConfig(product) {
+  if (!product || typeof product !== 'object') return null;
+  const source = product;
+  const configSources = [source.holder_config, source.metadata?.holder_config, source.origin?.holder_config, source.metadata?.origin?.holder_config, source._origin?.holder_config, source._extend?.holder_config, source._extend?.product?.holder_config, source._extend?.product?.origin?.holder_config, source._extend?.product?.metadata?.holder_config, source._extend?.product?.metadata?.origin?.holder_config, source._extend?.product?._origin?.holder_config, source._extend?.product?._extend?.holder_config];
+  const config = configSources.find(value => value !== null && typeof value === 'object');
+  if (config) return config;
+
+  // metadata.holder / _extend.holder 是选择结果，不能作为商品配置读取。
+  const legacySources = [source.holder, source.origin?.holder, source.metadata?.origin?.holder, source._origin?.holder, source._extend?.product?.holder, source._extend?.product?.origin?.holder, source._extend?.product?.metadata?.origin?.holder, source._extend?.product?._origin?.holder];
+  const legacy = legacySources.find(value => value && typeof value === 'object' && !Array.isArray(value) && typeof value.type === 'string');
+  if (!legacy) return null;
+  const formId = legacy.custom?.custom_id;
+  if (legacy.type === 'custom' && legacy.custom?.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
+  };
+}
 function getProductHolderConfig(product) {
   if (!product) return null;
-  const config = product?.holder_config ?? product?.origin?.holder_config;
+  const config = resolveProductHolderConfig(product);
   if (config?.status && config?.status !== 'enable') return null;
   if (!config?.resource_id) return null;
   return config;

package/lib/modules/Rules/index.js

@@ -8,6 +8,7 @@ var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _utils = require("../../solution/ShopDiscount/utils");
 var _utils2 = require("../Cart/utils");
+var _utils3 = require("../Holder/utils");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -63,7 +64,7 @@ class RulesModule extends _BaseModule.BaseModule {
     if (discount.holder?.holder_type !== 'form') return true;
 
     // getProduct 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
-    const holderConfig = holderSource?.holder_config ?? holderSource?.metadata?.holder_config ?? holderSource?.origin?.holder_config ?? holderSource?.metadata?.origin?.holder_config ?? holderSource?._origin?.holder_config ?? holderSource?._extend?.holder_config ?? holderSource?._extend?.product?.holder_config ?? holderSource?._extend?.product?.metadata?.holder_config;
+    const holderConfig = (0, _utils3.resolveProductHolderConfig)(holderSource);
     const holderStatus = holderConfig?.status;
     const holderEnabled = holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
     if (!holderEnabled || holderConfig?.resource_id === undefined || holderConfig?.resource_id === null || holderConfig?.resource_id === '') {

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProductsModule = void 0;
 var _BaseModule = require("../../../modules/BaseModule");
+var _utils = require("../../../modules/Holder/utils");
 var _Quotation = require("../../../modules/Quotation");
 var _types = require("./types");
 var _product = require("../../utils/product");
@@ -983,7 +984,7 @@ class ProductsModule extends _BaseModule.BaseModule {
       if (!product) continue;
       snapshots[String(id)] = {
         cover: product.cover,
-        holder_config: product.holder_config
+        holder_config: (0, _utils.resolveProductHolderConfig)(product) ?? undefined
       };
     }
     return snapshots;

package/lib/solution/BaseSales/index.js

@@ -1918,8 +1918,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
   async validateContactInfo() {
     const order = this.getTempOrder();
-    const identity = order?._extend?.localId || order?.external_sale_number || order?.order_id || order;
     const customerId = order?.customer_id;
+    // Missing customer IDs and the reserved Walk-In IDs do not require contact info.
+    if (!Number.isFinite(Number(customerId)) || Number(customerId) <= 1) return;
+    const identity = order?._extend?.localId || order?.external_sale_number || order?.order_id || order;
     const config = await this.getContactInfoConfig();
     const current = this.getTempOrder();
     if (identity !== (current?._extend?.localId || current?.external_sale_number || current?.order_id || current) || customerId !== current?.customer_id) {

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

@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
 var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
+var _utils = require("../../../modules/Holder/utils");
 var _serviceTimes = require("../../../modules/BookingContext/utils/serviceTimes");
-var _utils = require("../../../modules/Order/utils");
+var _utils2 = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
@@ -109,7 +110,7 @@ function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundl
       discount_list: preferPriceField ? [] : bundleItem.discount_list
     };
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
-    normalizedItem.bundle_selling_price = (0, _utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    normalizedItem.bundle_selling_price = (0, _utils2.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
     if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
       normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
       normalizedItem.price = normalizedItem.bundle_selling_price;
@@ -159,14 +160,14 @@ function transformBaseProductToOrderProduct(params) {
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productOptionItem = (0, _utils2.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
   const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
-    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils2.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils2.sumOptionUnitPrice)(productOptionItem).toNumber(),
     bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
     useOriginalBundle: true
   })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
@@ -198,9 +199,9 @@ function transformBaseProductToOrderProduct(params) {
   })) : payload.discount_list || [];
 
   // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
-  const optionSum = (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const optionSum = (0, _utils2.sumOptionUnitPrice)(productOptionItem).toNumber();
   const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
-  const bundleOnlyComposite = (0, _utils.composeLinePrice)({
+  const bundleOnlyComposite = (0, _utils2.composeLinePrice)({
     mainPrice: 0,
     bundle: productBundle
   });
@@ -221,7 +222,7 @@ function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
-    holder_config: sourceProduct?.holder_config,
+    holder_config: (0, _utils.resolveProductHolderConfig)(sourceProduct) ?? undefined,
     ...(dataVariantIds !== undefined ? {
       data_variant_ids: dataVariantIds
     } : {}),

package/lib/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 | 6 | 5 | 1 | 2 | 3 | 4;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -360,7 +360,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -479,19 +479,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.67",
+  "version": "0.10.69",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",