@pisell/pisellos 2.3.37 → 2.3.38

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

@@ -3,6 +3,7 @@ import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrde
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
+import type { PaymentMethod } from '../../modules/Payment/types';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -16,11 +17,62 @@ export declare const BaseSalesHookNames: {
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
     readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
+    readonly onWalletAssetsStateChanged: "onWalletAssetsStateChanged";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
 export type BaseSalesStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export type BaseSalesPaymentStatus = 'paid' | 'partially_paid' | 'unpaid' | 'payment_processing' | string;
+export interface BaseSalesCashPaymentConfig {
+    available: boolean;
+    paymentMethod?: PaymentMethod;
+    amountDue: number;
+    recommendedAmounts: number[];
+}
+export interface BaseSalesPayCashParams {
+    /** 实际计入订单的现金支付金额（部分支付时小于待付金额）。 */
+    amount: number;
+    /** 顾客实际交付现金；可大于 amount。 */
+    actualPaidAmount?: number;
+    changeAmount?: number;
+    roundingAmount?: number;
+}
+export interface BaseSalesPayCashResult {
+    payment: Record<string, any>;
+    payments: Record<string, any>[];
+    syncResult: Record<string, any>;
+    isOrderFullyPaid: boolean;
+}
+export interface BaseSalesCommitPaymentMethodParams {
+    /** 支付方式 id；与 paymentMethodCode 至少传一个。 */
+    paymentMethodId?: number | string;
+    /** 支付方式 code，大小写不敏感。 */
+    paymentMethodCode?: string;
+    /** 本次计入订单的支付金额。 */
+    amount: number;
+    /** 支付设备返回的原始金额；缺省时与 amount 相同。 */
+    originAmount?: number;
+    /** 支付设备返回的实际手续费配置。 */
+    serviceCharge?: {
+        amount?: string | number;
+        percentage?: string | number;
+    } | null;
+    /** 支付设备返回的唯一流水号等扩展信息。 */
+    metadata?: Record<string, any>;
+    /** 少数支付方式需要透传的额外 payment 字段。 */
+    paymentData?: Record<string, any>;
+}
+export interface BaseSalesCommitPaymentMethodResult {
+    payment: Record<string, any>;
+    payments: Record<string, any>[];
+    syncResult: Record<string, any>;
+    isOrderFullyPaid: boolean;
+}
+export interface BaseSalesConfirmWalletPaymentResult<T = Record<string, any>> {
+    submitResult: T;
+    payments: Record<string, any>[];
+    isOrderFullyPaid: boolean;
+}
 export interface BaseSalesEntryContext {
     biz: string;
     mode: 'scan' | 'append';

package/dist/solution/BaseSales/types.js

@@ -10,7 +10,8 @@ export var BaseSalesHookNames = {
   onCartValidationChanged: 'onCartValidationChanged',
   onPaymentSyncStart: 'onPaymentSyncStart',
   onPaymentSyncEnd: 'onPaymentSyncEnd',
-  onDepositPaymentSyncEnd: 'onDepositPaymentSyncEnd'
+  onDepositPaymentSyncEnd: 'onDepositPaymentSyncEnd',
+  onWalletAssetsStateChanged: 'onWalletAssetsStateChanged'
 };
 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,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/BookingByStep/index.d.ts

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

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

@@ -46,6 +46,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getIdGeneratorPlugin;
     private loadOpenDataConfig;
     getOpenData(): Promise<OpenDataConfig | null>;
+    /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
+    clearOpenDataCache(): void;
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
@@ -189,10 +191,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     getCustomer(): ICustomer | null;
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
-    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
+    getProductByIds(ids: number[], options?: {
+        loadMissing?: boolean;
+    }): Promise<ProductData[]>;
     /**
      * 获取日程时间段点
      * @param params 参数