@pisell/pisellos 2.3.96 → 2.3.97

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/server/utils/small-ticket.d.ts

@@ -35,6 +35,8 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    product_uid?: string | number;
+    booking_uid?: string | number;
     options?: Array<{
         name: string;
         num?: number;
@@ -44,6 +46,11 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
+export interface SmallTicketBookingSnapshot extends Record<string, any> {
+    product_uid?: string | number;
+    booking_uid?: string | number;
+}
+export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];
@@ -52,7 +59,7 @@ export interface SmallTicketLocaleData {
         countFee: Record<string, any>;
     };
     customer: SmallTicketItem[];
-    appointment: SmallTicketItem[];
+    appointment: SmallTicketAppointment;
     delivery?: SmallTicketItem[];
     resources: Array<{
         id: string | number;
@@ -61,6 +68,7 @@ export interface SmallTicketLocaleData {
         form_title: string;
     }>;
     payment_data: SmallTicketItem[][];
+    wallets: SmallTicketItem[][];
     tickets: any[];
     source_shop: any[];
     refund_data: any[];

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

@@ -150,6 +150,11 @@ function buildLocaleData(params) {
       locale: locale,
       currencySymbol: currencySymbol
     }),
+    wallets: buildWallets({
+      order: order,
+      locale: locale,
+      currencySymbol: currencySymbol
+    }),
     tickets: Array.isArray(order.tickets) ? order.tickets : [],
     source_shop: [],
     refund_data: [],
@@ -162,7 +167,7 @@ function buildBaseData(params) {
     shopInfo = params.shopInfo,
     locale = params.locale;
   var orderNumber = stringify(order.buzzer || order.shop_full_order_number);
-  return {
+  return _objectSpread({
     shop_name: stringify(shopInfo.name || order.shop_name),
     note: stringify(order.note),
     shop_order_number: stringify(order.shop_order_number),
@@ -175,12 +180,14 @@ function buildBaseData(params) {
     buzzer: stringify(order.buzzer || order.pickup_number || ((_order$metadata = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata.buzzer)),
     order_no: orderNumber,
     order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale)
-  };
+  }, isPresentId(order.updated_at) ? {
+    updated_at: formatDateTime(order.updated_at, locale)
+  } : {});
 }
 function buildProducts(order, locale, productMap) {
   var products = Array.isArray(order.products) ? order.products : [];
   return products.map(function (product) {
-    var _ref, _ref2, _product$product_quan, _ref3, _ref4, _ref5, _product$original_pri, _ref6, _ref7, _product$selling_pric, _product$product_id;
+    var _ref, _ref2, _product$product_quan, _ref3, _ref4, _ref5, _product$original_pri, _ref6, _ref7, _product$selling_pric, _product$product_id, _product$metadata, _product$metadata2;
     var quantity = toNumber((_ref = (_ref2 = (_product$product_quan = product.product_quantity) !== null && _product$product_quan !== void 0 ? _product$product_quan : product.quantity) !== null && _ref2 !== void 0 ? _ref2 : product.num) !== null && _ref !== void 0 ? _ref : 1, 1);
     var originalPrice = (_ref3 = (_ref4 = (_ref5 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref5 !== void 0 ? _ref5 : product.payment_price) !== null && _ref4 !== void 0 ? _ref4 : product.price) !== null && _ref3 !== void 0 ? _ref3 : 0;
     var sellingPrice = (_ref6 = (_ref7 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.payment_price) !== null && _ref7 !== void 0 ? _ref7 : product.price) !== null && _ref6 !== void 0 ? _ref6 : originalPrice;
@@ -209,6 +216,8 @@ function buildProducts(order, locale, productMap) {
       parentProduct: parentProduct,
       locale: locale
     });
+    var productUid = firstPresentValue((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number, product.unique_identification_number);
+    var bookingUid = firstPresentValue(product.booking_uid, (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_uid);
     var extensionList = buildProductExtensionList({
       product: product,
       locale: locale,
@@ -216,14 +225,18 @@ function buildProducts(order, locale, productMap) {
       quantity: quantity,
       originalPrice: originalPrice
     });
-    return _objectSpread(_objectSpread(_objectSpread({
+    return _objectSpread(_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: extensionList
-    }, options.length ? {
+    }, isPresentId(productUid) ? {
+      product_uid: productUid
+    } : {}), isPresentId(bookingUid) ? {
+      booking_uid: bookingUid
+    } : {}), options.length ? {
       options: options
     } : {}), resolvedVariant ? {
       variant: resolvedVariant
@@ -604,6 +617,14 @@ function isNonZeroId(value) {
 function isPresentId(value) {
   return value !== undefined && value !== null && value !== '';
 }
+function firstPresentValue() {
+  for (var _len = arguments.length, values = new Array(_len), _key = 0; _key < _len; _key++) {
+    values[_key] = arguments[_key];
+  }
+  return values.find(function (value) {
+    return isPresentId(value);
+  });
+}
 function isSameId(left, right) {
   if (!isPresentId(left) || !isPresentId(right)) return false;
   return String(left) === String(right);
@@ -628,7 +649,7 @@ function formatBundlePrice(bundle, currencySymbol) {
   return formatMoney(amount, currencySymbol);
 }
 function buildFees(params) {
-  var _ref36, _order$shop_discount, _ref37, _summary$product_orig;
+  var _ref36, _order$shop_discount, _firstPresentValue;
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale,
@@ -675,12 +696,13 @@ function buildFees(params) {
     });
   }
   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 productOriginalAmount = (_firstPresentValue = firstPresentValue(summary.product_original_amount, order.product_original_amount)) !== null && _firstPresentValue !== void 0 ? _firstPresentValue : calculateProductOriginalAmount(order);
   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),
+      original_item_amount: formatMoney(productOriginalAmount, 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) {
@@ -701,6 +723,14 @@ function buildFees(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;
+    return total.plus(new Decimal(toMoneyNumber(originalPrice)).mul(quantity));
+  }, new Decimal(0));
+}
 function buildCustomer(order, locale) {
   var _order$customer, _order$customer2, _order$customer3, _order$customer4;
   return [{
@@ -741,6 +771,22 @@ function buildDelivery(order, locale) {
 }
 function buildAppointment(order, locale) {
   var _order$metadata3, _order$metadata4, _order$form_data;
+  var bookings = normalizeArray(order.bookings);
+  if (bookings.length) {
+    return bookings.map(function (booking) {
+      var _booking$metadata, _booking$metadata2;
+      var snapshot = _objectSpread({}, booking);
+      delete snapshot.product_uid;
+      delete snapshot.booking_uid;
+      var productUid = firstPresentValue(booking.product_uid, (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.product_uid);
+      var bookingUid = firstPresentValue((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.unique_identification_number, booking.booking_uid);
+      return _objectSpread(_objectSpread(_objectSpread({}, snapshot), isPresentId(productUid) ? {
+        product_uid: productUid
+      } : {}), isPresentId(bookingUid) ? {
+        booking_uid: bookingUid
+      } : {});
+    });
+  }
   var tableName = order.table_name || ((_order$metadata3 = order.metadata) === null || _order$metadata3 === void 0 ? void 0 : _order$metadata3.table_name) || ((_order$metadata4 = order.metadata) === null || _order$metadata4 === void 0 || (_order$metadata4 = _order$metadata4.table) === null || _order$metadata4 === void 0 ? void 0 : _order$metadata4.name) || ((_order$form_data = order.form_data) === null || _order$form_data === void 0 ? void 0 : _order$form_data.table_name);
   if (!tableName) return [];
   return [{
@@ -763,41 +809,66 @@ function buildPaymentData(params) {
   return payments.filter(function (payment) {
     return isPrintablePayment(payment);
   }).map(function (payment) {
-    var serviceFee = getPaymentServiceFee(payment);
-    var items = [{
-      item: paymentMethodName(payment, params.locale),
-      value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), params.currencySymbol)
-    }];
-    if (serviceFee.gt(0)) {
+    return buildPaymentItems({
+      payment: payment,
+      locale: params.locale,
+      currencySymbol: params.currencySymbol,
+      includeFundRecordBalance: false
+    });
+  });
+}
+function buildWallets(params) {
+  return normalizeArray(params.order.payments).filter(function (payment) {
+    return isPrintablePayment(payment) && !!getFundRecord(payment);
+  }).map(function (payment) {
+    return buildPaymentItems({
+      payment: payment,
+      locale: params.locale,
+      currencySymbol: params.currencySymbol,
+      includeFundRecordBalance: true
+    });
+  });
+}
+function buildPaymentItems(params) {
+  var payment = params.payment,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol,
+    includeFundRecordBalance = params.includeFundRecordBalance;
+  var serviceFee = getPaymentServiceFee(payment);
+  var items = [{
+    item: paymentMethodName(payment, locale),
+    value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
+  }];
+  if (serviceFee.gt(0)) {
+    items.push({
+      item: label(locale, 'surchargeIncluded'),
+      value: formatMoney(serviceFee, currencySymbol)
+    });
+  }
+  var fundRecord = getFundRecord(payment);
+  if (fundRecord) {
+    items.push.apply(items, _toConsumableArray(buildFundRecordPaymentItems({
+      payment: payment,
+      fundRecord: fundRecord,
+      locale: locale,
+      currencySymbol: currencySymbol,
+      includeBalance: includeFundRecordBalance
+    })));
+  } else {
+    var _ref42, _payment$remaining_am, _payment$metadata;
+    var remainingAmount = (_ref42 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref42 !== void 0 ? _ref42 : (_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, 'surchargeIncluded'),
-        value: formatMoney(serviceFee, params.currencySymbol)
+        item: label(locale, 'remainingAmount'),
+        value: formatMoney(remainingAmount, currencySymbol)
       });
     }
-    var fundRecord = getFundRecord(payment);
-    if (fundRecord) {
-      items.push.apply(items, _toConsumableArray(buildFundRecordPaymentItems({
-        payment: payment,
-        fundRecord: fundRecord,
-        locale: params.locale,
-        currencySymbol: params.currencySymbol
-      })));
-    } else {
-      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'),
-          value: formatMoney(remainingAmount, params.currencySymbol)
-        });
-      }
-    }
-    items.push({
-      item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), params.locale),
-      value: ''
-    });
-    return items;
+  }
+  items.push({
+    item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), locale),
+    value: ''
   });
+  return items;
 }
 function getPaymentServiceFee(payment) {
   return new Decimal(toMoneyNumber(payment.service_fee));
@@ -815,7 +886,8 @@ function buildFundRecordPaymentItems(params) {
   var payment = params.payment,
     fundRecord = params.fundRecord,
     locale = params.locale,
-    currencySymbol = params.currencySymbol;
+    currencySymbol = params.currencySymbol,
+    includeBalance = params.includeBalance;
   var items = [];
   var usingBeforeValue = fundRecord.using_before_value;
   var usingAfterValue = fundRecord.using_after_value;
@@ -825,13 +897,15 @@ function buildFundRecordPaymentItems(params) {
       item: label(locale, 'redeemPoints'),
       value: trimDecimal(usedPoints)
     });
-    items.push({
-      item: label(locale, 'remainingPoints'),
-      value: trimDecimal(new Decimal(toMoneyNumber(usingAfterValue)))
-    });
+    if (includeBalance) {
+      items.push({
+        item: label(locale, 'remainingPoints'),
+        value: trimDecimal(new Decimal(toMoneyNumber(usingAfterValue)))
+      });
+    }
     return items;
   }
-  if (usingAfterValue !== undefined && usingAfterValue !== null) {
+  if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
     items.push({
       item: label(locale, 'remainingAmount'),
       value: formatMoney(usingAfterValue, currencySymbol)
@@ -904,12 +978,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 _ref39, _ref40, _ref41, _ref42, _ref43, _ref44, _value$locale2;
+  var _ref43, _ref44, _ref45, _ref46, _ref47, _ref48, _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((_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 : '');
+  return stringify((_ref43 = (_ref44 = (_ref45 = (_ref46 = (_ref47 = (_ref48 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref48 !== void 0 ? _ref48 : value[underscoredLocale]) !== null && _ref47 !== void 0 ? _ref47 : value.original) !== null && _ref46 !== void 0 ? _ref46 : value.auto) !== null && _ref45 !== void 0 ? _ref45 : value.default) !== null && _ref44 !== void 0 ? _ref44 : value.en) !== null && _ref43 !== void 0 ? _ref43 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -35,6 +35,8 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    product_uid?: string | number;
+    booking_uid?: string | number;
     options?: Array<{
         name: string;
         num?: number;
@@ -44,6 +46,11 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
+export interface SmallTicketBookingSnapshot extends Record<string, any> {
+    product_uid?: string | number;
+    booking_uid?: string | number;
+}
+export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];
@@ -52,7 +59,7 @@ export interface SmallTicketLocaleData {
         countFee: Record<string, any>;
     };
     customer: SmallTicketItem[];
-    appointment: SmallTicketItem[];
+    appointment: SmallTicketAppointment;
     delivery?: SmallTicketItem[];
     resources: Array<{
         id: string | number;
@@ -61,6 +68,7 @@ export interface SmallTicketLocaleData {
         form_title: string;
     }>;
     payment_data: SmallTicketItem[][];
+    wallets: SmallTicketItem[][];
     tickets: any[];
     source_shop: any[];
     refund_data: any[];

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

@@ -144,6 +144,11 @@ function buildLocaleData(params) {
       locale,
       currencySymbol
     }),
+    wallets: buildWallets({
+      order,
+      locale,
+      currencySymbol
+    }),
     tickets: Array.isArray(order.tickets) ? order.tickets : [],
     source_shop: [],
     refund_data: [],
@@ -169,7 +174,10 @@ function buildBaseData(params) {
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || order.metadata?.buzzer),
     order_no: orderNumber,
-    order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale)
+    order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale),
+    ...(isPresentId(order.updated_at) ? {
+      updated_at: formatDateTime(order.updated_at, locale)
+    } : {})
   };
 }
 function buildProducts(order, locale, productMap) {
@@ -203,6 +211,8 @@ function buildProducts(order, locale, productMap) {
       parentProduct,
       locale
     });
+    const productUid = firstPresentValue(product.metadata?.unique_identification_number, product.unique_identification_number);
+    const bookingUid = firstPresentValue(product.booking_uid, product.metadata?.booking_uid);
     const extensionList = buildProductExtensionList({
       product,
       locale,
@@ -217,6 +227,12 @@ function buildProducts(order, locale, productMap) {
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList,
+      ...(isPresentId(productUid) ? {
+        product_uid: productUid
+      } : {}),
+      ...(isPresentId(bookingUid) ? {
+        booking_uid: bookingUid
+      } : {}),
       ...(options.length ? {
         options
       } : {}),
@@ -582,6 +598,9 @@ function isNonZeroId(value) {
 function isPresentId(value) {
   return value !== undefined && value !== null && value !== '';
 }
+function firstPresentValue(...values) {
+  return values.find(value => isPresentId(value));
+}
 function isSameId(left, right) {
   if (!isPresentId(left) || !isPresentId(right)) return false;
   return String(left) === String(right);
@@ -650,12 +669,13 @@ function buildFees(params) {
     });
   }
   const productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
-  const productOriginalAmount = summary.product_original_amount ?? order.product_original_amount ?? productExpectAmount;
+  const productOriginalAmount = firstPresentValue(summary.product_original_amount, order.product_original_amount) ?? calculateProductOriginalAmount(order);
   const totalSavingsAmount = new _decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
+      original_item_amount: formatMoney(productOriginalAmount, 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((sum, product) => sum + product.product_quantity, 0), 0),
@@ -678,6 +698,13 @@ function buildFees(params) {
     }
   };
 }
+function calculateProductOriginalAmount(order) {
+  return normalizeArray(order.products).reduce((total, product) => {
+    const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
+    const originalPrice = product.original_price ?? product.selling_price ?? product.payment_price ?? product.price ?? 0;
+    return total.plus(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity));
+  }, new _decimal.default(0));
+}
 function buildCustomer(order, locale) {
   return [{
     item: label(locale, 'contactName'),
@@ -715,6 +742,27 @@ function buildDelivery(order, locale) {
   return items;
 }
 function buildAppointment(order, locale) {
+  const bookings = normalizeArray(order.bookings);
+  if (bookings.length) {
+    return bookings.map(booking => {
+      const snapshot = {
+        ...booking
+      };
+      delete snapshot.product_uid;
+      delete snapshot.booking_uid;
+      const productUid = firstPresentValue(booking.product_uid, booking.metadata?.product_uid);
+      const bookingUid = firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid);
+      return {
+        ...snapshot,
+        ...(isPresentId(productUid) ? {
+          product_uid: productUid
+        } : {}),
+        ...(isPresentId(bookingUid) ? {
+          booking_uid: bookingUid
+        } : {})
+      };
+    });
+  }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
   if (!tableName) return [];
   return [{
@@ -732,41 +780,62 @@ function buildResources(order, locale) {
 }
 function buildPaymentData(params) {
   const payments = normalizeArray(params.order.payments);
-  return payments.filter(payment => isPrintablePayment(payment)).map(payment => {
-    const serviceFee = getPaymentServiceFee(payment);
-    const items = [{
-      item: paymentMethodName(payment, params.locale),
-      value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), params.currencySymbol)
-    }];
-    if (serviceFee.gt(0)) {
+  return payments.filter(payment => isPrintablePayment(payment)).map(payment => buildPaymentItems({
+    payment,
+    locale: params.locale,
+    currencySymbol: params.currencySymbol,
+    includeFundRecordBalance: false
+  }));
+}
+function buildWallets(params) {
+  return normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment)).map(payment => buildPaymentItems({
+    payment,
+    locale: params.locale,
+    currencySymbol: params.currencySymbol,
+    includeFundRecordBalance: true
+  }));
+}
+function buildPaymentItems(params) {
+  const {
+    payment,
+    locale,
+    currencySymbol,
+    includeFundRecordBalance
+  } = params;
+  const serviceFee = getPaymentServiceFee(payment);
+  const items = [{
+    item: paymentMethodName(payment, locale),
+    value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
+  }];
+  if (serviceFee.gt(0)) {
+    items.push({
+      item: label(locale, 'surchargeIncluded'),
+      value: formatMoney(serviceFee, currencySymbol)
+    });
+  }
+  const fundRecord = getFundRecord(payment);
+  if (fundRecord) {
+    items.push(...buildFundRecordPaymentItems({
+      payment,
+      fundRecord,
+      locale,
+      currencySymbol,
+      includeBalance: includeFundRecordBalance
+    }));
+  } else {
+    const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
+    if (remainingAmount !== undefined && remainingAmount !== null) {
       items.push({
-        item: label(params.locale, 'surchargeIncluded'),
-        value: formatMoney(serviceFee, params.currencySymbol)
+        item: label(locale, 'remainingAmount'),
+        value: formatMoney(remainingAmount, currencySymbol)
       });
     }
-    const fundRecord = getFundRecord(payment);
-    if (fundRecord) {
-      items.push(...buildFundRecordPaymentItems({
-        payment,
-        fundRecord,
-        locale: params.locale,
-        currencySymbol: params.currencySymbol
-      }));
-    } else {
-      const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
-      if (remainingAmount !== undefined && remainingAmount !== null) {
-        items.push({
-          item: label(params.locale, 'remainingAmount'),
-          value: formatMoney(remainingAmount, params.currencySymbol)
-        });
-      }
-    }
-    items.push({
-      item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), params.locale),
-      value: ''
-    });
-    return items;
+  }
+  items.push({
+    item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), locale),
+    value: ''
   });
+  return items;
 }
 function getPaymentServiceFee(payment) {
   return new _decimal.default(toMoneyNumber(payment.service_fee));
@@ -784,7 +853,8 @@ function buildFundRecordPaymentItems(params) {
     payment,
     fundRecord,
     locale,
-    currencySymbol
+    currencySymbol,
+    includeBalance
   } = params;
   const items = [];
   const usingBeforeValue = fundRecord.using_before_value;
@@ -795,13 +865,15 @@ function buildFundRecordPaymentItems(params) {
       item: label(locale, 'redeemPoints'),
       value: trimDecimal(usedPoints)
     });
-    items.push({
-      item: label(locale, 'remainingPoints'),
-      value: trimDecimal(new _decimal.default(toMoneyNumber(usingAfterValue)))
-    });
+    if (includeBalance) {
+      items.push({
+        item: label(locale, 'remainingPoints'),
+        value: trimDecimal(new _decimal.default(toMoneyNumber(usingAfterValue)))
+      });
+    }
     return items;
   }
-  if (usingAfterValue !== undefined && usingAfterValue !== null) {
+  if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
     items.push({
       item: label(locale, 'remainingAmount'),
       value: formatMoney(usingAfterValue, currencySymbol)

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.96",
+  "version": "2.3.97",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",