@pisell/pisellos 2.1.126 → 2.1.128

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) {
@@ -219,40 +213,81 @@ export function aggregateItemRuleLimit(matchedLimits) {
   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)) {
-        remainingMax = remainingMax === undefined ? limit.remainingMax : Math.min(remainingMax, 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) {
@@ -300,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);
@@ -323,9 +358,9 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
       }
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator5.f();
+    _iterator4.f();
   }
   return productList;
 }
@@ -363,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;
   }
@@ -372,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 {
@@ -391,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 || [],
@@ -407,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));
 }
@@ -442,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;
 }
@@ -466,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.js

@@ -1446,7 +1446,6 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   num: 1,
                   selling_price: group.totalPrice,
                   original_price: group.totalPrice,
-                  payment_price: group.totalPrice,
                   is_charge_tax: (_venueProduct$is_char = venueProduct === null || venueProduct === void 0 ? void 0 : venueProduct.is_charge_tax) !== null && _venueProduct$is_char !== void 0 ? _venueProduct$is_char : 0,
                   metadata: {
                     venue_booking: true,
@@ -1699,7 +1698,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
             var merged = mergeConsecutiveSlots(updatedSlots);
             if (merged.length === 1) {
               product.selling_price = merged[0].totalPrice;
-              product.payment_price = merged[0].totalPrice;
+              product.original_price = merged[0].totalPrice;
               product.metadata.price_breakdown = buildPriceBreakdown({
                 group: merged[0],
                 productId: mapping.productId,
@@ -1715,7 +1714,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
             });
             if (quotationPrice !== null) {
               product.selling_price = quotationPrice;
-              product.payment_price = quotationPrice;
+              product.original_price = quotationPrice;
             }
           }
         };
@@ -1793,7 +1792,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: (function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator9, _step9, d, selectedResourceIds, _iterator10, _step10, _product$discount_lis, product, before, totalDiscountAmount, newPaymentPrice, paymentStr, afterApplyTarget, finalSummary, finalProduct, finalTarget;
+        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator9, _step9, d, selectedResourceIds, _iterator10, _step10, _product$discount_lis, product, before, totalPerUnitDiscount, newSellingPrice, afterApplyTarget, finalSummary, finalProduct, finalTarget;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -1896,14 +1895,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return rid != null && selectedResourceIds.has(rid);
               });
               if (product.discount_list.length < before) {
-                totalDiscountAmount = product.discount_list.reduce(function (sum, pd) {
+                // 基于剩余的 discount_list 重算 selling_price。
+                // 约定：pd.amount 为 per-unit 折扣额，remaining 加总即单品券后总折扣。
+                totalPerUnitDiscount = product.discount_list.reduce(function (sum, pd) {
                   return sum + (pd.amount || 0);
                 }, 0);
-                newPaymentPrice = new Decimal(product.selling_price || 0).minus(totalDiscountAmount).toNumber();
-                paymentStr = toPriceString(newPaymentPrice);
-                product.payment_price = paymentStr;
+                newSellingPrice = new Decimal(product.original_price || product.selling_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+                product.selling_price = newSellingPrice;
                 if (product.metadata) {
-                  product.metadata.main_product_selling_price = paymentStr;
+                  product.metadata.main_product_selling_price = newSellingPrice;
                 }
               }
             case 28:
@@ -2123,10 +2123,9 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 });
                 if (quotationPrice !== null) {
                   product.selling_price = quotationPrice;
-                  if (product.original_price == null) {
-                    product.original_price = quotationPrice;
-                  }
-                  product.payment_price = quotationPrice;
+                  product.original_price = quotationPrice;
+                } else if (product.selling_price != null) {
+                  product.original_price = product.selling_price;
                 }
               }
               _context25.next = 7;
@@ -2619,7 +2618,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator12, _step12, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, _ref5, _sourceItem$original_, _ref6, _sourceItem$payment_p, sellingPrice, originalPrice, paymentPrice, targetProduct, existedQuantity, delta, nextProduct;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator12, _step12, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
@@ -2669,7 +2668,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator12.s();
             case 22:
               if ((_step12 = _iterator12.n()).done) {
-                _context36.next = 47;
+                _context36.next = 45;
                 break;
               }
               prefillItem = _step12.value;
@@ -2680,13 +2679,13 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _context36.next = 29;
                 break;
               }
-              return _context36.abrupt("continue", 45);
+              return _context36.abrupt("continue", 43);
             case 29:
               if (!Number.isNaN(productVariantId)) {
                 _context36.next = 31;
                 break;
               }
-              return _context36.abrupt("continue", 45);
+              return _context36.abrupt("continue", 43);
             case 31:
               sourceItem = productSourceMap.get(buildProductKey(productId, productVariantId)) || productSourceMap.get(buildProductKey(productId, 0)) || null;
               productIndex = getProductIdentityIndex(tempOrder.products, {
@@ -2694,19 +2693,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 product_variant_id: productVariantId
               });
               if (!(productIndex === -1)) {
-                _context36.next = 40;
+                _context36.next = 38;
                 break;
               }
               sellingPrice = toPriceString((_sourceItem$price = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _sourceItem$price !== void 0 ? _sourceItem$price : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price, '0.00');
-              originalPrice = toPriceString((_ref5 = (_sourceItem$original_ = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.original_price) !== null && _sourceItem$original_ !== void 0 ? _sourceItem$original_ : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _ref5 !== void 0 ? _ref5 : sellingPrice, sellingPrice);
-              paymentPrice = toPriceString((_ref6 = (_sourceItem$payment_p = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.payment_price) !== null && _sourceItem$payment_p !== void 0 ? _sourceItem$payment_p : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _ref6 !== void 0 ? _ref6 : sellingPrice, sellingPrice);
               tempOrder.products.push(normalizeOrderProduct({
                 product_id: productId,
                 product_variant_id: productVariantId,
                 num: targetQuantity,
                 selling_price: sellingPrice,
-                original_price: originalPrice,
-                payment_price: paymentPrice,
+                original_price: sellingPrice,
                 metadata: {
                   item_rule_prefill: true,
                   item_rule_id: prefillItem.ruleId
@@ -2717,8 +2713,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 })
               }));
               hasChanges = true;
-              return _context36.abrupt("continue", 45);
-            case 40:
+              return _context36.abrupt("continue", 43);
+            case 38:
               targetProduct = tempOrder.products[productIndex];
               existedQuantity = toNonNegativeInt(targetProduct.num);
               delta = targetQuantity - existedQuantity;
@@ -2735,45 +2731,47 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products[productIndex] = nextProduct;
                 hasChanges = true;
               }
-            case 45:
+            case 43:
               _context36.next = 22;
               break;
-            case 47:
-              _context36.next = 52;
+            case 45:
+              _context36.next = 50;
               break;
-            case 49:
-              _context36.prev = 49;
+            case 47:
+              _context36.prev = 47;
               _context36.t0 = _context36["catch"](20);
               _iterator12.e(_context36.t0);
-            case 52:
-              _context36.prev = 52;
+            case 50:
+              _context36.prev = 50;
               _iterator12.f();
-              return _context36.finish(52);
-            case 55:
+              return _context36.finish(50);
+            case 53:
               if (!hasChanges) {
-                _context36.next = 59;
+                _context36.next = 58;
                 break;
               }
-              _context36.next = 58;
+              // Prefill 属于 products CRUD 的一种形式：新增后让 Rules 重算，以支持自动应用可用优惠券。
+              this.store.order.applyDiscount();
+              _context36.next = 57;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 58:
+            case 57:
               this.store.order.persistTempOrder();
-            case 59:
-              _context36.next = 61;
+            case 58:
+              _context36.next = 60;
               return this.refreshItemRuleQuantityLimits();
-            case 61:
+            case 60:
               this.itemRulePrefillApplied = true;
               this.logMethodSuccess('applyPrefillByItemRule', {
                 prefillCount: prefillItems.length,
                 hasChanges: hasChanges
               });
-            case 63:
+            case 62:
             case "end":
               return _context36.stop();
           }
-        }, _callee36, this, [[20, 49, 52, 55]]);
+        }, _callee36, this, [[20, 47, 50, 53]]);
       }));
       function applyPrefillByItemRule() {
         return _applyPrefillByItemRule.apply(this, arguments);
@@ -3078,14 +3076,14 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
-        var _ref7,
-          _ref7$cover,
+        var _ref5,
+          _ref5$cover,
           cover,
           _args43 = arguments;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              _ref7 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref7$cover = _ref7.cover, cover = _ref7$cover === void 0 ? false : _ref7$cover;
+              _ref5 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {

package/lib/model/strategy/adapter/itemRule/adapter.js

@@ -250,7 +250,7 @@ var ItemRuleAdapter = class {
     const config = action.config;
     if (!config)
       return null;
-    const { scope, quantityRules, targetType, targets } = config;
+    const { scope, quantityRules, targetType, targets, validationMessage } = config;
     if (!this.shouldEvaluateForScope(scope, businessData.submissionIndex ?? 0)) {
       return null;
     }
@@ -289,6 +289,12 @@ var ItemRuleAdapter = class {
       targets,
       businessData
     );
+    const formattedValidationMessage = this.formatValidationMessage(
+      validationMessage,
+      requiredMin,
+      requiredMax,
+      requiredExact
+    );
     return {
       ruleId: action.id,
       targetType,
@@ -298,7 +304,9 @@ var ItemRuleAdapter = class {
       remainingMax,
       requiredExact,
       mustInclude,
-      scope
+      scope,
+      validationMessage: formattedValidationMessage,
+      rawValidationMessage: validationMessage
     };
   }
   /**

package/lib/model/strategy/adapter/itemRule/examples.d.ts

@@ -25,6 +25,21 @@ export declare const MAX_BUNS_PER_TABLE_STRATEGY: StrategyConfig;
  *   - Prefill Cart: 自动添加默认锅底 x 1
  */
 export declare const HOTPOT_BASE_REQUIRED_STRATEGY: StrategyConfig;
+/**
+ * 场景：4 款锅底里任选至少 1 款，不自动预填，不限制多选上限
+ *
+ * WHEN: Always active
+ * THEN:
+ *   - Quantity Check: 4 个锅底商品合计数量 >= 1 （OR 组语义）
+ *
+ * 说明：
+ *   - targets 里放多个 product_id 时，ItemRuleAdapter 会把它们视为 OR 组，
+ *     仅校验「合计数量」，不会要求每款各自满足 min。
+ *   - ScanOrder 工具层 buildQuantityLimitIndex 会跳过多目标规则的
+ *     单品索引，避免 UI 把组级 min 误当作每张商品卡的减号下限，
+ *     锁死用户切换锅底的操作。
+ */
+export declare const HOTPOT_BASE_PICK_ONE_STRATEGY: StrategyConfig;
 /**
  * ItemRuleEvaluator 简洁调用示例
  *

package/lib/model/strategy/adapter/itemRule/examples.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/adapter/itemRule/examples.ts
 var examples_exports = {};
 __export(examples_exports, {
+  HOTPOT_BASE_PICK_ONE_STRATEGY: () => HOTPOT_BASE_PICK_ONE_STRATEGY,
   HOTPOT_BASE_REQUIRED_STRATEGY: () => HOTPOT_BASE_REQUIRED_STRATEGY,
   MAX_BUNS_PER_TABLE_STRATEGY: () => MAX_BUNS_PER_TABLE_STRATEGY,
   MIN_CONDIMENT_PER_PERSON_STRATEGY: () => MIN_CONDIMENT_PER_PERSON_STRATEGY,
@@ -190,6 +191,51 @@ var HOTPOT_BASE_REQUIRED_STRATEGY = {
     }
   ]
 };
+var HOTPOT_BASE_PICK_ONE_STRATEGY = {
+  metadata: {
+    id: "RULE_HOTPOT_BASE_PICK_ONE",
+    name: {
+      "zh-CN": "锅底必选（四选一）",
+      en: "Hotpot base required (pick any)"
+    },
+    type: "item_rule",
+    description: {
+      "zh-CN": "4 款锅底任选至少 1 份",
+      en: "Pick at least 1 hotpot base from the available options"
+    }
+  },
+  conditions: {
+    operator: "and",
+    rules: [],
+    actionIds: ["quantity_check_hotpot_base_group"]
+  },
+  actions: [
+    {
+      id: "quantity_check_hotpot_base_group",
+      type: import_type.ITEM_RULE_ACTION_TYPES.QUANTITY_CHECK,
+      value: null,
+      target: "cart",
+      priority: 10,
+      config: {
+        targetType: "product",
+        targets: [
+          { product_id: 30001 },
+          { product_id: 30002 },
+          { product_id: 30003 },
+          { product_id: 30004 }
+        ],
+        quantityRules: [
+          { comparison: "minimum", source: "fixed", value: 1 }
+        ],
+        scope: "first_submission_only",
+        validationMessage: {
+          "zh-CN": "请至少选择 {min} 款锅底",
+          en: "Please select at least {min} hotpot base"
+        }
+      }
+    }
+  ]
+};
 function quickUseItemRuleEvaluator() {
   const evaluator = new import_evaluator.ItemRuleEvaluator();
   evaluator.setStrategyConfigs([
@@ -261,6 +307,7 @@ function runItemRuleEvaluatorDemo() {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  HOTPOT_BASE_PICK_ONE_STRATEGY,
   HOTPOT_BASE_REQUIRED_STRATEGY,
   MAX_BUNS_PER_TABLE_STRATEGY,
   MIN_CONDIMENT_PER_PERSON_STRATEGY,