@pisell/pisellos 2.2.246 → 2.2.248

package/dist/modules/Order/types.d.ts

@@ -34,6 +34,7 @@ export interface OrderPromotionEvaluator {
         products: any[];
         channel?: string;
     }, matchVariant?: boolean): any[];
+    getStrategyConfigs?: () => unknown[];
 }
 /** 赠品解析回调 context（OS → SDK 的请求体） */
 export interface OrderGiftSelectContext {

package/dist/modules/Payment/walletpass.js

@@ -283,7 +283,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: 1
               }); // 并行获取用户识别码列表和订单详情
               _context3.next = 4;
-              return Promise.all([this.getUserIdentificationCodeListAsync(identificationParams), baseParams.payment_order_id ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)]);
+              return Promise.all([this.getUserIdentificationCodeListAsync(identificationParams), baseParams.payment_order_id && typeof baseParams.payment_order_id === 'string' && !baseParams.payment_order_id.startsWith('LOCAL_') ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)]);
             case 4:
               _yield$Promise$all = _context3.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);

package/dist/server/utils/small-ticket.d.ts

@@ -35,6 +35,7 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    discount_list?: any[];
     options?: Array<{
         name: string;
         num?: number;

package/dist/server/utils/small-ticket.js

@@ -1,13 +1,13 @@
+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 _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); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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 _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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-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 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; }
@@ -38,8 +38,11 @@ var LABELS = {
     remainingPoints: 'Remaining points',
     table: 'Table',
     orderDiscount: 'Order discount',
+    manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
-    rounding: 'Rounding'
+    rounding: 'Rounding',
+    gross: 'Gross',
+    tare: 'Tare'
   },
   zh_CN: {
     contactName: '联系人姓名',
@@ -61,8 +64,11 @@ var LABELS = {
     remainingPoints: '剩余积分',
     table: '桌台',
     orderDiscount: '整单折扣',
+    manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
-    rounding: '抹零'
+    rounding: '抹零',
+    gross: '重量',
+    tare: '去皮'
   },
   zh_HK: {
     contactName: '聯絡人姓名',
@@ -84,8 +90,11 @@ var LABELS = {
     remainingPoints: '剩餘積分',
     table: '桌台',
     orderDiscount: '整單折扣',
+    manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
-    rounding: '抹零'
+    rounding: '抹零',
+    gross: '重量',
+    tare: '去皮'
   }
 };
 export function buildSmallTicketData(params) {
@@ -197,14 +206,29 @@ function buildProducts(order, locale, productMap) {
       parentProduct: parentProduct,
       locale: locale
     });
-    return _objectSpread(_objectSpread(_objectSpread({
+    var extensionList = buildProductExtensionList({
+      product: product,
+      locale: locale,
+      currencySymbol: currencySymbol,
+      quantity: quantity,
+      originalPrice: originalPrice
+    });
+    var discountList = normalizeProductDiscounts({
+      product: product,
+      locale: locale,
+      currencySymbol: currencySymbol,
+      quantity: quantity
+    });
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
-      extension_list: Array.isArray(product.extension_list) ? product.extension_list : []
-    }, options.length ? {
+      extension_list: extensionList
+    }, discountList.length ? {
+      discount_list: discountList
+    } : {}), options.length ? {
       options: options
     } : {}), resolvedVariant ? {
       variant: resolvedVariant
@@ -215,6 +239,99 @@ function buildProducts(order, locale, productMap) {
     } : {});
   });
 }
+function normalizeProductDiscounts(params) {
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol,
+    quantity = params.quantity;
+  return normalizeArray(product.discount_list).map(function (discount) {
+    var _ref8, _discount$amount;
+    var title = resolveDiscountTitleWithPercent(discount, locale);
+    var amount = (_ref8 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref8 !== void 0 ? _ref8 : discount.discount_amount;
+    var formattedAmount = formatNegativeMoney(new Decimal(toMoneyNumber(amount)).mul(quantity), currencySymbol);
+    return _objectSpread(_objectSpread({}, discount), {}, {
+      item: title,
+      name: title,
+      title: title,
+      value: formattedAmount
+    });
+  });
+}
+function buildProductExtensionList(params) {
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol,
+    quantity = params.quantity,
+    originalPrice = params.originalPrice;
+  var extensionList = [].concat(_toConsumableArray(buildProductOpenWeightRows({
+    product: product,
+    locale: locale,
+    currencySymbol: currencySymbol
+  })), _toConsumableArray(quantity > 1 ? [{
+    item: buildProductQuantityPriceText({
+      quantity: quantity,
+      currencySymbol: currencySymbol,
+      price: originalPrice
+    }),
+    value: ''
+  }] : []));
+  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+}
+function buildProductOpenWeightRows(params) {
+  var _productSku$unit, _productSku$net_weigh, _productSku$unit_pric;
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  var productSku = product.product_sku || {};
+  if (productSku.open_sold_weight != 1) return [];
+  var unit = (_productSku$unit = productSku.unit) !== null && _productSku$unit !== void 0 ? _productSku$unit : '';
+  var manualFlag = productSku.weight_source === 'manual' ? '(M) ' : '';
+  var hasTare = toNumber(productSku.tare_weight, 0) > 0;
+  var rows = [];
+  if (hasTare) {
+    var _productSku$weight;
+    rows.push({
+      item: "".concat(manualFlag).concat(label(locale, 'gross'), ": ").concat((_productSku$weight = productSku.weight) !== null && _productSku$weight !== void 0 ? _productSku$weight : 0).concat(unit),
+      value: ''
+    });
+    rows.push({
+      item: "".concat(label(locale, 'tare'), ": ").concat(productSku.tare_weight).concat(unit),
+      value: ''
+    });
+  }
+  var netWeight = (_productSku$net_weigh = productSku.net_weight) !== null && _productSku$net_weigh !== void 0 ? _productSku$net_weigh : 0;
+  var unitPrice = (_productSku$unit_pric = productSku.unit_price) !== null && _productSku$unit_pric !== void 0 ? _productSku$unit_pric : 0;
+  var netItem = "".concat(netWeight, " ").concat(unit, " NET @ ").concat(currencySymbol).concat(unitPrice, "/").concat(unit);
+  rows.push({
+    item: hasTare ? netItem : "".concat(manualFlag).concat(netItem),
+    value: ''
+  });
+  return rows;
+}
+function buildProductQuantityPriceText(params) {
+  var quantity = params.quantity,
+    currencySymbol = params.currencySymbol,
+    price = params.price;
+  return "".concat(quantity, " @ ").concat(currencySymbol).concat(stringify(price), " EACH");
+}
+function resolveDiscountTitleWithPercent(discount, locale) {
+  var _discount$discount, _discount$discount$di, _discount$discount2;
+  var title = resolveDiscountTitle(discount, locale);
+  var percentRaw = (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.percent;
+  var cardType = (_discount$discount$di = (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.discount_card_type) !== null && _discount$discount$di !== void 0 ? _discount$discount$di : 'percent';
+  var percent = percentRaw !== undefined && percentRaw !== null ? Math.trunc(Number(percentRaw)) : NaN;
+  if (percentRaw === undefined || percentRaw === null) return title;
+  if (cardType !== 'percent') return title;
+  if (Number.isNaN(percent)) return title;
+  return "".concat(title, " (").concat(percent, "%)");
+}
+function resolveDiscountTitle(discount, locale) {
+  var _ref9, _ref10, _ref11, _ref12, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
+  var title = getLocalizedValue((_ref9 = (_ref10 = (_ref11 = (_ref12 = (_discount$discount$na = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.title) !== null && _ref12 !== void 0 ? _ref12 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref11 !== void 0 ? _ref11 : discount.name) !== null && _ref10 !== void 0 ? _ref10 : discount.title) !== null && _ref9 !== void 0 ? _ref9 : discount.message, locale);
+  if (title) return title;
+  if (discount.type === 'product') return label(locale, 'manualDiscount');
+  return '';
+}
 function resolveProductTitle(params) {
   var _product$product_id2;
   var product = params.product,
@@ -235,9 +352,9 @@ function normalizeProductOptions(params) {
     parentProduct = params.parentProduct;
   var rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) ? product.product_sku.option : [];
   return rawOptions.map(function (option) {
-    var _ref8, _option$original_pric, _ref9, _option$value, _option$num;
-    var price = (_ref8 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref8 !== void 0 ? _ref8 : option.price;
-    var value = (_ref9 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref9 !== void 0 ? _ref9 : option.item;
+    var _ref13, _option$original_pric, _ref14, _option$value, _option$num;
+    var price = (_ref13 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref13 !== void 0 ? _ref13 : option.price;
+    var value = (_ref14 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref14 !== void 0 ? _ref14 : option.item;
     var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option: option,
       parentProduct: parentProduct,
@@ -262,7 +379,7 @@ function normalizeProductCombinations(params) {
     parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
-    var _ref10, _bundle$num;
+    var _ref15, _bundle$num;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -279,14 +396,14 @@ function normalizeProductCombinations(params) {
     var optionTitle = buildOptionTitleSuffix(combinationsOptions);
     return {
       product_title: "".concat(baseTitle).concat(optionTitle),
-      product_quantity: toNumber((_ref10 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref10 !== void 0 ? _ref10 : 1, 1),
+      product_quantity: toNumber((_ref15 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref15 !== void 0 ? _ref15 : 1, 1),
       price: formatBundlePrice(bundle, currencySymbol),
       combinations_options: combinationsOptions
     };
   });
 }
 function resolveBundleProductTitle(params) {
-  var _ref11, _ref12, _bundle$bundle_produc;
+  var _ref16, _ref17, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
     locale = params.locale,
@@ -299,7 +416,7 @@ function resolveBundleProductTitle(params) {
   });
   var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
-  var productId = (_ref11 = (_ref12 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref12 !== void 0 ? _ref12 : bundle.product_id) !== null && _ref11 !== void 0 ? _ref11 : bundle.id;
+  var productId = (_ref16 = (_ref17 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref17 !== void 0 ? _ref17 : bundle.product_id) !== null && _ref16 !== void 0 ? _ref16 : bundle.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
   return getProductTitleSource(fallbackProduct, locale);
@@ -351,10 +468,10 @@ function resolveVariantTextFromSkuKey(params) {
 }
 function resolveVariantTextFromNameMap(params) {
   if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
-  return Object.entries(params.nameMap).map(function (_ref13) {
-    var _ref14 = _slicedToArray(_ref13, 2),
-      groupPositionId = _ref14[0],
-      value = _ref14[1];
+  return Object.entries(params.nameMap).map(function (_ref18) {
+    var _ref19 = _slicedToArray(_ref18, 2),
+      groupPositionId = _ref19[0],
+      value = _ref19[1];
     var group = resolveVariantGroup(params.parentProduct, groupPositionId);
     if (!group) return '';
     var groupName = getLocalizedValue(group.name, params.locale);
@@ -388,12 +505,12 @@ function getProductTitleSource(source, locale) {
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref15, _ref16, _ref17, _ref18, _value$locale;
+  var _ref20, _ref21, _ref22, _ref23, _value$locale;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref15 = (_ref16 = (_ref17 = (_ref18 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref18 !== void 0 ? _ref18 : value[underscoredLocale]) !== null && _ref17 !== void 0 ? _ref17 : value.original) !== null && _ref16 !== void 0 ? _ref16 : value.auto) !== null && _ref15 !== void 0 ? _ref15 : '');
+  return stringify((_ref20 = (_ref21 = (_ref22 = (_ref23 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref23 !== void 0 ? _ref23 : value[underscoredLocale]) !== null && _ref22 !== void 0 ? _ref22 : value.original) !== null && _ref21 !== void 0 ? _ref21 : value.auto) !== null && _ref20 !== void 0 ? _ref20 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -411,17 +528,17 @@ function flattenOptionItems(parentProduct) {
   return optionGroups.flatMap(function (group) {
     var items = normalizeArray(group.option_item || group.option_items || group.option || group.options || group.items || group.children || group.product_option_item);
     return items.map(function (item) {
-      var _ref19, _item$option_group_id;
+      var _ref24, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref19 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref19 !== void 0 ? _ref19 : group.option_group_id
+        option_group_id: (_ref24 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref24 !== void 0 ? _ref24 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref20, _option$option_group_, _ref21, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref20 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref20 !== void 0 ? _ref20 : option.id;
-  var itemId = (_ref21 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref21 !== void 0 ? _ref21 : item.id;
+  var _ref25, _option$option_group_, _ref26, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref25 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref25 !== void 0 ? _ref25 : option.id;
+  var itemId = (_ref26 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref26 !== void 0 ? _ref26 : item.id;
   if (!isSameId(optionItemId, itemId)) return false;
   var optionGroupId = (_option$option_group_2 = option.option_group_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option.group_id;
   var itemGroupId = (_item$option_group_id2 = item.option_group_id) !== null && _item$option_group_id2 !== void 0 ? _item$option_group_id2 : item.group_id;
@@ -431,16 +548,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref22, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref24, _bundle$bundle_produc2;
+  var _ref27, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref29, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref22 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref22 !== void 0 ? _ref22 : bundle.product_variant_id;
+  var bundleVariantId = (_ref27 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref27 !== void 0 ? _ref27 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref23, _item$bundle_variant_;
-      return isSameId((_ref23 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref23 !== void 0 ? _ref23 : item.product_variant_id, bundleVariantId);
+      var _ref28, _item$bundle_variant_;
+      return isSameId((_ref28 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref28 !== void 0 ? _ref28 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -453,18 +570,18 @@ function resolveBundleItemFromParentProduct(params) {
     if (matchedByBundleId) return matchedByBundleId;
   }
   var bundleGroupId = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id;
-  var bundleProductId = (_ref24 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : bundle.product_id;
+  var bundleProductId = (_ref29 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref29 !== void 0 ? _ref29 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref25, _item$bundle_product_;
-      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref25 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref25 !== void 0 ? _ref25 : item.product_id, bundleProductId);
+      var _item$group_id, _ref30, _item$bundle_product_;
+      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref30 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref26, _item$bundle_product_2;
-      return isSameId((_ref26 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref26 !== void 0 ? _ref26 : item.product_id, bundleProductId);
+      var _ref31, _item$bundle_product_2;
+      return isSameId((_ref31 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref31 !== void 0 ? _ref31 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -474,9 +591,9 @@ function flattenBundleItems(parentProduct) {
   return bundleGroups.flatMap(function (group) {
     var items = Array.isArray(group.bundle_item) ? group.bundle_item : [];
     return items.map(function (item) {
-      var _ref27, _item$group_id2;
+      var _ref32, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref27 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref27 !== void 0 ? _ref27 : group.group_id
+        group_id: (_ref32 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref32 !== void 0 ? _ref32 : group.group_id
       });
     });
   });
@@ -502,14 +619,15 @@ function buildOptionTitleSuffix(options) {
   return text ? "(".concat(text, ")") : '';
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref28, _ref29, _bundle$bundle_sellin;
-  var value = (_ref28 = (_ref29 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref29 !== void 0 ? _ref29 : bundle.price) !== null && _ref28 !== void 0 ? _ref28 : 0;
+  var _ref33, _ref34, _bundle$bundle_sellin;
+  var value = (_ref33 = (_ref34 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref34 !== void 0 ? _ref34 : bundle.price) !== null && _ref33 !== void 0 ? _ref33 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
   return formatMoney(amount, currencySymbol);
 }
 function buildFees(params) {
+  var _ref36, _order$shop_discount, _ref37, _summary$product_orig;
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale,
@@ -518,20 +636,20 @@ function buildFees(params) {
     currencySymbol = params.currencySymbol;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref30, _surcharge$amount;
+    var _ref35, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref30 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref30 !== void 0 ? _ref30 : surcharge.total_amount;
+    var value = (_ref35 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref35 !== void 0 ? _ref35 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
       value: formatMoney(value, currencySymbol)
     });
   }
-  var discountAmount = summary.discount_amount || order.discount_amount || order.shop_discount;
+  var discountAmount = (_ref36 = (_order$shop_discount = order.shop_discount) !== null && _order$shop_discount !== void 0 ? _order$shop_discount : summary.discount_amount) !== null && _ref36 !== void 0 ? _ref36 : order.discount_amount;
   if (isNonZero(discountAmount)) {
     fees.push({
       item: label(locale, 'orderDiscount'),
-      value: formatMoney(new Decimal(toMoneyNumber(discountAmount)).neg(), currencySymbol)
+      value: formatNegativeMoney(discountAmount, currencySymbol)
     });
   }
   var taxFee = summary.tax_fee || order.tax_fee;
@@ -555,11 +673,14 @@ function buildFees(params) {
       value: formatMoney(payProcessingFee, currencySymbol)
     });
   }
+  var productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
+  var productOriginalAmount = (_ref37 = (_summary$product_orig = summary.product_original_amount) !== null && _summary$product_orig !== void 0 ? _summary$product_orig : order.product_original_amount) !== null && _ref37 !== void 0 ? _ref37 : productExpectAmount;
+  var totalSavingsAmount = new Decimal(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees: fees,
     countFee: _objectSpread(_objectSpread(_objectSpread(_objectSpread({
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
-      product_expect_amount: formatMoney(summary.product_expect_amount || summary.product_amount || order.product_expect_amount, currencySymbol),
+      product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(summary.product_quantity || products.reduce(function (sum, product) {
         return sum + product.product_quantity;
@@ -570,8 +691,8 @@ function buildFees(params) {
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol)
     }, isNonZero(roundingAmount) ? {
       rounding_amount: formatMoney(roundingAmount, currencySymbol)
-    } : {}), isNonZero(discountAmount) ? {
-      order_total_discount: formatMoney(discountAmount, currencySymbol)
+    } : {}), isNonZero(totalSavingsAmount) ? {
+      order_total_discount: formatMoney(totalSavingsAmount, currencySymbol)
     } : {}), isNonZero(payProcessingFee) ? {
       pay_processing_fee: formatMoney(payProcessingFee, currencySymbol)
     } : {}), isNonZero(taxFee) ? {
@@ -655,8 +776,8 @@ function buildPaymentData(params) {
         currencySymbol: params.currencySymbol
       })));
     } else {
-      var _ref31, _payment$remaining_am, _payment$metadata;
-      var remainingAmount = (_ref31 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref31 !== void 0 ? _ref31 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+      var _ref38, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref38 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref38 !== void 0 ? _ref38 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
       if (remainingAmount !== undefined && remainingAmount !== null) {
         items.push({
           item: label(params.locale, 'remainingAmount'),
@@ -764,11 +885,12 @@ function label(locale, key) {
   return ((_LABELS$locale = LABELS[locale]) === null || _LABELS$locale === void 0 ? void 0 : _LABELS$locale[key]) || LABELS.en[key] || key;
 }
 function getLocalizedValue(value, locale) {
-  var _ref32, _ref33, _ref34, _value$locale2;
+  var _ref39, _ref40, _ref41, _ref42, _ref43, _ref44, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
-  return stringify((_ref32 = (_ref33 = (_ref34 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref34 !== void 0 ? _ref34 : value.default) !== null && _ref33 !== void 0 ? _ref33 : value.en) !== null && _ref32 !== void 0 ? _ref32 : '');
+  var underscoredLocale = locale.replace('-', '_');
+  return stringify((_ref39 = (_ref40 = (_ref41 = (_ref42 = (_ref43 = (_ref44 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref44 !== void 0 ? _ref44 : value[underscoredLocale]) !== null && _ref43 !== void 0 ? _ref43 : value.original) !== null && _ref42 !== void 0 ? _ref42 : value.auto) !== null && _ref41 !== void 0 ? _ref41 : value.default) !== null && _ref40 !== void 0 ? _ref40 : value.en) !== null && _ref39 !== void 0 ? _ref39 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();
@@ -793,6 +915,10 @@ function formatMoney(value, currencySymbol) {
   var amount = new Decimal(toMoneyNumber(value));
   return "".concat(currencySymbol).concat(amount.toFixed(2));
 }
+function formatNegativeMoney(value, currencySymbol) {
+  var amount = new Decimal(toMoneyNumber(value)).abs();
+  return "-".concat(currencySymbol).concat(amount.toFixed(2));
+}
 function calculateReceiptPaidAmount(order, summary) {
   var _summary$pay_service_, _summary$total_amount;
   var paidAmount = sumPayments(order.payments);

package/dist/solution/BaseSales/index.js

@@ -63,6 +63,9 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function isBaseSalesHistoricalDiscountEntry(discount) {
+  return Boolean((discount === null || discount === void 0 ? void 0 : discount.isEditMode) || (discount === null || discount === void 0 ? void 0 : discount.isDisabled) || (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) != null);
+}
 function getBaseSalesUniqueArrayMetadataKey(key) {
   if (key === 'products' || key === 'bookings') return 'unique_identification_number';
   if (key === 'payments' || key === 'payment') return 'unique_payment_number';
@@ -1322,7 +1325,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return discount.id;
       }));
       return [].concat(_toConsumableArray(historyDiscountList), _toConsumableArray((discountList || []).filter(function (discount) {
-        return !historyIds.has(discount.id);
+        if (!historyIds.has(discount.id)) return true;
+        return !isBaseSalesHistoricalDiscountEntry(discount);
       })));
     }
   }, {
@@ -1347,11 +1351,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "mergeCurrentDiscountSelectionState",
     value: function mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
       if (!currentDiscountList.length) return discountList;
-      var currentDiscountMap = new Map(currentDiscountList.map(function (discount) {
-        return [discount.id, discount];
-      }));
+      var currentDiscountMap = new Map();
+      currentDiscountList.forEach(function (discount) {
+        currentDiscountMap.set("".concat(discount.id, ":").concat(isBaseSalesHistoricalDiscountEntry(discount) ? 'historical' : 'runtime'), discount);
+      });
       return discountList.map(function (discount) {
-        var currentDiscount = currentDiscountMap.get(discount.id);
+        var currentDiscount = currentDiscountMap.get("".concat(discount.id, ":").concat(isBaseSalesHistoricalDiscountEntry(discount) ? 'historical' : 'runtime'));
         if (!currentDiscount) return discount;
         if (currentDiscount.isManualSelect) {
           return _objectSpread(_objectSpread({}, discount), {}, {
@@ -1731,7 +1736,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 3:
               list = this.store.order.getDiscountList();
               updated = list.map(function (d) {
-                return d.id === params.discountId ? _objectSpread(_objectSpread({}, d), {}, {
+                return d.id === params.discountId && !isBaseSalesHistoricalDiscountEntry(d) ? _objectSpread(_objectSpread({}, d), {}, {
                   isSelected: params.isSelected,
                   isManualSelect: !params.isSelected
                 }) : d;

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/Order/index.d.ts

@@ -26,6 +26,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private giftSelectResolver;
     /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
     private isApplyingPromotion;
+    /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
+    private hasActiveCustomerBoundDiscount;
     /** 最近一次 applyPromotion 的未满足促销提示 */
     private lastUnfulfilledPromotions;
     /** 最近一次 applyPromotion 的赠品操作 diff（debug / SDK 读取使用） */
@@ -258,6 +260,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private productHasCustomerBoundDiscount;
+    private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
     /**
      * 更新当前 tempOrder 的客户协议字段。
@@ -476,6 +480,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
     private formatHydratedNamePair;
     private buildHydratedProductOptionString;