@pisell/pisellos 2.2.245 → 2.2.247

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/modules/order/index.js

@@ -1063,7 +1063,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context11.abrupt("continue", 44);
             case 40:
-              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder);
+              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+                preferIncomingProducts: true
+              });
               pendingMap.delete(_storageKey);
               memoryPendingMap.delete(_storageKey);
               mergeActions[_storageKey] = 'update';
@@ -1953,7 +1955,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "mergeOrderRecords",
-    value: function mergeOrderRecords(existing, incoming) {
+    value: function mergeOrderRecords(existing, incoming, options) {
       var preferred = this.pickPreferredOrder(existing, incoming);
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
@@ -1973,6 +1975,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
+      var hasIncomingProducts = Object.prototype.hasOwnProperty.call(incomingRecord, 'products');
+      var shouldUseIncomingProductsSnapshot = (options === null || options === void 0 ? void 0 : options.preferIncomingProducts) === true && hasIncomingProducts && incomingRecord.products !== undefined && incomingRecord.products !== null;
       for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
         var _field = _incomingPatchFields[_i4];
         if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
@@ -1980,7 +1984,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
         mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
       }
-      mergedRecord.products = this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
+      mergedRecord.products = shouldUseIncomingProductsSnapshot ? cloneDeep(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }

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

@@ -38,6 +38,7 @@ var LABELS = {
     remainingPoints: 'Remaining points',
     table: 'Table',
     orderDiscount: 'Order discount',
+    manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
     rounding: 'Rounding'
   },
@@ -61,6 +62,7 @@ var LABELS = {
     remainingPoints: '剩余积分',
     table: '桌台',
     orderDiscount: '整单折扣',
+    manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
     rounding: '抹零'
   },
@@ -84,6 +86,7 @@ var LABELS = {
     remainingPoints: '剩餘積分',
     table: '桌台',
     orderDiscount: '整單折扣',
+    manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
     rounding: '抹零'
   }
@@ -197,14 +200,21 @@ function buildProducts(order, locale, productMap) {
       parentProduct: parentProduct,
       locale: locale
     });
-    return _objectSpread(_objectSpread(_objectSpread({
+    var discountList = normalizeProductDiscounts({
+      product: product,
+      locale: locale,
+      currencySymbol: currencySymbol
+    });
+    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 ? {
+    }, discountList.length ? {
+      discount_list: discountList
+    } : {}), options.length ? {
       options: options
     } : {}), resolvedVariant ? {
       variant: resolvedVariant
@@ -215,6 +225,30 @@ function buildProducts(order, locale, productMap) {
     } : {});
   });
 }
+function normalizeProductDiscounts(params) {
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  return normalizeArray(product.discount_list).map(function (discount) {
+    var _ref8, _discount$amount;
+    var title = resolveDiscountTitle(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(amount, currencySymbol);
+    return _objectSpread(_objectSpread({}, discount), {}, {
+      item: title,
+      name: title,
+      title: title,
+      value: formattedAmount
+    });
+  });
+}
+function resolveDiscountTitle(discount, locale) {
+  var _ref9, _ref10, _ref11, _ref12, _discount$discount$na, _discount$discount, _discount$discount2, _discount$discount3;
+  var title = getLocalizedValue((_ref9 = (_ref10 = (_ref11 = (_ref12 = (_discount$discount$na = (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.title) !== null && _ref12 !== void 0 ? _ref12 : (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.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 +269,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 +296,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 +313,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 +333,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 +385,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 +422,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 +445,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 +465,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 +487,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 +508,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 +536,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;
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale,
@@ -518,20 +553,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;
@@ -655,8 +690,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 _ref37, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref37 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref37 !== void 0 ? _ref37 : (_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 +799,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 _ref38, _ref39, _ref40, _ref41, _ref42, _ref43, _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((_ref38 = (_ref39 = (_ref40 = (_ref41 = (_ref42 = (_ref43 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref43 !== void 0 ? _ref43 : value[underscoredLocale]) !== null && _ref42 !== void 0 ? _ref42 : value.original) !== null && _ref41 !== void 0 ? _ref41 : value.auto) !== null && _ref40 !== void 0 ? _ref40 : value.default) !== null && _ref39 !== void 0 ? _ref39 : value.en) !== null && _ref38 !== void 0 ? _ref38 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();
@@ -793,6 +829,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/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 | 5 | 3 | 6 | 4;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "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/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -78,7 +78,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 function buildNormalProductCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const { product, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const sourcePrice = resolveSourceProductPrice(product, sourceProduct);
@@ -117,6 +117,9 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    metadata: {
+      product_add_schedule_time: (_e = product.metadata) == null ? void 0 : _e.product_add_schedule_time
+    },
     ...productOptionString ? { product_option_string: productOptionString } : {},
     ...(originExtend == null ? void 0 : originExtend.priceOverride) !== void 0 ? { priceOverride: originExtend.priceOverride } : {},
     ...(originExtend == null ? void 0 : originExtend.bundle_edit) !== void 0 ? { bundle_edit: originExtend.bundle_edit } : {}
@@ -132,7 +135,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
-    title: sourceProduct == null ? void 0 : sourceProduct.title,
+    title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? product.product_title ?? "",
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price,

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 读取使用） */
@@ -179,6 +181,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private buildOrderProductsFingerprint;
     private buildProductStructuralFingerprintItem;
     private buildOrderProductsStructuralFingerprint;
+    private getManualDepositOverride;
+    private setManualDepositOverride;
+    private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
     private restoreOriginalSnapshotIfProductsUnchanged;
@@ -255,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 的客户协议字段。
@@ -422,7 +429,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;