@pisell/pisellos 2.2.277 → 2.2.800

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

@@ -3,7 +3,6 @@ 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。
@@ -17,62 +16,11 @@ 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';
@@ -439,10 +387,8 @@ export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 /** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
-    /** 卡券已加入 Promotion；false 时可能是无效、过期或已使用。 */
-    isAccepted?: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；Holder 补全等流程可从这里读取原始卡券。 */
+    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
     scannedDiscountList?: Discount[];
 }

package/dist/solution/BaseSales/types.js

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

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

@@ -78,7 +78,6 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
-    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -268,8 +267,7 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
- *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
+ * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
  * 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,50 +116,24 @@ 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。
+ * 写入/清除促销 discount_list（type=promotion）。
  *
  * 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, options) {
+function updatePromotionDiscountList(item, promotionDiscount) {
   var discountList = Array.isArray(item.discount_list) ? _toConsumableArray(item.discount_list) : [];
   discountList = discountList.filter(function (d) {
-    return !isManagedPromotionDiscountItem(d);
+    return (d === null || d === void 0 ? void 0 : d.type) !== 'promotion';
   });
   if (promotionDiscount) {
-    var discountType = (options === null || options === void 0 ? void 0 : options.discountType) || 'promotion';
-    discountList.push(_objectSpread({
-      type: discountType,
+    discountList.push({
+      type: 'promotion',
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
@@ -167,12 +141,7 @@ function updatePromotionDiscountList(item, promotionDiscount, options) {
         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;
@@ -180,19 +149,11 @@ function updatePromotionDiscountList(item, promotionDiscount, options) {
     delete item.discount_list;
   }
 }
-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;
-    });
-  });
-}
+var X_ITEMS_FOR_Y_PRICE = 'X_ITEMS_FOR_Y_PRICE';
+var BUY_X_GET_Y_FREE = 'BUY_X_GET_Y_FREE';
 
 /**
- * 将促销单价写入 OrderProduct（含 metadata 三字段 + 行内折扣）。
+ * 将促销单价写入 OrderProduct（含 metadata 三字段 + promotion discount_list）。
  *
  * @example
  * applyPromoUnitPriceToLine(newItem, { promoUnitPrice: '5.00', originalBasePrice: 1, strategyTitle: '2 for 10' });
@@ -223,9 +184,6 @@ 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);
@@ -518,11 +476,11 @@ function getProductBundleForEvaluator(product) {
  * // => 单行 num=4，清除 _promotion 后重新评估
  */
 export function buildConsolidateKeyForPromotion(item) {
-  var _item$booking_uid, _item$metadata4, _item$order_detail_id, _item$product_variant3;
+  var _item$booking_uid, _item$metadata, _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$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.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$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.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;
@@ -543,11 +501,12 @@ 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 = wasInPromotionBeforeEvaluation(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 existing = groups.get(key);
       if (!existing) {
         var mergedItem = cloneDeep(item);
@@ -644,9 +603,6 @@ 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（仅评估期使用）。
@@ -667,7 +623,6 @@ 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
@@ -875,9 +830,6 @@ 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;
 }
 
@@ -1037,8 +989,7 @@ export function appendPromotionTags(products, evaluator) {
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
- *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
+ * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`
@@ -1068,7 +1019,6 @@ 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 = [];
@@ -1085,18 +1035,11 @@ export function processCartPromotion(list, evaluator, options) {
         item: item,
         originalListIndex: i
       });
-    } else if (isBookingEditProductLine(item)) {
-      if (shouldIncludeEditProductsForItemReward) {
-        mainProductsWithIndex.push({
-          item: item,
-          originalListIndex: i
-        });
-      } else {
-        editProductsWithIndex.push({
-          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 {
       mainProductsWithIndex.push({
         item: item,
@@ -1151,17 +1094,16 @@ 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$metadata5, _item$num;
+    var _item$product_id, _item$product_variant5, _item$metadata3, _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$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.product_name) || (item === null || item === void 0 ? void 0 : item.title) || '',
+      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) || '',
       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),
-      _promotionOnlyForItemReward: isBookingEditProductLine(item)
+      bundle: getProductBundleForEvaluator(item)
     };
   });
   for (var _i = 0; _i < consolidatedMainProductsWithIndex.length; _i++) {
@@ -1269,7 +1211,7 @@ export function processCartPromotion(list, evaluator, options) {
     _step20;
   try {
     for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-      var _priced$originalId2, _priced$product_id, _originalItem$product;
+      var _priced$originalId2, _priced$product_id, _originalItem$product, _metadata$_promotion2;
       var _priced = _step20.value;
       var rawSourceId = (_priced$originalId2 = _priced.originalId) !== null && _priced$originalId2 !== void 0 ? _priced$originalId2 : _priced.id;
       var _sourceId = Number(rawSourceId);
@@ -1288,7 +1230,7 @@ export function processCartPromotion(list, evaluator, options) {
       newItem._sourceCartNum = sourceCartNum;
 
       // 清掉历史促销字段
-      var wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
+      var wasInPromotion = ((_metadata$_promotion2 = metadata._promotion) === null || _metadata$_promotion2 === void 0 ? void 0 : _metadata$_promotion2.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
       delete metadata._promotion;
       if (Array.isArray(newItem.product_bundle)) {
         var _iterator23 = _createForOfIteratorHelper(newItem.product_bundle),
@@ -1309,13 +1251,12 @@ export function processCartPromotion(list, evaluator, options) {
       var priceUnchangedPromo = _priced.inPromotion && Number(_priced.finalPrice) === Number(originalBasePrice);
       if (shouldModifyPrice) {
         if (_priced.inPromotion && !priceUnchangedPromo) {
-          var _priced$strategyMetad, _strategyActionMap$ge;
+          var _priced$strategyMetad;
           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,
-            actionType: _priced.strategyId ? (_strategyActionMap$ge = strategyActionMap.get(_priced.strategyId)) === null || _strategyActionMap$ge === void 0 ? void 0 : _strategyActionMap$ge.actionType : undefined
+            strategyTitle: (_priced$strategyMetad = _priced.strategyMetadata) === null || _priced$strategyMetad === void 0 ? void 0 : _priced$strategyMetad.name
           });
         } else {
           // 撤销上一轮促销：还原 selling_price 到 main_product_original_price 派生值

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

@@ -82,13 +82,8 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
-export interface ISalesPaymentMetadata extends Record<string, any> {
-    /** 刷卡机设备快照；OS 不解析内部字段 */
-    card_reader_snapshot?: Record<string, unknown>;
-}
 export interface ISalesPayment {
     order_payment_id?: number | null;
-    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -100,7 +95,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: ISalesPaymentMetadata | null;
+    metadata?: Record<string, any> | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {

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

@@ -104,7 +104,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -116,14 +116,11 @@ export function transformBaseProductToOrderProduct(params) {
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   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 hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
-  // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
-  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
-  var catalogSourcePrice = (_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_matchedVariant$price = matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _matchedVariant$price !== void 0 ? _matchedVariant$price : 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;
-  var sourceProductPrice = toPriceString(hasPriceOverride ? (_ref21 = catalogSourcePrice !== null && catalogSourcePrice !== void 0 ? catalogSourcePrice : payload.price) !== null && _ref21 !== void 0 ? _ref21 : payload.selling_price : (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : catalogSourcePrice, '0.00');
+  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 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);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
@@ -193,7 +190,7 @@ export function transformBaseProductToOrderProduct(params) {
   }
   // 从源头补充商品多语言标题
   var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
-    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
   return {
     product_id: productId,

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

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

@@ -46,8 +46,6 @@ 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;
@@ -191,12 +189,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     getCustomer(): ICustomer | null;
     /**
-     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
-     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
+     * 通过 ids 获取商品列表（不加载到模块中）
+     * @returns 商品列表
      */
-    getProductByIds(ids: number[], options?: {
-        loadMissing?: boolean;
-    }): Promise<ProductData[]>;
+    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
     /**
      * 获取日程时间段点
      * @param params 参数
@@ -326,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 客户状态
@@ -445,19 +441,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**