@pisell/pisellos 2.2.260 → 2.2.261

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

@@ -14,6 +14,7 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
+    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/dist/solution/BaseSales/types.js

@@ -9,7 +9,8 @@ export var BaseSalesHookNames = {
   onRefresh: 'onRefresh',
   onCartValidationChanged: 'onCartValidationChanged',
   onPaymentSyncStart: 'onPaymentSyncStart',
-  onPaymentSyncEnd: 'onPaymentSyncEnd'
+  onPaymentSyncEnd: 'onPaymentSyncEnd',
+  onDepositPaymentSyncEnd: 'onDepositPaymentSyncEnd'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);

package/dist/solution/BaseSales/utils/cartPromotion.d.ts

@@ -78,6 +78,7 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
+    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -267,7 +268,8 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 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`

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,35 @@ 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 isManagedPromotionDiscountItem(item) {
+  var _item$metadata, _item$metadata2;
+  if ((item === null || item === void 0 ? void 0 : item.type) === 'promotion') return true;
+  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;
+}
 
 /**
- * 写入/清除促销 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 +152,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 +165,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 +208,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);
@@ -460,10 +487,10 @@ 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$metadata3, _item$order_detail_id, _item$product_variant3;
   var fingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
   var noteSignature = getProductLineNoteSignature(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$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.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;
@@ -484,12 +511,12 @@ function consolidateMainProductsForPromotion(entries) {
     _step5;
   try {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var _item$metadata2;
+      var _item$metadata4;
       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 = (item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 || (_item$metadata4 = _item$metadata4._promotion) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.inPromotion) === true;
       var existing = groups.get(key);
       if (!existing) {
         var mergedItem = cloneDeep(item);
@@ -586,6 +613,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（仅评估期使用）。
@@ -606,6 +636,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
@@ -813,6 +844,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;
 }
 
@@ -972,7 +1006,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`
@@ -1002,6 +1037,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 = [];
@@ -1018,11 +1054,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,
@@ -1077,16 +1120,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++) {
@@ -1234,12 +1278,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/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -66,7 +66,8 @@ function normalizeBundleItems(bundleItems) {
       price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
       original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
-      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     });
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
     normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);
@@ -105,7 +106,9 @@ export function transformBaseProductToOrderProduct(params) {
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
   var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
-  var lineCompositeTotal = toPriceString((_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total, sourceProductPrice);
+  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
+  var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
+  var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
@@ -148,7 +151,7 @@ export function transformBaseProductToOrderProduct(params) {
     mainPrice: 0,
     bundle: productBundle
   });
-  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -551,6 +551,14 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
+    private getDeviceTaskPlugin;
+    handlePrintWristband(params: {
+        voucher_ids: number[];
+    }): Promise<void>;
+    handleRedeem(params: {
+        voucher_ids: number[];
+        is_checkin: boolean;
+    }): Promise<any>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/dist/solution/BookingTicket/index.js

@@ -49,6 +49,7 @@ import { buildNormalProductCacheItemFromOrderLine as buildNormalProductCacheItem
 import { buildProductOptionStringFromOrderLine } from "../../modules/BookingContext/utils/orderLineDisplay";
 import { applyBookingsStatus, applyChildBookingStatus, resolveScheduleId, resolveStatusAfterTransition, restoreBookingsStatus, restoreChildBookingStatus } from "./utils/bookingStatus";
 import { resolveBestAddTimePlan as _resolveBestAddTimePlan } from "./utils/resolveBestAddTimePlan";
+import { createUuidV4 } from "../../modules/Order/utils";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 
@@ -2586,6 +2587,152 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }
       return setOtherParams;
     }()
+  }, {
+    key: "getDeviceTaskPlugin",
+    value: function getDeviceTaskPlugin() {
+      var _app$getApp;
+      var app = this.core.getPlugin('app');
+      return (app === null || app === void 0 || (_app$getApp = app.getApp()) === null || _app$getApp === void 0 ? void 0 : _app$getApp.getPlugin('deviceTask')) || null;
+    }
+
+    // 打印手环，单个或批量都可以
+  }, {
+    key: "handlePrintWristband",
+    value: function () {
+      var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var _this$getOrderIdentit;
+        var deviceTask, deviceId, idempotencyKey;
+        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
+            case 0:
+              deviceTask = this.getDeviceTaskPlugin();
+              if (deviceTask !== null && deviceTask !== void 0 && deviceTask.dispatch) {
+                _context32.next = 4;
+                break;
+              }
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handlePrintWristband: deviceTask.dispatch 不可用',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                }
+              });
+              return _context32.abrupt("return");
+            case 4:
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handlePrintWristband',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                }
+              });
+              _context32.next = 7;
+              return this.getShortNumberOrDeviceId();
+            case 7:
+              deviceId = _context32.sent;
+              idempotencyKey = createUuidV4();
+              deviceTask.dispatch({
+                action: 'print_all',
+                device_id: deviceId,
+                payload: {
+                  type: 'WRISTBAND',
+                  data: {
+                    order_id: (_this$getOrderIdentit = this.getOrderIdentity()) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.orderId,
+                    voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                  }
+                },
+                idempotency_key: idempotencyKey,
+                name: 'PRINT_WRISTBAND',
+                source: 'bookingTicket',
+                source_type: 'handlePrintWristband',
+                source_id: idempotencyKey
+              });
+            case 10:
+            case "end":
+              return _context32.stop();
+          }
+        }, _callee32, this);
+      }));
+      function handlePrintWristband(_x23) {
+        return _handlePrintWristband.apply(this, arguments);
+      }
+      return handlePrintWristband;
+    }() // 触发核销
+  }, {
+    key: "handleRedeem",
+    value: function () {
+      var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+        var _this$store$order5, _this$store$order5$ge, _this$store$order6, _ref20, _tempOrder$order_id2;
+        var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
+            case 0:
+              voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
+              status = params.is_checkin ? 'used' : 'unused';
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handleRedeem',
+                metadata: {
+                  voucher_ids: voucherIds,
+                  status: status
+                }
+              });
+              voucherIdSet = new Set(voucherIds);
+              tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getTempOrder) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getVouchers()) || [];
+              hasUpdatedVoucher = false;
+              nextVouchers = vouchers.map(function (voucher) {
+                if (!voucherIdSet.has(voucher.voucher_id)) return voucher;
+                hasUpdatedVoucher = true;
+                return _objectSpread(_objectSpread({}, voucher), {}, {
+                  status: status
+                });
+              });
+              if (!(tempOrder && hasUpdatedVoucher)) {
+                _context33.next = 11;
+                break;
+              }
+              _context33.next = 11;
+              return this.replaceTempOrder(_objectSpread(_objectSpread({}, tempOrder), {}, {
+                vouchers: nextVouchers
+              }));
+            case 11:
+              this.core.effects.emit("".concat(this.name, ":onVouchersChange"), {});
+              if (!(voucherIds.length === 0)) {
+                _context33.next = 14;
+                break;
+              }
+              return _context33.abrupt("return", {
+                code: 200,
+                status: true,
+                message: '',
+                data: []
+              });
+            case 14:
+              identity = this.getOrderIdentity();
+              externalSaleNumber = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) || undefined;
+              orderId = (_ref20 = (_tempOrder$order_id2 = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _ref20 !== void 0 ? _ref20 : undefined;
+              orderLookup = externalSaleNumber || orderId || (identity === null || identity === void 0 ? void 0 : identity.orderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopOrderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopFullOrderNumber) || undefined;
+              return _context33.abrupt("return", this.request.post('/machinecode/batch', {
+                ids: voucherIds,
+                status: status,
+                order_lookup: orderLookup,
+                order_id: orderId,
+                external_sale_number: externalSaleNumber
+              }, {
+                osServer: true
+              }));
+            case 19:
+            case "end":
+              return _context33.stop();
+          }
+        }, _callee33, this);
+      }));
+      function handleRedeem(_x24) {
+        return _handleRedeem.apply(this, arguments);
+      }
+      return handleRedeem;
+    }()
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
@@ -2593,12 +2740,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "destroy",
     value: (function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var _this$scan;
-        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              _context32.next = 2;
+              _context34.next = 2;
               return _get(_getPrototypeOf(BookingTicketImpl.prototype), "destroy", this).call(this);
             case 2:
               try {
@@ -2609,9 +2756,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               scanCache.clear();
             case 4:
             case "end":
-              return _context32.stop();
+              return _context34.stop();
           }
-        }, _callee32, this);
+        }, _callee34, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

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

@@ -83,8 +83,6 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
-    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
-    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数