@pisell/pisellos 0.10.32 → 0.10.33

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/OpenData/index.d.ts

@@ -33,7 +33,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;
     getInvoiceTemplateSettings(): InvoiceTemplateSettings;
-    ensureInvoiceTemplateSettings(target: string): Promise<InvoiceTemplateSettings>;
+    ensureInvoiceTemplateSettings(target: string, openDataConfig?: OpenDataConfig): Promise<InvoiceTemplateSettings>;
     private commitInvoiceTemplateSettings;
     private resolveInvoiceTemplateSettings;
     private buildInvoiceTemplateCacheKey;

package/dist/modules/OpenData/index.js

@@ -233,39 +233,47 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "ensureInvoiceTemplateSettings",
     value: function () {
-      var _ensureInvoiceTemplateSettings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(target) {
+      var _ensureInvoiceTemplateSettings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(target, openDataConfig) {
         var normalizedTarget, config, fetchRevision, resolved;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               normalizedTarget = String(target || '').trim();
+              if (openDataConfig && openDataConfig !== this.store.data) {
+                // 部分解决方案会在初始化参数中直接收到已经拉取完成的 OpenData。
+                // 将它纳入模块状态后再解析 Document，避免为了 Invoice 重复请求 setting，
+                // 同时让后续同步 getter 能校验同一份 document id 与 target。
+                this.fetchRevision += 1;
+                this.store.data = openDataConfig;
+                this.store.lastFetchedAt = Date.now();
+              }
               config = this.store.data;
               if (!(!normalizedTarget || !config)) {
-                _context3.next = 4;
+                _context3.next = 5;
                 break;
               }
               return _context3.abrupt("return", getDefaultInvoiceTemplateSettings());
-            case 4:
+            case 5:
               fetchRevision = this.fetchRevision;
-              _context3.next = 7;
+              _context3.next = 8;
               return this.resolveInvoiceTemplateSettings(config, normalizedTarget);
-            case 7:
+            case 8:
               resolved = _context3.sent;
               if (!(fetchRevision !== this.fetchRevision || this.store.data !== config)) {
-                _context3.next = 10;
+                _context3.next = 11;
                 break;
               }
               return _context3.abrupt("return", getDefaultInvoiceTemplateSettings());
-            case 10:
+            case 11:
               this.commitInvoiceTemplateSettings(normalizedTarget, resolved);
               return _context3.abrupt("return", normalizeRawInvoiceTemplateSettings(resolved.settings));
-            case 12:
+            case 13:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function ensureInvoiceTemplateSettings(_x4) {
+      function ensureInvoiceTemplateSettings(_x4, _x5) {
         return _ensureInvoiceTemplateSettings.apply(this, arguments);
       }
       return ensureInvoiceTemplateSettings;
@@ -367,7 +375,7 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this);
       }));
-      function resolveInvoiceTemplateSettings(_x5, _x6) {
+      function resolveInvoiceTemplateSettings(_x6, _x7) {
         return _resolveInvoiceTemplateSettings.apply(this, arguments);
       }
       return resolveInvoiceTemplateSettings;
@@ -424,7 +432,7 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee5, this);
       }));
-      function fetchInvoiceTemplateDocument(_x7) {
+      function fetchInvoiceTemplateDocument(_x8) {
         return _fetchInvoiceTemplateDocument.apply(this, arguments);
       }
       return fetchInvoiceTemplateDocument;

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

@@ -535,7 +535,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;

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

@@ -33,9 +33,12 @@ export interface SmallTicketProduct {
     product_title: string;
     product_quantity: number;
     selling_price: string;
+    total_selling_price: string;
     original_price: string;
-    base_price?: string;
+    base_price: string;
     total_original_price: string;
+    options_total_price?: string;
+    package_items_total_price?: string;
     extension_list: any[];
     product_uid?: string | number;
     booking_uid?: string | number;
@@ -44,6 +47,7 @@ export interface SmallTicketProduct {
         name: string;
         num?: number;
         price?: string;
+        total_price: string;
         value?: string;
     }>;
     variant?: string;

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

@@ -255,14 +255,14 @@ function buildLocaleData(params) {
   });
 }
 function buildBaseData(params) {
-  var _order$metadata;
+  var _financials$amountGap, _order$metadata;
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale,
     currencySymbol = params.currencySymbol,
     financials = params.financials;
   var orderNumber = stringify(order.buzzer || order.shop_full_order_number);
-  return _objectSpread(_objectSpread({
+  return _objectSpread({
     shop_name: stringify(shopInfo.name || order.shop_name),
     note: stringify(order.note),
     shop_order_number: stringify(order.shop_order_number),
@@ -273,10 +273,8 @@ function buildBaseData(params) {
     original_payment_status: financials.paymentStatus,
     payment_status: financials.paymentStatus,
     total_amount: formatMoney(financials.totalAmount, currencySymbol),
-    has_pay: formatMoney(financials.netPaymentApplied, currencySymbol)
-  }, isPresentId(financials.amountGap) ? {
-    amount_gap: formatMoney(financials.amountGap, currencySymbol)
-  } : {}), {}, {
+    has_pay: formatMoney(financials.netPaymentApplied, currencySymbol),
+    amount_gap: formatCalculatedMoney((_financials$amountGap = financials.amountGap) !== null && _financials$amountGap !== void 0 ? _financials$amountGap : 0, currencySymbol),
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || ((_order$metadata = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata.buzzer)),
     order_no: orderNumber,
@@ -328,15 +326,20 @@ function buildProducts(order, locale, productMap) {
     });
     var productNote = resolveProductNote(product, locale);
     var basePrice = resolveProductBasePrice(product);
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    var resolvedCombinations = Array.isArray(product.combinations) && product.combinations.length ? normalizeExistingCombinations(product.combinations, locale, currencySymbol) : combinations;
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
-      original_price: formatMoney(originalPrice, currencySymbol)
-    }, isPresentId(basePrice) ? {
-      base_price: formatMoney(basePrice, currencySymbol)
+      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(sellingPrice)).mul(quantity), currencySymbol),
+      original_price: formatMoney(originalPrice, currencySymbol),
+      base_price: formatCalculatedMoney(basePrice !== null && basePrice !== void 0 ? basePrice : 0, currencySymbol),
+      total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol)
+    }, options.length ? {
+      options_total_price: sumNormalizedOptionTotals(options, currencySymbol)
+    } : {}), resolvedCombinations.length ? {
+      package_items_total_price: sumCombinationTotals(resolvedCombinations, currencySymbol)
     } : {}), {}, {
-      total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList
     }, isPresentId(productUid) ? {
       product_uid: productUid
@@ -348,10 +351,8 @@ function buildProducts(order, locale, productMap) {
       options: options
     } : {}), resolvedVariant ? {
       variant: resolvedVariant
-    } : {}), Array.isArray(product.combinations) && product.combinations.length ? {
-      combinations: normalizeExistingCombinations(product.combinations, locale)
-    } : combinations.length ? {
-      combinations: combinations
+    } : {}), resolvedCombinations.length ? {
+      combinations: resolvedCombinations
     } : {});
   });
 }
@@ -488,9 +489,10 @@ 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 _ref14, _option$original_pric, _ref15, _option$value, _option$num;
+    var _ref14, _option$original_pric, _ref15, _option$num, _ref16, _option$value;
     var price = (_ref14 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref14 !== void 0 ? _ref14 : option.price;
-    var value = (_ref15 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref15 !== void 0 ? _ref15 : option.item;
+    var quantity = toNumber((_ref15 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref15 !== void 0 ? _ref15 : 1, 1);
+    var value = (_ref16 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref16 !== void 0 ? _ref16 : option.item;
     var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option: option,
       parentProduct: parentProduct,
@@ -499,10 +501,12 @@ function normalizeProductOptions(params) {
     return _objectSpread(_objectSpread(_objectSpread({
       name: name
     }, option.num !== undefined || option.quantity !== undefined ? {
-      num: toNumber((_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity, 1)
+      num: quantity
     } : {}), price !== undefined && price !== null && price !== '' ? {
       price: formatMoney(price, currencySymbol)
-    } : {}), value !== undefined && value !== null && value !== '' ? {
+    } : {}), {}, {
+      total_price: formatCalculatedMoney(new Decimal(toMoneyNumber(price !== null && price !== void 0 ? price : 0)).mul(quantity), currencySymbol)
+    }, value !== undefined && value !== null && value !== '' ? {
       value: getLocalizedValue(value, locale)
     } : {});
   });
@@ -515,7 +519,7 @@ function normalizeProductCombinations(params) {
     parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
-    var _ref16, _bundle$num;
+    var _ref17, _bundle$num, _bundle$metadata;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -530,43 +534,97 @@ function normalizeProductCombinations(params) {
       parentProduct: parentProduct
     });
     var productNote = resolveProductNote(bundle, locale);
-    var nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale) : [];
-    return _objectSpread(_objectSpread({
+    var nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale, currencySymbol) : [];
+    var quantity = toNumber((_ref17 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref17 !== void 0 ? _ref17 : 1, 1);
+    var formattedPrice = formatBundlePrice(bundle, currencySymbol);
+    var optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
+    var explicitBasePrice = firstPresentValue(bundle.base_price, (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata.source_product_price);
+    var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: baseTitle,
-      product_quantity: toNumber((_ref16 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref16 !== void 0 ? _ref16 : 1, 1),
-      price: formatBundlePrice(bundle, currencySymbol),
+      product_quantity: quantity,
+      price: formattedPrice,
+      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(formattedPrice)).mul(quantity), currencySymbol),
+      base_price: formatCalculatedMoney(basePrice, currencySymbol),
       combinations_options: combinationsOptions
-    }, productNote ? {
+    }, combinationsOptions.length ? {
+      options_total_price: optionsTotal
+    } : {}), nestedCombinations.length ? {
+      package_items_total_price: sumCombinationTotals(nestedCombinations, currencySymbol)
+    } : {}), productNote ? {
       product_note: productNote
     } : {}), nestedCombinations.length ? {
       combinations: nestedCombinations
     } : {});
   });
 }
-function normalizeExistingCombinations(combinations, locale) {
+function normalizeExistingCombinations(combinations, locale, currencySymbol) {
   return combinations.map(function (combination) {
+    var _ref18, _ref19, _combination$product_, _firstPresentValue;
     if (!combination || _typeof(combination) !== 'object' || Array.isArray(combination)) {
       return combination;
     }
     var productNote = resolveProductNote(combination, locale);
-    var nestedCombinations = Array.isArray(combination.combinations) ? normalizeExistingCombinations(combination.combinations, locale) : undefined;
+    var rawOptions = Array.isArray(combination.combinations_options) ? combination.combinations_options : Array.isArray(combination.options) ? combination.options : [];
+    var normalizedOptions = normalizeProductOptions({
+      product: {},
+      locale: locale,
+      currencySymbol: currencySymbol,
+      options: rawOptions
+    });
+    var nestedCombinations = Array.isArray(combination.combinations) ? normalizeExistingCombinations(combination.combinations, locale, currencySymbol) : [];
     var snapshot = _objectSpread({}, combination);
     delete snapshot.product_note;
     delete snapshot.note;
-    return _objectSpread(_objectSpread(_objectSpread({}, snapshot), productNote ? {
+    delete snapshot.combinations;
+    var quantity = toNumber((_ref18 = (_ref19 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref19 !== void 0 ? _ref19 : combination.quantity) !== null && _ref18 !== void 0 ? _ref18 : 1, 1);
+    var unitPrice = (_firstPresentValue = firstPresentValue(combination.selling_price, combination.price, combination.original_price)) !== null && _firstPresentValue !== void 0 ? _firstPresentValue : 0;
+    var optionsAmount = sumMoneyValues(normalizedOptions.map(function (option) {
+      return option.total_price;
+    }));
+    var explicitBasePrice = firstPresentValue(combination.base_price);
+    var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), {}, {
+      product_quantity: quantity,
+      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol),
+      base_price: formatCalculatedMoney(basePrice, currencySymbol)
+    }, Array.isArray(combination.combinations_options) ? {
+      combinations_options: normalizedOptions
+    } : Array.isArray(combination.options) ? {
+      options: normalizedOptions
+    } : {}), normalizedOptions.length ? {
+      options_total_price: formatCalculatedMoney(optionsAmount, currencySymbol)
+    } : {}), nestedCombinations.length ? {
+      package_items_total_price: sumCombinationTotals(nestedCombinations, currencySymbol)
+    } : {}), productNote ? {
       product_note: productNote
-    } : {}), nestedCombinations ? {
+    } : {}), nestedCombinations.length ? {
       combinations: nestedCombinations
     } : {});
   });
 }
+function sumMoneyValues(values) {
+  return values.reduce(function (sum, value) {
+    return sum.plus(toMoneyNumber(value));
+  }, new Decimal(0));
+}
+function sumNormalizedOptionTotals(options, currencySymbol) {
+  return formatCalculatedMoney(sumMoneyValues(options.map(function (option) {
+    return option.total_price;
+  })), currencySymbol);
+}
+function sumCombinationTotals(combinations, currencySymbol) {
+  return formatCalculatedMoney(sumMoneyValues(combinations.map(function (combination) {
+    return combination.total_selling_price;
+  })), currencySymbol);
+}
 function resolveProductNote(product, locale) {
   var productNote = getLocalizedValue(product.product_note, locale).trim();
   if (productNote) return productNote;
   return getLocalizedValue(product.note, locale).trim();
 }
 function resolveBundleProductTitle(params) {
-  var _ref17, _ref18, _bundle$bundle_produc;
+  var _ref20, _ref21, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
     locale = params.locale,
@@ -579,7 +637,7 @@ function resolveBundleProductTitle(params) {
   });
   var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
-  var productId = (_ref17 = (_ref18 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref18 !== void 0 ? _ref18 : bundle.product_id) !== null && _ref17 !== void 0 ? _ref17 : bundle.id;
+  var productId = (_ref20 = (_ref21 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref21 !== void 0 ? _ref21 : bundle.product_id) !== null && _ref20 !== void 0 ? _ref20 : bundle.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
   return getProductTitleSource(fallbackProduct, locale);
@@ -631,10 +689,10 @@ function resolveVariantTextFromSkuKey(params) {
 }
 function resolveVariantTextFromNameMap(params) {
   if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
-  return Object.entries(params.nameMap).map(function (_ref19) {
-    var _ref20 = _slicedToArray(_ref19, 2),
-      groupPositionId = _ref20[0],
-      value = _ref20[1];
+  return Object.entries(params.nameMap).map(function (_ref22) {
+    var _ref23 = _slicedToArray(_ref22, 2),
+      groupPositionId = _ref23[0],
+      value = _ref23[1];
     var group = resolveVariantGroup(params.parentProduct, groupPositionId);
     if (!group) return '';
     var groupName = getLocalizedValue(group.name, params.locale);
@@ -668,12 +726,12 @@ function getProductTitleSource(source, locale) {
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref21, _ref22, _ref23, _ref24, _value$locale;
+  var _ref24, _ref25, _ref26, _ref27, _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((_ref21 = (_ref22 = (_ref23 = (_ref24 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref24 !== void 0 ? _ref24 : value[underscoredLocale]) !== null && _ref23 !== void 0 ? _ref23 : value.original) !== null && _ref22 !== void 0 ? _ref22 : value.auto) !== null && _ref21 !== void 0 ? _ref21 : '');
+  return stringify((_ref24 = (_ref25 = (_ref26 = (_ref27 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref27 !== void 0 ? _ref27 : value[underscoredLocale]) !== null && _ref26 !== void 0 ? _ref26 : value.original) !== null && _ref25 !== void 0 ? _ref25 : value.auto) !== null && _ref24 !== void 0 ? _ref24 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -691,17 +749,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 _ref25, _item$option_group_id;
+      var _ref28, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref25 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref25 !== void 0 ? _ref25 : group.option_group_id
+        option_group_id: (_ref28 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref28 !== void 0 ? _ref28 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref26, _option$option_group_, _ref27, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref26 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref26 !== void 0 ? _ref26 : option.id;
-  var itemId = (_ref27 = (_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 && _ref27 !== void 0 ? _ref27 : item.id;
+  var _ref29, _option$option_group_, _ref30, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref29 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref29 !== void 0 ? _ref29 : option.id;
+  var itemId = (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : 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;
@@ -711,16 +769,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref28, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref30, _bundle$bundle_produc2;
+  var _ref31, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref33, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref28 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref28 !== void 0 ? _ref28 : bundle.product_variant_id;
+  var bundleVariantId = (_ref31 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref31 !== void 0 ? _ref31 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref29, _item$bundle_variant_;
-      return isSameId((_ref29 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref29 !== void 0 ? _ref29 : item.product_variant_id, bundleVariantId);
+      var _ref32, _item$bundle_variant_;
+      return isSameId((_ref32 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref32 !== void 0 ? _ref32 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -733,18 +791,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 = (_ref30 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : bundle.product_id;
+  var bundleProductId = (_ref33 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref33 !== void 0 ? _ref33 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref31, _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((_ref31 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref31 !== void 0 ? _ref31 : item.product_id, bundleProductId);
+      var _item$group_id, _ref34, _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((_ref34 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref34 !== void 0 ? _ref34 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref32, _item$bundle_product_2;
-      return isSameId((_ref32 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref32 !== void 0 ? _ref32 : item.product_id, bundleProductId);
+      var _ref35, _item$bundle_product_2;
+      return isSameId((_ref35 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -754,9 +812,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 _ref33, _item$group_id2;
+      var _ref36, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref33 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref33 !== void 0 ? _ref33 : group.group_id
+        group_id: (_ref36 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref36 !== void 0 ? _ref36 : group.group_id
       });
     });
   });
@@ -780,8 +838,8 @@ function isSameId(left, right) {
   return String(left) === String(right);
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref34, _ref35, _bundle$bundle_sellin;
-  var value = (_ref34 = (_ref35 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref35 !== void 0 ? _ref35 : bundle.price) !== null && _ref34 !== void 0 ? _ref34 : 0;
+  var _ref37, _ref38, _bundle$bundle_sellin;
+  var value = (_ref37 = (_ref38 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref38 !== void 0 ? _ref38 : bundle.price) !== null && _ref37 !== void 0 ? _ref37 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
   var isNegative = bundle.price_type === 'markdown';
@@ -789,7 +847,7 @@ function formatBundlePrice(bundle, currencySymbol) {
   return formatMoney(amount, currencySymbol);
 }
 function buildFees(params) {
-  var _firstPresentValue, _firstPresentValue2;
+  var _firstPresentValue2, _firstPresentValue3;
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale,
@@ -799,9 +857,9 @@ function buildFees(params) {
     financials = params.financials;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref36, _surcharge$amount;
+    var _ref39, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref36 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref36 !== void 0 ? _ref36 : surcharge.total_amount;
+    var value = (_ref39 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref39 !== void 0 ? _ref39 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -838,14 +896,16 @@ function buildFees(params) {
     });
   }
   var productExpectAmount = firstPresentValue(summary.product_expect_amount, summary.product_amount, order.product_expect_amount);
-  var productOriginalAmount = (_firstPresentValue = firstPresentValue(summary.product_original_amount, order.product_original_amount)) !== null && _firstPresentValue !== void 0 ? _firstPresentValue : calculateProductOriginalAmount(order);
+  var productOriginalAmount = (_firstPresentValue2 = firstPresentValue(summary.product_original_amount, order.product_original_amount)) !== null && _firstPresentValue2 !== void 0 ? _firstPresentValue2 : calculateProductOriginalAmount(order);
   var totalSavingsAmount = new Decimal(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
+  var itemDiscountAmount = new Decimal(toMoneyNumber(productExpectAmount !== null && productExpectAmount !== void 0 ? productExpectAmount : 0)).minus(toMoneyNumber(productOriginalAmount));
   return {
     fees: fees,
     countFee: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
-      total_amount: formatMoney((_firstPresentValue2 = firstPresentValue(summary.total_amount, order.total_amount)) !== null && _firstPresentValue2 !== void 0 ? _firstPresentValue2 : 0, currencySymbol),
+      total_amount: formatMoney((_firstPresentValue3 = firstPresentValue(summary.total_amount, order.total_amount)) !== null && _firstPresentValue3 !== void 0 ? _firstPresentValue3 : 0, currencySymbol),
       original_item_amount: formatMoney(productOriginalAmount, currencySymbol),
       product_expect_amount: formatMoney(productExpectAmount !== null && productExpectAmount !== void 0 ? productExpectAmount : 0, currencySymbol),
+      item_discount_amount: formatCalculatedMoney(itemDiscountAmount, currencySymbol),
       expect_amount: formatMoney(financials.totalAmount, currencySymbol),
       product_quantity: toNumber(firstPresentValue(summary.product_quantity, products.reduce(function (sum, product) {
         return sum + product.product_quantity;
@@ -870,15 +930,15 @@ function buildFees(params) {
   };
 }
 function resolveReceiptFinancials(order, summary) {
-  var _firstPresentValue3, _firstPresentValue4, _firstPresentValue5, _firstPresentValue6;
-  var totalAmount = (_firstPresentValue3 = firstPresentValue(summary.expect_amount, order.expect_amount, summary.total_amount, order.total_amount)) !== null && _firstPresentValue3 !== void 0 ? _firstPresentValue3 : 0;
+  var _firstPresentValue4, _firstPresentValue5, _firstPresentValue6, _firstPresentValue7;
+  var totalAmount = (_firstPresentValue4 = firstPresentValue(summary.expect_amount, order.expect_amount, summary.total_amount, order.total_amount)) !== null && _firstPresentValue4 !== void 0 ? _firstPresentValue4 : 0;
   var rawPayProcessingFee = firstPresentValue(summary.pay_service_charge_amount, order.pay_service_charge_amount);
   var payProcessingFee = rawPayProcessingFee !== null && rawPayProcessingFee !== void 0 ? rawPayProcessingFee : 0;
-  var orderPaidAmount = (_firstPresentValue4 = firstPresentValue(summary.order_paid_amount, order.order_paid_amount, sumAppliedPayments(order.payments))) !== null && _firstPresentValue4 !== void 0 ? _firstPresentValue4 : 0;
-  var totalRefundAmount = (_firstPresentValue5 = firstPresentValue(summary.total_refund_amount, order.total_refund_amount)) !== null && _firstPresentValue5 !== void 0 ? _firstPresentValue5 : 0;
+  var orderPaidAmount = (_firstPresentValue5 = firstPresentValue(summary.order_paid_amount, order.order_paid_amount, sumAppliedPayments(order.payments))) !== null && _firstPresentValue5 !== void 0 ? _firstPresentValue5 : 0;
+  var totalRefundAmount = (_firstPresentValue6 = firstPresentValue(summary.total_refund_amount, order.total_refund_amount)) !== null && _firstPresentValue6 !== void 0 ? _firstPresentValue6 : 0;
   var netPaymentApplied = Decimal.max(new Decimal(toMoneyNumber(orderPaidAmount)).minus(toMoneyNumber(totalRefundAmount)), 0);
   var fallbackCustomerPaidAmount = Decimal.max(sumCustomerPaidPayments(order.payments), new Decimal(toMoneyNumber(orderPaidAmount)).plus(toMoneyNumber(payProcessingFee)));
-  var customerPaidAmount = (_firstPresentValue6 = firstPresentValue(summary.customer_paid_amount, order.customer_paid_amount, fallbackCustomerPaidAmount)) !== null && _firstPresentValue6 !== void 0 ? _firstPresentValue6 : 0;
+  var customerPaidAmount = (_firstPresentValue7 = firstPresentValue(summary.customer_paid_amount, order.customer_paid_amount, fallbackCustomerPaidAmount)) !== null && _firstPresentValue7 !== void 0 ? _firstPresentValue7 : 0;
   var amountGap = firstPresentValue(summary.amount_gap, order.amount_gap);
   return {
     totalAmount: totalAmount,
@@ -907,9 +967,9 @@ function resolveTaxTitle(params) {
 }
 function calculateProductOriginalAmount(order) {
   return normalizeArray(order.products).reduce(function (total, product) {
-    var _ref37, _ref38, _product$product_quan2, _ref39, _ref40, _ref41, _product$original_pri2;
-    var quantity = toNumber((_ref37 = (_ref38 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref38 !== void 0 ? _ref38 : product.num) !== null && _ref37 !== void 0 ? _ref37 : 1, 1);
-    var originalPrice = (_ref39 = (_ref40 = (_ref41 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref41 !== void 0 ? _ref41 : product.payment_price) !== null && _ref40 !== void 0 ? _ref40 : product.price) !== null && _ref39 !== void 0 ? _ref39 : 0;
+    var _ref40, _ref41, _product$product_quan2, _ref42, _ref43, _ref44, _product$original_pri2;
+    var quantity = toNumber((_ref40 = (_ref41 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref41 !== void 0 ? _ref41 : product.num) !== null && _ref40 !== void 0 ? _ref40 : 1, 1);
+    var originalPrice = (_ref42 = (_ref43 = (_ref44 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref44 !== void 0 ? _ref44 : product.payment_price) !== null && _ref43 !== void 0 ? _ref43 : product.price) !== null && _ref42 !== void 0 ? _ref42 : 0;
     return total.plus(new Decimal(toMoneyNumber(originalPrice)).mul(quantity));
   }, new Decimal(0));
 }
@@ -997,8 +1057,8 @@ function sortBookings(bookings) {
     }
     var bookingUidOrder = compareOptionalValues(firstPresentValue((_left$booking2 = left.booking) === null || _left$booking2 === void 0 || (_left$booking2 = _left$booking2.metadata) === null || _left$booking2 === void 0 ? void 0 : _left$booking2.unique_identification_number, (_left$booking3 = left.booking) === null || _left$booking3 === void 0 ? void 0 : _left$booking3.booking_uid), firstPresentValue((_right$booking2 = right.booking) === null || _right$booking2 === void 0 || (_right$booking2 = _right$booking2.metadata) === null || _right$booking2 === void 0 ? void 0 : _right$booking2.unique_identification_number, (_right$booking3 = right.booking) === null || _right$booking3 === void 0 ? void 0 : _right$booking3.booking_uid));
     return bookingUidOrder || left.index - right.index;
-  }).map(function (_ref42) {
-    var booking = _ref42.booking;
+  }).map(function (_ref45) {
+    var booking = _ref45.booking;
     return booking;
   });
 }
@@ -1060,8 +1120,8 @@ function buildRefundData(params) {
       result.set(identity, candidate);
     }
     return result;
-  }, new Map()).values()).filter(function (_ref43) {
-    var refund = _ref43.refund;
+  }, new Map()).values()).filter(function (_ref46) {
+    var refund = _ref46.refund;
     return isPrintableRefund(refund);
   }).sort(function (left, right) {
     var leftTime = refundTimestamp(left.refund);
@@ -1069,12 +1129,12 @@ function buildRefundData(params) {
     if (leftTime !== rightTime) return leftTime < rightTime ? -1 : 1;
     return left.index - right.index;
   });
-  return refunds.map(function (_ref44) {
-    var _firstPresentValue7;
-    var refund = _ref44.refund;
+  return refunds.map(function (_ref47) {
+    var _firstPresentValue8;
+    var refund = _ref47.refund;
     var payment = resolveRefundPayment(refund, payments);
     var methodName = paymentMethodName(payment, params.locale) || label(params.locale, 'refund');
-    var amount = (_firstPresentValue7 = firstPresentValue(refund.amount, refund.refund_amount, refund.total_amount)) !== null && _firstPresentValue7 !== void 0 ? _firstPresentValue7 : 0;
+    var amount = (_firstPresentValue8 = firstPresentValue(refund.amount, refund.refund_amount, refund.total_amount)) !== null && _firstPresentValue8 !== void 0 ? _firstPresentValue8 : 0;
     var items = [{
       item: methodName,
       value: formatNegativeMoney(amount, params.currencySymbol)
@@ -1292,8 +1352,8 @@ function buildPaymentItems(params) {
       includeUsage: includeFundRecordUsage
     })));
   } else {
-    var _ref45, _payment$remaining_am, _payment$metadata;
-    var remainingAmount = (_ref45 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref45 !== void 0 ? _ref45 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+    var _ref48, _payment$remaining_am, _payment$metadata;
+    var remainingAmount = (_ref48 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref48 !== void 0 ? _ref48 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
     if (remainingAmount !== undefined && remainingAmount !== null) {
       items.push({
         item: label(locale, 'remainingAmount'),
@@ -1447,12 +1507,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 _ref46, _ref47, _ref48, _ref49, _ref50, _ref51, _value$locale2;
+  var _ref49, _ref50, _ref51, _ref52, _ref53, _ref54, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref46 = (_ref47 = (_ref48 = (_ref49 = (_ref50 = (_ref51 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref51 !== void 0 ? _ref51 : value[underscoredLocale]) !== null && _ref50 !== void 0 ? _ref50 : value.original) !== null && _ref49 !== void 0 ? _ref49 : value.auto) !== null && _ref48 !== void 0 ? _ref48 : value.default) !== null && _ref47 !== void 0 ? _ref47 : value.en) !== null && _ref46 !== void 0 ? _ref46 : '');
+  return stringify((_ref49 = (_ref50 = (_ref51 = (_ref52 = (_ref53 = (_ref54 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref54 !== void 0 ? _ref54 : value[underscoredLocale]) !== null && _ref53 !== void 0 ? _ref53 : value.original) !== null && _ref52 !== void 0 ? _ref52 : value.auto) !== null && _ref51 !== void 0 ? _ref51 : value.default) !== null && _ref50 !== void 0 ? _ref50 : value.en) !== null && _ref49 !== void 0 ? _ref49 : '');
 }
 function resolveServiceTypeLabelKey(serviceType, order) {
   var normalized = serviceType.trim().toLowerCase().replace(/[\s-]+/g, '_');
@@ -1494,6 +1554,11 @@ function formatMoney(value, currencySymbol) {
   var amount = new Decimal(toMoneyNumber(value));
   return "".concat(currencySymbol).concat(amount.toFixed(2));
 }
+function formatCalculatedMoney(value, currencySymbol) {
+  var amount = new Decimal(toMoneyNumber(value));
+  var sign = amount.isNegative() ? '-' : '';
+  return "".concat(sign).concat(currencySymbol).concat(amount.abs().toFixed(2));
+}
 function formatNegativeMoney(value, currencySymbol) {
   var amount = new Decimal(toMoneyNumber(value)).abs();
   return "-".concat(currencySymbol).concat(amount.toFixed(2));