@pisell/pisellos 2.2.265 → 2.2.266

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

@@ -1,17 +1,17 @@
 var _excluded = ["_promotionTags"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-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); }
 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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -116,24 +116,50 @@ export function getOrderProductOriginalPriceForPromotion(product) {
   }
   return getOrderProductBasePrice(product);
 }
+var X_ITEMS_FOR_Y_PRICE = 'X_ITEMS_FOR_Y_PRICE';
+var BUY_X_GET_Y_FREE = 'BUY_X_GET_Y_FREE';
+var ITEM_REWARD = 'ITEM_REWARD';
+function isItemRewardPromotionDiscountItem(item) {
+  var _item$metadata, _item$metadata2;
+  return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === ITEM_REWARD;
+}
+function isManagedPromotionDiscountItem(item) {
+  if ((item === null || item === void 0 ? void 0 : item.type) === 'promotion') return true;
+  return isItemRewardPromotionDiscountItem(item);
+}
+
+/**
+ * 判断商品行在本轮评估前是否已享受促销。
+ *
+ * `_promotion` 仅存在于当前运行时；订单保存后会被裁剪，因此编辑态需通过
+ * ITEM_REWARD 写入的受管商品折扣恢复上一轮状态。
+ */
+function wasInPromotionBeforeEvaluation(item) {
+  var _item$metadata3;
+  if ((item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 || (_item$metadata3 = _item$metadata3._promotion) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.inPromotion) === true) return true;
+  return Array.isArray(item === null || item === void 0 ? void 0 : item.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
+}
 
 /**
- * 写入/清除促销 discount_list（type=promotion）。
+ * 写入/清除促销 discount_list。
  *
  * applyDiscount → applyProductDiscountPrices 会从 source_product_price 减去 discount_list 合计
  * 重算 main_product_selling_price；保留券前 source 时必须同步写入促销差额，否则会还原成原价。
  *
+ * ITEM_REWARD 使用 type=product，复用商品级折扣排他规则，避免客户折扣继续叠加到奖励商品行。
+ *
  * @example
  * updatePromotionDiscountList(line, { title: '2 items for $10', amount: '17.00', original_amount: '22.00', fixed_amount: '17.00' });
  */
-function updatePromotionDiscountList(item, promotionDiscount) {
+function updatePromotionDiscountList(item, promotionDiscount, options) {
   var discountList = Array.isArray(item.discount_list) ? _toConsumableArray(item.discount_list) : [];
   discountList = discountList.filter(function (d) {
-    return (d === null || d === void 0 ? void 0 : d.type) !== 'promotion';
+    return !isManagedPromotionDiscountItem(d);
   });
   if (promotionDiscount) {
-    discountList.push({
-      type: 'promotion',
+    var discountType = (options === null || options === void 0 ? void 0 : options.discountType) || 'promotion';
+    discountList.push(_objectSpread({
+      type: discountType,
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
@@ -141,7 +167,12 @@ function updatePromotionDiscountList(item, promotionDiscount) {
         title: promotionDiscount.title,
         resource_id: ''
       }
-    });
+    }, discountType === 'product' ? {
+      metadata: {
+        source: 'promotion',
+        actionType: (options === null || options === void 0 ? void 0 : options.actionType) || ITEM_REWARD
+      }
+    } : {}));
   }
   if (discountList.length > 0) {
     item.discount_list = discountList;
@@ -149,11 +180,19 @@ function updatePromotionDiscountList(item, promotionDiscount) {
     delete item.discount_list;
   }
 }
-var X_ITEMS_FOR_Y_PRICE = 'X_ITEMS_FOR_Y_PRICE';
-var BUY_X_GET_Y_FREE = 'BUY_X_GET_Y_FREE';
+function evaluatorHasActionType(evaluator, actionType) {
+  var _evaluator$getStrateg;
+  var configs = evaluator === null || evaluator === void 0 || (_evaluator$getStrateg = evaluator.getStrategyConfigs) === null || _evaluator$getStrateg === void 0 ? void 0 : _evaluator$getStrateg.call(evaluator);
+  if (!Array.isArray(configs)) return false;
+  return configs.some(function (config) {
+    return ((config === null || config === void 0 ? void 0 : config.actions) || []).some(function (action) {
+      return (action === null || action === void 0 ? void 0 : action.type) === actionType;
+    });
+  });
+}
 
 /**
- * 将促销单价写入 OrderProduct（含 metadata 三字段 + promotion discount_list）。
+ * 将促销单价写入 OrderProduct（含 metadata 三字段 + 行内折扣）。
  *
  * @example
  * applyPromoUnitPriceToLine(newItem, { promoUnitPrice: '5.00', originalBasePrice: 1, strategyTitle: '2 for 10' });
@@ -184,6 +223,9 @@ function applyPromoUnitPriceToLine(item, input) {
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
+    }, {
+      actionType: input.actionType,
+      discountType: input.actionType === ITEM_REWARD ? 'product' : 'promotion'
     });
   } else {
     updatePromotionDiscountList(item, null);
@@ -471,11 +513,11 @@ function getProductBundleForEvaluator(product) {
  * // => 单行 num=4，清除 _promotion 后重新评估
  */
 export function buildConsolidateKeyForPromotion(item) {
-  var _item$booking_uid, _item$metadata, _item$order_detail_id, _item$product_variant3;
+  var _item$booking_uid, _item$metadata4, _item$order_detail_id, _item$product_variant3;
   var fingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
   var noteSignature = getProductLineNoteSignature(item);
   var lineMergeBoundary = getPromotionLineMergeBoundary(item);
-  var bookingUid = (_item$booking_uid = item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _item$booking_uid !== void 0 ? _item$booking_uid : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.booking_uid;
+  var bookingUid = (_item$booking_uid = item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _item$booking_uid !== void 0 ? _item$booking_uid : item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.booking_uid;
   var orderDetailId = (_item$order_detail_id = item === null || item === void 0 ? void 0 : item.order_detail_id) !== null && _item$order_detail_id !== void 0 ? _item$order_detail_id : item === null || item === void 0 ? void 0 : item.orderDetailId;
   if (orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '') {
     var _item$product_variant;
@@ -496,12 +538,11 @@ function consolidateMainProductsForPromotion(entries) {
     _step5;
   try {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var _item$metadata2;
       var _step5$value = _step5.value,
         item = _step5$value.item,
         originalListIndex = _step5$value.originalListIndex;
       var key = buildConsolidateKeyForPromotion(item);
-      var wasInPromotion = (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 || (_item$metadata2 = _item$metadata2._promotion) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.inPromotion) === true;
+      var wasInPromotion = wasInPromotionBeforeEvaluation(item);
       var existing = groups.get(key);
       if (!existing) {
         var mergedItem = cloneDeep(item);
@@ -598,6 +639,9 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
 function generateNumericId() {
   return Math.floor(Math.random() * 1000000000) + Date.now();
 }
+function isBookingEditProductLine(product) {
+  return (product === null || product === void 0 ? void 0 : product.booking_id) !== undefined && (product === null || product === void 0 ? void 0 : product.booking_id) !== null && product.booking_id !== 0 && product.booking_id !== '0';
+}
 
 /**
  * 把 OrderProduct 转成 evaluator 的 PromotionProduct（仅评估期使用）。
@@ -618,6 +662,7 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((_product$num = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num !== void 0 ? _product$num : 1) || 1,
     bundle: getProductBundleForEvaluator(product),
+    _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
@@ -825,6 +870,9 @@ export function resolveStrategyRequiredQuantity(matched) {
   if (matched.actionType === 'BUY_X_GET_Y_FREE') {
     return Number(detail.buyQuantity) || 1;
   }
+  if (matched.actionType === 'ITEM_REWARD') {
+    return Number(detail.triggerQuantity) || 1;
+  }
   return 1;
 }
 
@@ -984,7 +1032,8 @@ export function appendPromotionTags(products, evaluator) {
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
+ * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
+ *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`
@@ -1014,6 +1063,7 @@ export function processCartPromotion(list, evaluator, options) {
   if (!list || list.length === 0 || !evaluator) return empty;
 
   // 0. 分类
+  var shouldIncludeEditProductsForItemReward = evaluatorHasActionType(evaluator, ITEM_REWARD);
   var mainProductsWithIndex = [];
   var existingGiftsWithIndex = [];
   var editProductsWithIndex = [];
@@ -1030,11 +1080,18 @@ export function processCartPromotion(list, evaluator, options) {
         item: item,
         originalListIndex: i
       });
-    } else if ((item === null || item === void 0 ? void 0 : item.booking_id) !== undefined && (item === null || item === void 0 ? void 0 : item.booking_id) !== null && item.booking_id !== 0 && item.booking_id !== '0') {
-      editProductsWithIndex.push({
-        item: item,
-        originalListIndex: i
-      });
+    } else if (isBookingEditProductLine(item)) {
+      if (shouldIncludeEditProductsForItemReward) {
+        mainProductsWithIndex.push({
+          item: item,
+          originalListIndex: i
+        });
+      } else {
+        editProductsWithIndex.push({
+          item: item,
+          originalListIndex: i
+        });
+      }
     } else {
       mainProductsWithIndex.push({
         item: item,
@@ -1089,16 +1146,17 @@ export function processCartPromotion(list, evaluator, options) {
   var promotionProducts = [];
   var originalItemMap = new Map();
   var productsForStrategies = consolidatedMainProductsWithIndex.map(function (_ref16, i) {
-    var _item$product_id, _item$product_variant5, _item$metadata3, _item$num;
+    var _item$product_id, _item$product_variant5, _item$metadata5, _item$num;
     var item = _ref16.item;
     return {
       id: i,
       product_id: Number((_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : 0) || 0,
       product_variant_id: Number((_item$product_variant5 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant5 !== void 0 ? _item$product_variant5 : 0) || 0,
-      name: (item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.product_name) || (item === null || item === void 0 ? void 0 : item.title) || '',
+      name: (item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.product_name) || (item === null || item === void 0 ? void 0 : item.title) || '',
       price: getOrderProductBasePrice(item),
       quantity: Number((_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : 1) || 1,
-      bundle: getProductBundleForEvaluator(item)
+      bundle: getProductBundleForEvaluator(item),
+      _promotionOnlyForItemReward: isBookingEditProductLine(item)
     };
   });
   for (var _i = 0; _i < consolidatedMainProductsWithIndex.length; _i++) {
@@ -1206,7 +1264,7 @@ export function processCartPromotion(list, evaluator, options) {
     _step20;
   try {
     for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-      var _priced$originalId2, _priced$product_id, _originalItem$product, _metadata$_promotion2;
+      var _priced$originalId2, _priced$product_id, _originalItem$product;
       var _priced = _step20.value;
       var rawSourceId = (_priced$originalId2 = _priced.originalId) !== null && _priced$originalId2 !== void 0 ? _priced$originalId2 : _priced.id;
       var _sourceId = Number(rawSourceId);
@@ -1225,7 +1283,7 @@ export function processCartPromotion(list, evaluator, options) {
       newItem._sourceCartNum = sourceCartNum;
 
       // 清掉历史促销字段
-      var wasInPromotion = ((_metadata$_promotion2 = metadata._promotion) === null || _metadata$_promotion2 === void 0 ? void 0 : _metadata$_promotion2.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
+      var wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
       delete metadata._promotion;
       if (Array.isArray(newItem.product_bundle)) {
         var _iterator23 = _createForOfIteratorHelper(newItem.product_bundle),
@@ -1246,12 +1304,13 @@ export function processCartPromotion(list, evaluator, options) {
       var priceUnchangedPromo = _priced.inPromotion && Number(_priced.finalPrice) === Number(originalBasePrice);
       if (shouldModifyPrice) {
         if (_priced.inPromotion && !priceUnchangedPromo) {
-          var _priced$strategyMetad;
+          var _priced$strategyMetad, _strategyActionMap$ge;
           var promoUnitPrice = new Decimal(_priced.finalPrice).toDecimalPlaces(2).toFixed(2);
           applyPromoUnitPriceToLine(newItem, {
             promoUnitPrice: promoUnitPrice,
             originalBasePrice: originalBasePrice,
-            strategyTitle: (_priced$strategyMetad = _priced.strategyMetadata) === null || _priced$strategyMetad === void 0 ? void 0 : _priced$strategyMetad.name
+            strategyTitle: (_priced$strategyMetad = _priced.strategyMetadata) === null || _priced$strategyMetad === void 0 ? void 0 : _priced$strategyMetad.name,
+            actionType: _priced.strategyId ? (_strategyActionMap$ge = strategyActionMap.get(_priced.strategyId)) === null || _strategyActionMap$ge === void 0 ? void 0 : _strategyActionMap$ge.actionType : undefined
           });
         } else {
           // 撤销上一轮促销：还原 selling_price 到 main_product_original_price 派生值

package/dist/solution/BookingTicket/index.js

@@ -397,49 +397,52 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              // 业务码切换或配置失败时不能复用上一次初始化的短号。
+              this.setPaymentNumberDevicePrefix(null);
               openDataConfig = null;
-              _context5.prev = 1;
-              _context5.next = 4;
+              _context5.prev = 2;
+              _context5.next = 5;
               return this.loadOpenDataConfig();
-            case 4:
+            case 5:
               openDataConfig = _context5.sent;
-              _context5.next = 11;
+              _context5.next = 12;
               break;
-            case 7:
-              _context5.prev = 7;
-              _context5.t0 = _context5["catch"](1);
+            case 8:
+              _context5.prev = 8;
+              _context5.t0 = _context5["catch"](2);
               console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
               return _context5.abrupt("return");
-            case 11:
+            case 12:
               // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 15;
+                _context5.next = 16;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
-            case 15:
+            case 16:
               receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
               shopOrderPrefix = this.normalizeIdPrefix((_openDataConfig4 = openDataConfig) === null || _openDataConfig4 === void 0 ? void 0 : _openDataConfig4['sale.sale_number_prefix'], '');
               resetReceiptSequenceDaily = typeof ((_openDataConfig5 = openDataConfig) === null || _openDataConfig5 === void 0 ? void 0 : _openDataConfig5['sale.short_number_daily_reset']) === 'boolean' ? (_openDataConfig6 = openDataConfig) === null || _openDataConfig6 === void 0 ? void 0 : _openDataConfig6['sale.short_number_daily_reset'] : false;
               operatingDayBoundary = this.getAppData('operating_day_boundary');
-              _context5.next = 23;
+              _context5.next = 24;
               return this.getShortNumberOrDeviceId();
-            case 23:
+            case 24:
               deviceId = _context5.sent;
+              this.setPaymentNumberDevicePrefix(deviceId);
               businessCode = this.getBookingTicketBusinessCode();
               if (businessCode) {
-                _context5.next = 28;
+                _context5.next = 30;
                 break;
               }
               console.warn('[BookingTicket] businessCode 缺失，跳过 idGenerator 配置');
               return _context5.abrupt("return");
-            case 28:
-              _context5.prev = 28;
-              _context5.next = 31;
+            case 30:
+              _context5.prev = 30;
+              _context5.next = 33;
               return idGenerator.configure({
                 biz: businessCode,
                 config: {
@@ -454,18 +457,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   shopOrderPrefix: shopOrderPrefix
                 }
               });
-            case 31:
-              _context5.next = 36;
-              break;
             case 33:
-              _context5.prev = 33;
-              _context5.t1 = _context5["catch"](28);
+              _context5.next = 38;
+              break;
+            case 35:
+              _context5.prev = 35;
+              _context5.t1 = _context5["catch"](30);
               console.warn('[BookingTicket] idGenerator 配置失败', _context5.t1);
-            case 36:
+            case 38:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[1, 7], [28, 33]]);
+        }, _callee5, this, [[2, 8], [30, 35]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);
@@ -2602,16 +2605,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
               _ref19 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref19$cover = _ref19.cover, cover = _ref19$cover === void 0 ? false : _ref19$cover;
-              _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
+              _context31.next = 3;
+              return _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
                 cover: cover
               });
-              if (!(params !== null && params !== void 0 && params.businessCode)) {
-                _context31.next = 5;
+            case 3:
+              if (!((params === null || params === void 0 ? void 0 : params.businessCode) !== undefined || (params === null || params === void 0 ? void 0 : params.business_code) !== undefined)) {
+                _context31.next = 6;
                 break;
               }
-              _context31.next = 5;
+              _context31.next = 6;
               return this.configureIdGeneratorFromOpenData();
-            case 5:
+            case 6:
             case "end":
               return _context31.stop();
           }

package/dist/solution/ScanOrder/index.js

@@ -41,6 +41,10 @@ import { composeLinePrice, createUuidV4, getProductSkuOptions, normalizeSubmitCo
 import dayjs from 'dayjs';
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
+function isItemRewardProductDiscount(discount) {
+  var _discount$metadata, _discount$metadata2;
+  return (discount === null || discount === void 0 ? void 0 : discount.type) === 'product' && (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.source) === 'promotion' && (discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.actionType) === 'ITEM_REWARD';
+}
 export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ScanOrderImpl, _BaseModule);
   var _super = _createSuper(ScanOrderImpl);
@@ -1177,7 +1181,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator3.s();
             case 19:
               if ((_step3 = _iterator3.n()).done) {
-                _context15.next = 33;
+                _context15.next = 36;
                 break;
               }
               product = _step3.value;
@@ -1185,8 +1189,15 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 _context15.next = 23;
                 break;
               }
-              return _context15.abrupt("continue", 31);
+              return _context15.abrupt("continue", 34);
             case 23:
+              if (!(product.discount_list || []).some(isItemRewardProductDiscount)) {
+                _context15.next = 26;
+                break;
+              }
+              product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
+              return _context15.abrupt("continue", 34);
+            case 26:
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
                 var rid = (_pd$discount$resource = (_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) !== null && _pd$discount$resource !== void 0 ? _pd$discount$resource : pd.id;
@@ -1210,47 +1221,47 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 31:
+            case 34:
               _context15.next = 19;
               break;
-            case 33:
-              _context15.next = 38;
+            case 36:
+              _context15.next = 41;
               break;
-            case 35:
-              _context15.prev = 35;
-              _context15.t0 = _context15["catch"](17);
-              _iterator3.e(_context15.t0);
             case 38:
               _context15.prev = 38;
-              _iterator3.f();
-              return _context15.finish(38);
+              _context15.t0 = _context15["catch"](17);
+              _iterator3.e(_context15.t0);
             case 41:
+              _context15.prev = 41;
+              _iterator3.f();
+              return _context15.finish(41);
+            case 44:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context15.next = 44;
+              _context15.next = 47;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 44:
+            case 47:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context15.next = 47;
+              _context15.next = 50;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 47:
+            case 50:
               this.store.order.persistTempOrder();
               this.logMethodSuccess('setDiscountSelected', params);
-              _context15.next = 55;
+              _context15.next = 58;
               break;
-            case 51:
-              _context15.prev = 51;
+            case 54:
+              _context15.prev = 54;
               _context15.t1 = _context15["catch"](1);
               this.logMethodError('setDiscountSelected', _context15.t1);
               throw _context15.t1;
-            case 55:
+            case 58:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 51], [17, 35, 38, 41]]);
+        }, _callee15, this, [[1, 54], [17, 38, 41, 44]]);
       }));
       function setDiscountSelected(_x8) {
         return _setDiscountSelected.apply(this, arguments);

package/dist/solution/VenueBooking/index.js

@@ -51,6 +51,10 @@ import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
 export * from "./types";
 var OPEN_DATA_SECTION_CODES = ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow', 'checkout'];
+function isItemRewardProductDiscount(discount) {
+  var _discount$metadata, _discount$metadata2;
+  return (discount === null || discount === void 0 ? void 0 : discount.type) === 'product' && (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.source) === 'promotion' && (discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.actionType) === 'ITEM_REWARD';
+}
 function cloneCustomDepositData(customDepositData) {
   if (!customDepositData || _typeof(customDepositData) !== 'object') return undefined;
   return _objectSpread(_objectSpread({}, customDepositData), {}, {
@@ -2163,7 +2167,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator14.s();
             case 21:
               if ((_step14 = _iterator14.n()).done) {
-                _context21.next = 35;
+                _context21.next = 38;
                 break;
               }
               product = _step14.value;
@@ -2171,8 +2175,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _context21.next = 25;
                 break;
               }
-              return _context21.abrupt("continue", 33);
+              return _context21.abrupt("continue", 36);
             case 25:
+              if (!(product.discount_list || []).some(isItemRewardProductDiscount)) {
+                _context21.next = 28;
+                break;
+              }
+              product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
+              return _context21.abrupt("continue", 36);
+            case 28:
               // 1. 把 product.discount_list 和当前选中的 discount 对齐（剔除已取消的券）
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
@@ -2197,36 +2208,36 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 33:
+            case 36:
               _context21.next = 21;
               break;
-            case 35:
-              _context21.next = 40;
+            case 38:
+              _context21.next = 43;
               break;
-            case 37:
-              _context21.prev = 37;
-              _context21.t0 = _context21["catch"](19);
-              _iterator14.e(_context21.t0);
             case 40:
               _context21.prev = 40;
-              _iterator14.f();
-              return _context21.finish(40);
+              _context21.t0 = _context21["catch"](19);
+              _iterator14.e(_context21.t0);
             case 43:
+              _context21.prev = 43;
+              _iterator14.f();
+              return _context21.finish(43);
+            case 46:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context21.next = 46;
+              _context21.next = 49;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 46:
+            case 49:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
               afterApplyTarget = this.store.order.getDiscountList().find(function (d) {
                 return d.id === params.discountId;
               }) || null;
-              _context21.next = 50;
+              _context21.next = 53;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 50:
+            case 53:
               this.store.order.persistTempOrder();
               finalSummary = ((_this$store$order$get = this.store.order.getTempOrder()) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.summary) || null;
               finalProduct = ((_this$store$order$get2 = this.store.order.getTempOrder()) === null || _this$store$order$get2 === void 0 || (_this$store$order$get2 = _this$store$order$get2.products) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2[0]) || null;
@@ -2235,16 +2246,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.id === params.discountId;
               }) || null;
               return _context21.abrupt("return", this.store.order.getDiscountList());
-            case 58:
-              _context21.prev = 58;
+            case 61:
+              _context21.prev = 61;
               _context21.t1 = _context21["catch"](1);
               this.logMethodError('setDiscountSelected', _context21.t1);
               throw _context21.t1;
-            case 62:
+            case 65:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[1, 58], [19, 37, 40, 43]]);
+        }, _callee21, this, [[1, 61], [19, 40, 43, 46]]);
       }));
       function setDiscountSelected(_x15) {
         return _setDiscountSelected.apply(this, arguments);

package/lib/model/strategy/adapter/promotion/adapter.d.ts

@@ -48,6 +48,10 @@ export declare class PromotionAdapter implements BusinessAdapter {
      * 解析 买X送Y Action
      */
     private parseBuyXGetYFreeAction;
+    /**
+     * 解析 商品奖励 Action
+     */
+    private parseItemRewardAction;
     /**
      * 获取适用的商品列表
      *