@pisell/pisellos 2.1.125 → 2.1.127

package/dist/solution/ScanOrder/utils.js

@@ -170,28 +170,22 @@ export function buildQuantityLimitIndex(limits) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var limit = _step2.value;
-      var _iterator3 = _createForOfIteratorHelper(limit.targets || []),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var target = _step3.value;
-          var productId = Number(target.product_id);
-          if (!Number.isFinite(productId) || productId <= 0) continue;
-          var variantId = Number(target.product_variant_id);
-          var hasVariant = Number.isFinite(variantId) && variantId > 0;
-          if (hasVariant) {
-            var exactKey = buildProductKey(productId, variantId);
-            var _existed = exactLimitMap.get(exactKey) || [];
-            exactLimitMap.set(exactKey, [].concat(_toConsumableArray(_existed), [limit]));
-            continue;
-          }
-          var existed = productLimitMap.get(productId) || [];
-          productLimitMap.set(productId, [].concat(_toConsumableArray(existed), [limit]));
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
+      var targets = limit.targets || [];
+      // 多目标规则（OR 组）只做购物车聚合校验，不下发到单品维度，
+      // 避免 UI 把「组内至少 1 份」误当作每款商品各自的 min，锁死减号按钮。
+      if (targets.length !== 1) continue;
+      var target = targets[0];
+      var productId = Number(target.product_id);
+      if (!Number.isFinite(productId) || productId <= 0) continue;
+      var variantId = Number(target.product_variant_id);
+      var hasVariant = Number.isFinite(variantId) && variantId > 0;
+      if (hasVariant) {
+        var exactKey = buildProductKey(productId, variantId);
+        var existed = exactLimitMap.get(exactKey) || [];
+        exactLimitMap.set(exactKey, [].concat(_toConsumableArray(existed), [limit]));
+      } else {
+        var _existed = productLimitMap.get(productId) || [];
+        productLimitMap.set(productId, [].concat(_toConsumableArray(_existed), [limit]));
       }
     }
   } catch (err) {
@@ -216,38 +210,84 @@ export function aggregateItemRuleLimit(matchedLimits) {
   if (!matchedLimits.length) return null;
   var min;
   var max;
+  var remainingMax;
   var exact;
   var mustInclude = false;
-  var _iterator4 = _createForOfIteratorHelper(matchedLimits),
-    _step4;
+
+  // 聚合 validationMessage 按 min / max 两个方向分别输出：
+  //   - maxValidationMessage：触发"当前 max / remainingMax / exact"的那条规则的文案
+  //   - minValidationMessage：触发"当前 min / exact"的那条规则的文案
+  // 各自再回退到其他带文案的规则（最后回退到第一条非空 validationMessage）。
+  // 前端可根据"加号/减号被拦"的方向取对应文案。
+  var maxSourceLimit;
+  var remainingMaxSourceLimit;
+  var exactSourceLimit;
+  var minSourceLimit;
+  var firstMessagedLimit;
+  var _iterator3 = _createForOfIteratorHelper(matchedLimits),
+    _step3;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var limit = _step4.value;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var limit = _step3.value;
       if (typeof limit.requiredMin === 'number' && Number.isFinite(limit.requiredMin)) {
-        min = min === undefined ? limit.requiredMin : Math.max(min, limit.requiredMin);
+        if (min === undefined || limit.requiredMin > min) {
+          min = limit.requiredMin;
+          minSourceLimit = limit;
+        }
       }
       if (typeof limit.requiredMax === 'number' && Number.isFinite(limit.requiredMax)) {
-        max = max === undefined ? limit.requiredMax : Math.min(max, limit.requiredMax);
+        if (max === undefined || limit.requiredMax < max) {
+          max = limit.requiredMax;
+          maxSourceLimit = limit;
+        }
+      }
+      if (typeof limit.remainingMax === 'number' && Number.isFinite(limit.remainingMax)) {
+        if (remainingMax === undefined || limit.remainingMax < remainingMax) {
+          remainingMax = limit.remainingMax;
+          remainingMaxSourceLimit = limit;
+        }
       }
       if (typeof limit.requiredExact === 'number' && Number.isFinite(limit.requiredExact)) {
         exact = limit.requiredExact;
+        exactSourceLimit = limit;
       }
       mustInclude = mustInclude || Boolean(limit.mustInclude);
+      if (!firstMessagedLimit && limit.validationMessage) {
+        firstMessagedLimit = limit;
+      }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator4.f();
+    _iterator3.f();
   }
   if (typeof exact === 'number' && Number.isFinite(exact)) {
     min = exact;
     max = exact;
   }
+  var maxMessageSource = maxSourceLimit || remainingMaxSourceLimit || exactSourceLimit || firstMessagedLimit;
+  var minMessageSource = minSourceLimit || exactSourceLimit || firstMessagedLimit;
+  var maxValidationMessage = maxMessageSource === null || maxMessageSource === void 0 ? void 0 : maxMessageSource.validationMessage;
+  var rawMaxValidationMessage = maxMessageSource === null || maxMessageSource === void 0 ? void 0 : maxMessageSource.rawValidationMessage;
+  var minValidationMessage = minMessageSource === null || minMessageSource === void 0 ? void 0 : minMessageSource.validationMessage;
+  var rawMinValidationMessage = minMessageSource === null || minMessageSource === void 0 ? void 0 : minMessageSource.rawValidationMessage;
+
+  // validationMessage / rawValidationMessage 保留为"最严格限制"的聚合文案，
+  // 便于旧消费者（只关心 max 侧）不破坏。优先 max → min。
+  var validationMessage = maxValidationMessage !== null && maxValidationMessage !== void 0 ? maxValidationMessage : minValidationMessage;
+  var rawValidationMessage = rawMaxValidationMessage !== null && rawMaxValidationMessage !== void 0 ? rawMaxValidationMessage : rawMinValidationMessage;
   return {
     min: min,
     max: max,
+    remainingMax: remainingMax,
     exact: exact,
-    mustInclude: mustInclude
+    mustInclude: mustInclude,
+    validationMessage: validationMessage,
+    rawValidationMessage: rawValidationMessage,
+    maxValidationMessage: maxValidationMessage,
+    rawMaxValidationMessage: rawMaxValidationMessage,
+    minValidationMessage: minValidationMessage,
+    rawMinValidationMessage: rawMinValidationMessage
   };
 }
 export function buildItemRuleBusinessData(params) {
@@ -295,11 +335,11 @@ export function buildItemRuleBusinessData(params) {
 export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   if (!Array.isArray(productList)) return productList;
   var limitIndex = buildQuantityLimitIndex(limits || []);
-  var _iterator5 = _createForOfIteratorHelper(productList),
-    _step5;
+  var _iterator4 = _createForOfIteratorHelper(productList),
+    _step4;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var item = _step5.value;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var item = _step4.value;
       if (!item || _typeof(item) !== 'object') continue;
       var productItem = item;
       var productId = getTopLevelProductId(productItem);
@@ -318,9 +358,9 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
       }
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator5.f();
+    _iterator4.f();
   }
   return productList;
 }
@@ -358,8 +398,14 @@ export function normalizeOrderProduct(product) {
   if (product.identity_key && !metadata.unique_identification_number) {
     metadata.unique_identification_number = product.identity_key;
   }
-  var resolvedOriginalPrice = product.original_price || '0.00';
+
+  // selling_price：券后成交单价；original_price：券前店铺售价。
+  // 初次加购时两者相等（入口层应保证 caller 传的 original_price == selling_price）；
+  // 券应用后由 Rules 引擎只改动 selling_price，保留 original_price 以便还原 / 展示划线对比。
+  // 注意：这里 caller 若显式传入了 original_price（例如 Rules 回写或单测场景），要尊重该值，
+  //       让券后状态能正确通过再次 normalize。
   var resolvedSellingPrice = product.selling_price || '0.00';
+  var resolvedOriginalPrice = product.original_price || resolvedSellingPrice;
   if (metadata.main_product_original_price === undefined) {
     metadata.main_product_original_price = resolvedOriginalPrice;
   }
@@ -367,14 +413,14 @@ export function normalizeOrderProduct(product) {
     metadata.main_product_selling_price = resolvedSellingPrice;
   }
   if (metadata.source_product_price === undefined) {
-    var _product$_origin$orig, _product$_origin;
-    metadata.source_product_price = (_product$_origin$orig = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.original_price) !== null && _product$_origin$orig !== void 0 ? _product$_origin$orig : resolvedOriginalPrice;
+    var _ref, _product$_origin$pric, _product$_origin, _product$_origin2;
+    metadata.source_product_price = (_ref = (_product$_origin$pric = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price) !== null && _product$_origin$pric !== void 0 ? _product$_origin$pric : (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price) !== null && _ref !== void 0 ? _ref : resolvedSellingPrice;
   }
   var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref, _item$bundle_selling_, _ref2, _ref3, _item$custom_price;
+    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$custom_price;
     return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_selling_price: (_ref = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref !== void 0 ? _ref : '0.00',
-      custom_price: (_ref2 = (_ref3 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00'
+      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
+      custom_price: (_ref3 = (_ref4 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00'
     });
   });
   return {
@@ -386,7 +432,6 @@ export function normalizeOrderProduct(product) {
     product_option_item: product.product_option_item || [],
     selling_price: resolvedSellingPrice,
     original_price: resolvedOriginalPrice,
-    payment_price: product.payment_price || '0.00',
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
     discount_list: product.discount_list || [],
@@ -402,33 +447,33 @@ export function normalizeOrderProduct(product) {
 export function collectLinkProductIdsFromReservationRules(rules) {
   if (!Array.isArray(rules)) return [];
   var ids = [];
-  var _iterator6 = _createForOfIteratorHelper(rules),
-    _step6;
+  var _iterator5 = _createForOfIteratorHelper(rules),
+    _step5;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var entry = _step6.value;
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var entry = _step5.value;
       if (!entry || _typeof(entry) !== 'object') continue;
       var rec = entry;
       if (rec.type !== 'link') continue;
       if (!Array.isArray(rec.value)) continue;
-      var _iterator7 = _createForOfIteratorHelper(rec.value),
-        _step7;
+      var _iterator6 = _createForOfIteratorHelper(rec.value),
+        _step6;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var v = _step7.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var v = _step6.value;
           var n = Number(v);
           if (Number.isFinite(n) && n > 0) ids.push(Math.floor(n));
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator7.f();
+        _iterator6.f();
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator5.e(err);
   } finally {
-    _iterator6.f();
+    _iterator5.f();
   }
   return _toConsumableArray(new Set(ids));
 }
@@ -437,20 +482,20 @@ export function collectLinkProductIdsFromReservationRules(rules) {
  * 返回列表中第一个带有效 duration.value（分钟）的商品时长。
  */
 export function pickFirstDurationMinutesFromProducts(products) {
-  var _iterator8 = _createForOfIteratorHelper(products),
-    _step8;
+  var _iterator7 = _createForOfIteratorHelper(products),
+    _step7;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
       var _product$duration;
-      var product = _step8.value;
+      var product = _step7.value;
       var value = product === null || product === void 0 || (_product$duration = product.duration) === null || _product$duration === void 0 ? void 0 : _product$duration.value;
       var n = Number(value);
       if (Number.isFinite(n) && n > 0) return Math.floor(n);
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator8.f();
+    _iterator7.f();
   }
   return undefined;
 }
@@ -461,4 +506,39 @@ export function hasCustomCapacityProduct(products) {
     var _p$capacity;
     return (p === null || p === void 0 || (_p$capacity = p.capacity) === null || _p$capacity === void 0 ? void 0 : _p$capacity.type) === 'custom';
   });
+}
+
+/**
+ * 在商品列表中找到第一个 `capacity.type === 'custom'` 的商品，取其 `custom` 数组第一项的 min/max。
+ * 仅返回有限数字字段；若均无法解析则返回 `undefined`。
+ */
+export function pickFirstCustomCapacityPaxBounds(products) {
+  var _iterator8 = _createForOfIteratorHelper(products),
+    _step8;
+  try {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var p = _step8.value;
+      var cap = p === null || p === void 0 ? void 0 : p.capacity;
+      if (!cap || cap.type !== 'custom') continue;
+      if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
+      var row = cap.custom[0];
+      if (!row || _typeof(row) !== 'object') continue;
+      var raw = row;
+      var out = {};
+      if (raw.min !== null && raw.min !== undefined && raw.min !== '') {
+        var min = Number(raw.min);
+        if (Number.isFinite(min)) out.min = min;
+      }
+      if (raw.max !== null && raw.max !== undefined && raw.max !== '') {
+        var max = Number(raw.max);
+        if (Number.isFinite(max)) out.max = max;
+      }
+      if (out.min !== undefined || out.max !== undefined) return out;
+    }
+  } catch (err) {
+    _iterator8.e(err);
+  } finally {
+    _iterator8.f();
+  }
+  return undefined;
 }

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

@@ -25,6 +25,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private cacheId;
     private window;
     private request;
+    private baseSlotConfig;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -80,6 +81,9 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         startDate: string;
         endDate: string;
     }): Promise<void>;
+    private getOperatingHoursScheduleIds;
+    private resolveSlotConfigForDate;
+    private syncOperatingHoursToSlotConfig;
     getDateRangeSummary(params: {
         startDate: string;
         endDate: string;