@pisell/pisellos 0.10.41 → 0.10.42

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

@@ -236,6 +236,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
+    /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+    setPickupRef(buzzer: string): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;

package/dist/solution/BaseSales/index.js

@@ -2210,6 +2210,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (!this.store.order) throw new Error('order 模块未初始化');
       this.store.order.syncTempOrderNoteToRemote(orderId, note);
     }
+
+    /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+  }, {
+    key: "setPickupRef",
+    value: function setPickupRef(buzzer) {
+      if (!this.store.order) throw new Error('order 模块未初始化');
+      return this.store.order.updateTempOrderBuzzer(buzzer);
+    }
   }, {
     key: "updateTempOrderShopDiscount",
     value: function updateTempOrderShopDiscount(amount) {
@@ -2534,7 +2542,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         (item.discount_list || []).forEach(function (discount) {
           var _discount$discount, _discount$metadata, _discount$discount2, _discount$discount3, _discount$discount4;
           var discountId = ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id;
-          if (!discountId || !['good_pass', 'discount_card'].includes(discount.type)) return;
+          if (!discountId || !['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) return;
           var quantity = item.quantity || item.num || item.product_quantity || 1;
           var savedAmount = new Decimal(discount.amount || 0).times(quantity).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
           var index = historyDiscountList.findIndex(function (n) {

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

@@ -20,6 +20,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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 Decimal from 'decimal.js';
 import { cloneDeep } from 'lodash-es';
+import { isFullCoveragePass } from "../../../modules/Discount/entitlementPass";
 import { composeLinePrice, createUuidV4, getProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildProductLineFingerprint, getSafeProductNum } from "../../ScanOrder/utils";
 
@@ -472,7 +473,7 @@ function getProductLineNoteSignature(product) {
   var uid = getOrderProductUid(product);
   return uid ? "note:".concat(uid) : "note:".concat(normalizedNote);
 }
-function hasGoodPassDiscount(product) {
+function getFullCoveragePassDiscountType(product) {
   var _product$_extend;
   var productBundle = Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle) ? product.product_bundle : [];
   var extendedBundle = Array.isArray(product === null || product === void 0 || (_product$_extend = product._extend) === null || _product$_extend === void 0 || (_product$_extend = _product$_extend.other) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle) ? product._extend.other.bundle : [];
@@ -481,11 +482,23 @@ function hasGoodPassDiscount(product) {
   })), _toConsumableArray(extendedBundle.map(function (item) {
     return item === null || item === void 0 ? void 0 : item.discount_list;
   })));
-  return discountLists.some(function (discountList) {
-    return Array.isArray(discountList) && discountList.some(function (item) {
-      return (item === null || item === void 0 ? void 0 : item.type) === 'good_pass' || (item === null || item === void 0 ? void 0 : item.tag) === 'good_pass';
-    });
-  });
+  var _iterator5 = _createForOfIteratorHelper(discountLists),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var discountList = _step5.value;
+      if (!Array.isArray(discountList)) continue;
+      var pass = discountList.find(function (item) {
+        return isFullCoveragePass(item);
+      });
+      if (pass) return String(pass.type || pass.tag);
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+  return null;
 }
 
 /**
@@ -499,8 +512,10 @@ function getPromotionLineMergeBoundary(product) {
   if ((product === null || product === void 0 ? void 0 : product.product_id) === undefined || (product === null || product === void 0 ? void 0 : product.product_id) === null) {
     return "custom:".concat(getOrderProductUid(product));
   }
-  if (hasGoodPassDiscount(product)) {
-    return "good-pass:".concat(getOrderProductUid(product));
+  var fullCoveragePassType = getFullCoveragePassDiscountType(product);
+  if (fullCoveragePassType) {
+    var boundary = fullCoveragePassType === 'good_pass' ? 'good-pass' : 'entitlement-pass';
+    return "".concat(boundary, ":").concat(getOrderProductUid(product));
   }
   if (Number((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1) {
     return "weighing:".concat(getOrderProductUid(product));
@@ -566,13 +581,13 @@ function consolidateMainProductsForPromotion(entries) {
     return _toConsumableArray(entries || []);
   }
   var groups = new Map();
-  var _iterator5 = _createForOfIteratorHelper(entries),
-    _step5;
+  var _iterator6 = _createForOfIteratorHelper(entries),
+    _step6;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var _step5$value = _step5.value,
-        item = _step5$value.item,
-        originalListIndex = _step5$value.originalListIndex;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var _step6$value = _step6.value,
+        item = _step6$value.item,
+        originalListIndex = _step6$value.originalListIndex;
       var key = buildConsolidateKeyForPromotion(item);
       var wasInPromotion = wasInPromotionBeforeEvaluation(item);
       var existing = groups.get(key);
@@ -582,17 +597,17 @@ function consolidateMainProductsForPromotion(entries) {
         delete metadata._promotion;
         mergedItem.metadata = metadata;
         if (Array.isArray(mergedItem.product_bundle)) {
-          var _iterator6 = _createForOfIteratorHelper(mergedItem.product_bundle),
-            _step6;
+          var _iterator7 = _createForOfIteratorHelper(mergedItem.product_bundle),
+            _step7;
           try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              var bundle = _step6.value;
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var bundle = _step7.value;
               if (bundle && _typeof(bundle) === 'object') delete bundle._promotion;
             }
           } catch (err) {
-            _iterator6.e(err);
+            _iterator7.e(err);
           } finally {
-            _iterator6.f();
+            _iterator7.f();
           }
         }
         if (wasInPromotion) {
@@ -610,9 +625,9 @@ function consolidateMainProductsForPromotion(entries) {
       }
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator5.f();
+    _iterator6.f();
   }
   return Array.from(groups.values());
 }
@@ -625,12 +640,12 @@ function consolidateMainProductsForPromotion(entries) {
  */
 function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
   var result = [];
-  var _iterator7 = _createForOfIteratorHelper(lines),
-    _step7;
+  var _iterator8 = _createForOfIteratorHelper(lines),
+    _step8;
   try {
-    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var _line$metadata13, _actionMeta$actionDet;
-      var line = _step7.value;
+      var line = _step8.value;
       var promo = line === null || line === void 0 || (_line$metadata13 = line.metadata) === null || _line$metadata13 === void 0 ? void 0 : _line$metadata13._promotion;
       if (!(promo !== null && promo !== void 0 && promo.inPromotion) || !promo.strategyId) {
         result.push(line);
@@ -660,9 +675,9 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
       }
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator7.f();
+    _iterator8.f();
   }
   return result;
 }
@@ -717,12 +732,12 @@ function calculateGiftActions(gifts, existingGifts) {
 
   // 按 strategyId 分组现有赠品
   var existingByStrategy = new Map();
-  var _iterator8 = _createForOfIteratorHelper(existingGifts),
-    _step8;
+  var _iterator9 = _createForOfIteratorHelper(existingGifts),
+    _step9;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
       var _getGiftInfo, _gift$num;
-      var gift = _step8.value;
+      var gift = _step9.value;
       var strategyId = (_getGiftInfo = getGiftInfo(gift)) === null || _getGiftInfo === void 0 ? void 0 : _getGiftInfo.strategyId;
       if (!strategyId) continue;
       var existing = existingByStrategy.get(strategyId);
@@ -738,17 +753,17 @@ function calculateGiftActions(gifts, existingGifts) {
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator8.f();
+    _iterator9.f();
   }
   var processedStrategyIds = new Set();
-  var _iterator9 = _createForOfIteratorHelper(gifts),
-    _step9;
+  var _iterator10 = _createForOfIteratorHelper(gifts),
+    _step10;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
       var _existing$totalQuanti;
-      var giftInfo = _step9.value;
+      var giftInfo = _step10.value;
       var _strategyId = giftInfo.strategyId,
         strategyName = giftInfo.strategyName,
         giftCount = giftInfo.giftCount,
@@ -778,12 +793,12 @@ function calculateGiftActions(gifts, existingGifts) {
         var reduceItems = [];
         var removeIds = [];
         var reversed = _toConsumableArray((_existing === null || _existing === void 0 ? void 0 : _existing.items) || []).reverse();
-        var _iterator11 = _createForOfIteratorHelper(reversed),
-          _step11;
+        var _iterator12 = _createForOfIteratorHelper(reversed),
+          _step12;
         try {
-          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
             var _giftItem$num;
-            var giftItem = _step11.value;
+            var giftItem = _step12.value;
             if (remaining <= 0) break;
             var uid = getOrderProductUid(giftItem);
             var _qty = Number((_giftItem$num = giftItem === null || giftItem === void 0 ? void 0 : giftItem.num) !== null && _giftItem$num !== void 0 ? _giftItem$num : 1) || 1;
@@ -800,9 +815,9 @@ function calculateGiftActions(gifts, existingGifts) {
             }
           }
         } catch (err) {
-          _iterator11.e(err);
+          _iterator12.e(err);
         } finally {
-          _iterator11.f();
+          _iterator12.f();
         }
         if (reduceItems.length > 0) toReduce.push({
           strategyId: _strategyId,
@@ -814,35 +829,35 @@ function calculateGiftActions(gifts, existingGifts) {
 
     // 失效策略的赠品：全部 remove
   } catch (err) {
-    _iterator9.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator9.f();
+    _iterator10.f();
   }
-  var _iterator10 = _createForOfIteratorHelper(existingByStrategy),
-    _step10;
+  var _iterator11 = _createForOfIteratorHelper(existingByStrategy),
+    _step11;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var _step10$value = _slicedToArray(_step10.value, 2),
-        _strategyId2 = _step10$value[0],
-        _existing2 = _step10$value[1];
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      var _step11$value = _slicedToArray(_step11.value, 2),
+        _strategyId2 = _step11$value[0],
+        _existing2 = _step11$value[1];
       if (processedStrategyIds.has(_strategyId2)) continue;
-      var _iterator12 = _createForOfIteratorHelper(_existing2.items),
-        _step12;
+      var _iterator13 = _createForOfIteratorHelper(_existing2.items),
+        _step13;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _giftItem = _step12.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var _giftItem = _step13.value;
           toRemove.push(getOrderProductUid(_giftItem));
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator12.f();
+        _iterator13.f();
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator11.e(err);
   } finally {
-    _iterator10.f();
+    _iterator11.f();
   }
   return {
     toAdd: toAdd,
@@ -862,11 +877,11 @@ export function extractProductMatchIdentifiersFromStrategyConfig(strategyConfig)
   var _strategyConfig$condi;
   var rules = strategyConfig === null || strategyConfig === void 0 || (_strategyConfig$condi = strategyConfig.conditions) === null || _strategyConfig$condi === void 0 ? void 0 : _strategyConfig$condi.rules;
   if (!Array.isArray(rules)) return [];
-  var _iterator13 = _createForOfIteratorHelper(rules),
-    _step13;
+  var _iterator14 = _createForOfIteratorHelper(rules),
+    _step14;
   try {
-    for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-      var rule = _step13.value;
+    for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+      var rule = _step14.value;
       if ((rule === null || rule === void 0 ? void 0 : rule.field) === 'productIdAndVariantId' && ((rule === null || rule === void 0 ? void 0 : rule.operator) === 'product_match' || (rule === null || rule === void 0 ? void 0 : rule.operator) === 'object_in') && Array.isArray(rule === null || rule === void 0 ? void 0 : rule.value)) {
         return rule.value.map(function (item) {
           return {
@@ -879,9 +894,9 @@ export function extractProductMatchIdentifiersFromStrategyConfig(strategyConfig)
       }
     }
   } catch (err) {
-    _iterator13.e(err);
+    _iterator14.e(err);
   } finally {
-    _iterator13.f();
+    _iterator14.f();
   }
   return [];
 }
@@ -970,11 +985,11 @@ export function calculateUnfulfilledPromotions(processedProducts, applicableStra
     if (_ret === 0) continue;
   }
   var result = [];
-  var _iterator14 = _createForOfIteratorHelper(unfulfilledMap.values()),
-    _step14;
+  var _iterator15 = _createForOfIteratorHelper(unfulfilledMap.values()),
+    _step15;
   try {
-    for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-      var data = _step14.value;
+    for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+      var data = _step15.value;
       var needQuantity = data.requiredQuantity - data.currentQuantity;
       if (needQuantity > 0) {
         result.push(_objectSpread(_objectSpread({}, data), {}, {
@@ -983,9 +998,9 @@ export function calculateUnfulfilledPromotions(processedProducts, applicableStra
       }
     }
   } catch (err) {
-    _iterator14.e(err);
+    _iterator15.e(err);
   } finally {
-    _iterator14.f();
+    _iterator15.f();
   }
   return result;
 }
@@ -1025,11 +1040,11 @@ export function appendPromotionTags(products, evaluator) {
     var data = strategies[index];
     var tags = [];
     if (data !== null && data !== void 0 && data.hasApplicableStrategy) {
-      var _iterator15 = _createForOfIteratorHelper(data.applicableStrategies),
-        _step15;
+      var _iterator16 = _createForOfIteratorHelper(data.applicableStrategies),
+        _step16;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var strategy = _step15.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var strategy = _step16.value;
           if (strategy.display) {
             tags.push({
               text: strategy.display.text,
@@ -1039,9 +1054,9 @@ export function appendPromotionTags(products, evaluator) {
           }
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator15.f();
+        _iterator16.f();
       }
     }
     // 商品卡兼容两种位置：顶层 `_promotionTags` 与 `metadata._promotionTags`
@@ -1144,18 +1159,18 @@ export function processCartPromotion(list, evaluator, options) {
     });
     if (existingGifts.length > 0) {
       var toRemove = [];
-      var _iterator16 = _createForOfIteratorHelper(existingGifts),
-        _step16;
+      var _iterator17 = _createForOfIteratorHelper(existingGifts),
+        _step17;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var gift = _step16.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var gift = _step17.value;
           var uid = getOrderProductUid(gift);
           if (uid) toRemove.push(uid);
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator16.f();
+        _iterator17.f();
       }
       return {
         products: editProducts,
@@ -1209,16 +1224,16 @@ export function processCartPromotion(list, evaluator, options) {
     channel: options === null || options === void 0 ? void 0 : options.channel
   });
   var strategyActionMap = new Map();
-  var _iterator17 = _createForOfIteratorHelper(applicableStrategiesResult || []),
-    _step17;
+  var _iterator18 = _createForOfIteratorHelper(applicableStrategiesResult || []),
+    _step18;
   try {
-    for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-      var row = _step17.value;
-      var _iterator22 = _createForOfIteratorHelper((row === null || row === void 0 ? void 0 : row.applicableStrategies) || []),
-        _step22;
+    for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+      var row = _step18.value;
+      var _iterator23 = _createForOfIteratorHelper((row === null || row === void 0 ? void 0 : row.applicableStrategies) || []),
+        _step23;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var strategy = _step22.value;
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var strategy = _step23.value;
           if (!(strategy !== null && strategy !== void 0 && strategy.strategyId)) continue;
           strategyActionMap.set(strategy.strategyId, {
             actionType: strategy.actionType,
@@ -1226,17 +1241,17 @@ export function processCartPromotion(list, evaluator, options) {
           });
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator23.e(err);
       } finally {
-        _iterator22.f();
+        _iterator23.f();
       }
     }
 
     // 3. 评估器
   } catch (err) {
-    _iterator17.e(err);
+    _iterator18.e(err);
   } finally {
-    _iterator17.f();
+    _iterator18.f();
   }
   var result = evaluator.evaluateCartWithPricing({
     products: promotionProducts,
@@ -1245,11 +1260,11 @@ export function processCartPromotion(list, evaluator, options) {
 
   // 4. 收集每个策略的 sourceProductIds（参与策略的主商品 uid）
   var strategySourceProductIds = new Map();
-  var _iterator18 = _createForOfIteratorHelper(result.products),
-    _step18;
+  var _iterator19 = _createForOfIteratorHelper(result.products),
+    _step19;
   try {
-    for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-      var priced = _step18.value;
+    for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+      var priced = _step19.value;
       if (priced.inPromotion && priced.strategyId) {
         var _priced$originalId;
         var sourceId = (_priced$originalId = priced.originalId) !== null && _priced$originalId !== void 0 ? _priced$originalId : priced.id;
@@ -1266,9 +1281,9 @@ export function processCartPromotion(list, evaluator, options) {
 
     // 5. 扩展 gifts，加 sourceProductIds
   } catch (err) {
-    _iterator18.e(err);
+    _iterator19.e(err);
   } finally {
-    _iterator18.f();
+    _iterator19.f();
   }
   var extendedGifts = result.gifts.map(function (gift) {
     return _objectSpread(_objectSpread({}, gift), {}, {
@@ -1278,26 +1293,26 @@ export function processCartPromotion(list, evaluator, options) {
 
   // 6. PricedProduct → OrderProduct（含拆分与价格调整）
   var strategyGiftInfoMap = new Map();
-  var _iterator19 = _createForOfIteratorHelper(extendedGifts),
-    _step19;
+  var _iterator20 = _createForOfIteratorHelper(extendedGifts),
+    _step20;
   try {
-    for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-      var _gift = _step19.value;
+    for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+      var _gift = _step20.value;
       strategyGiftInfoMap.set(_gift.strategyId, _gift);
     }
   } catch (err) {
-    _iterator19.e(err);
+    _iterator20.e(err);
   } finally {
-    _iterator19.f();
+    _iterator20.f();
   }
   var strategyGiftInfoOwner = new Map();
   var processedProducts = [];
-  var _iterator20 = _createForOfIteratorHelper(result.products),
-    _step20;
+  var _iterator21 = _createForOfIteratorHelper(result.products),
+    _step21;
   try {
-    for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+    for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
       var _priced$originalId2, _priced$product_id, _originalItem$product;
-      var _priced = _step20.value;
+      var _priced = _step21.value;
       var rawSourceId = (_priced$originalId2 = _priced.originalId) !== null && _priced$originalId2 !== void 0 ? _priced$originalId2 : _priced.id;
       var _sourceId = Number(rawSourceId);
       var _originalData = Number.isFinite(_sourceId) ? originalItemMap.get(_sourceId) : undefined;
@@ -1318,17 +1333,17 @@ export function processCartPromotion(list, evaluator, options) {
       var wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
       delete metadata._promotion;
       if (Array.isArray(newItem.product_bundle)) {
-        var _iterator23 = _createForOfIteratorHelper(newItem.product_bundle),
-          _step23;
+        var _iterator24 = _createForOfIteratorHelper(newItem.product_bundle),
+          _step24;
         try {
-          for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-            var b = _step23.value;
+          for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+            var b = _step24.value;
             if (b && _typeof(b) === 'object') delete b._promotion;
           }
         } catch (err) {
-          _iterator23.e(err);
+          _iterator24.e(err);
         } finally {
-          _iterator23.f();
+          _iterator24.f();
         }
       }
       var originalBasePrice = getOrderProductOriginalPriceForPromotion(originalItem);
@@ -1414,9 +1429,9 @@ export function processCartPromotion(list, evaluator, options) {
 
     // 7. 赠品/编辑商品原样拼回；同时同步赠品的 sourceProductIds / sourceProductId
   } catch (err) {
-    _iterator20.e(err);
+    _iterator21.e(err);
   } finally {
-    _iterator20.f();
+    _iterator21.f();
   }
   for (var _i2 = 0, _existingGiftsWithInd = existingGiftsWithIndex; _i2 < _existingGiftsWithInd.length; _i2++) {
     var _getGiftInfo3;
@@ -1500,12 +1515,12 @@ export function processCartPromotion(list, evaluator, options) {
   var giftActions = calculateGiftActions(extendedGifts, existingGifts);
 
   // 10.1 更新 lastEvaluatedGiftCount，便于下次评估时判别「策略已变」
-  var _iterator21 = _createForOfIteratorHelper(existingGifts),
-    _step21;
+  var _iterator22 = _createForOfIteratorHelper(existingGifts),
+    _step22;
   try {
-    for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+    for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
       var _getGiftInfo4, _metadata;
-      var _gift3 = _step21.value;
+      var _gift3 = _step22.value;
       var _strategyId3 = (_getGiftInfo4 = getGiftInfo(_gift3)) === null || _getGiftInfo4 === void 0 ? void 0 : _getGiftInfo4.strategyId;
       if (!_strategyId3) continue;
       var _latest = strategyGiftInfoMap.get(_strategyId3);
@@ -1516,9 +1531,9 @@ export function processCartPromotion(list, evaluator, options) {
 
     // 11. 未满足促销
   } catch (err) {
-    _iterator21.e(err);
+    _iterator22.e(err);
   } finally {
-    _iterator21.f();
+    _iterator22.f();
   }
   var unfulfilledPromotions = calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts);
 

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

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -29,6 +29,8 @@ export var searchWalletPass = /*#__PURE__*/function () {
             // 折扣卡
             'good_pass',
             // 商品券
+            'entitlement_pass',
+            // 月卡 / 年卡 / 多次使用卡
             'session_ticket',
             // 场次票
             'appointment_ticket' // 预约类门票

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

@@ -62,6 +62,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
     }): Promise<void>;
 }
 export default ShopDiscountImpl;