@pisell/pisellos 2.2.220 → 2.2.222

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

@@ -144,7 +144,7 @@ function buildBaseData(params) {
   var _a;
   const { order, shopInfo, locale } = params;
   const orderNumber = stringify(
-    order.order_number || order.shop_full_order_number || order.shop_order_number || order.external_sale_number
+    order.buzzer || order.shop_full_order_number
   );
   return {
     shop_name: stringify(shopInfo.name || order.shop_name),
@@ -168,21 +168,24 @@ function buildProducts(order, locale, productMap) {
     const originalPrice = product.original_price ?? product.selling_price ?? product.payment_price ?? product.price ?? 0;
     const sellingPrice = product.selling_price ?? product.payment_price ?? product.price ?? originalPrice;
     const productTitle = resolveProductTitle({ product, productMap, locale });
+    const currencySymbol = getCurrencySymbol(order, null);
+    const options = normalizeProductOptions({ product, locale, currencySymbol });
+    const combinations = normalizeProductCombinations({
+      product,
+      productMap,
+      locale,
+      currencySymbol
+    });
     return {
       product_title: productTitle,
       product_quantity: quantity,
-      selling_price: formatMoney(sellingPrice, getCurrencySymbol(order, null)),
-      original_price: formatMoney(originalPrice, getCurrencySymbol(order, null)),
-      total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), getCurrencySymbol(order, null)),
+      selling_price: formatMoney(sellingPrice, currencySymbol),
+      original_price: formatMoney(originalPrice, currencySymbol),
+      total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: Array.isArray(product.extension_list) ? product.extension_list : [],
-      ...Array.isArray(product.options) ? {
-        options: product.options.map((option) => ({
-          name: getLocalizedValue(option.name || option.title, locale),
-          value: getLocalizedValue(option.value || option.option || option.item, locale)
-        }))
-      } : {},
+      ...options.length ? { options } : {},
       ...product.variant ? { variant: getLocalizedValue(product.variant, locale) } : {},
-      ...Array.isArray(product.combinations) ? { combinations: product.combinations } : {}
+      ...Array.isArray(product.combinations) ? { combinations: product.combinations } : combinations.length ? { combinations } : {}
     };
   });
 }
@@ -204,6 +207,77 @@ function resolveProductTitle(params) {
     locale
   );
 }
+function normalizeProductOptions(params) {
+  var _a;
+  const { product, locale, currencySymbol } = params;
+  const rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_a = product.product_sku) == null ? void 0 : _a.option) ? product.product_sku.option : [];
+  return rawOptions.map((option) => {
+    const price = option.original_price ?? option.add_price ?? option.price;
+    const value = option.value ?? option.option ?? option.item;
+    return {
+      name: getLocalizedValue(option.name || option.title, locale),
+      ...option.num !== void 0 || option.quantity !== void 0 ? { num: toNumber(option.num ?? option.quantity, 1) } : {},
+      ...price !== void 0 && price !== null && price !== "" ? { price: formatMoney(price, currencySymbol) } : {},
+      ...value !== void 0 && value !== null && value !== "" ? { value: getLocalizedValue(value, locale) } : {}
+    };
+  });
+}
+function normalizeProductCombinations(params) {
+  const { product, productMap, locale, currencySymbol } = params;
+  const bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
+  return bundles.map((bundle) => {
+    const combinationsOptions = normalizeProductOptions({
+      product: {},
+      locale,
+      currencySymbol,
+      options: Array.isArray(bundle.option) ? bundle.option : []
+    });
+    const baseTitle = resolveBundleProductTitle({ bundle, productMap, locale });
+    const optionTitle = buildOptionTitleSuffix(combinationsOptions);
+    return {
+      product_title: `${baseTitle}${optionTitle}`,
+      product_quantity: toNumber(bundle.num ?? bundle.quantity ?? 1, 1),
+      price: formatBundlePrice(bundle, currencySymbol),
+      combinations_options: combinationsOptions
+    };
+  });
+}
+function resolveBundleProductTitle(params) {
+  var _a, _b;
+  const { bundle, productMap, locale } = params;
+  const ownTitle = getLocalizedValue(
+    bundle.product_title || bundle.title || bundle.name || ((_a = bundle.product) == null ? void 0 : _a.title),
+    locale
+  );
+  if (ownTitle)
+    return ownTitle;
+  const productId = bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? bundle.id;
+  const fallbackProduct = productId !== void 0 && productId !== null ? productMap[productId] || productMap[String(productId)] : null;
+  if (!fallbackProduct)
+    return "";
+  return getLocalizedValue(
+    fallbackProduct.product_title || fallbackProduct.title || fallbackProduct.name || fallbackProduct.format_title || ((_b = fallbackProduct.product) == null ? void 0 : _b.title),
+    locale
+  );
+}
+function buildOptionTitleSuffix(options) {
+  const text = options.map((option) => {
+    const name = stringify(option.name).trim();
+    if (!name)
+      return "";
+    const quantity = option.num ?? 1;
+    return `${name} x ${quantity}`;
+  }).filter(Boolean).join(", ");
+  return text ? `(${text})` : "";
+}
+function formatBundlePrice(bundle, currencySymbol) {
+  const value = bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0;
+  const amount = new import_decimal.default(toMoneyNumber(value));
+  const isNegative = bundle.price_type === "markdown" || bundle.price_type === "markup" && bundle.price_type_ext === "product_price";
+  if (isNegative)
+    return `-${currencySymbol}${amount.abs().toFixed(2)}`;
+  return formatMoney(amount, currencySymbol);
+}
 function buildFees(params) {
   const { order, shopInfo, locale, products, summary, currencySymbol } = params;
   const fees = [];

package/lib/solution/BaseSales/index.js

@@ -109,7 +109,7 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
   if (!currentTempOrder)
     return loadedRecord;
-  return (0, import_lodash_es.mergeWith)(
+  const mergedRecord = (0, import_lodash_es.mergeWith)(
     (0, import_lodash_es.cloneDeep)(currentTempOrder),
     (0, import_lodash_es.cloneDeep)(loadedRecord || {}),
     (currentValue, loadedValue, key) => {
@@ -131,6 +131,8 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
       return void 0;
     }
   );
+  delete mergedRecord.request_unique_idempotency_token;
+  return mergedRecord;
 }
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -1389,9 +1391,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!metadata.unique_payment_number) {
       metadata.unique_payment_number = (0, import_utils.createUuidV4)();
     }
+    const paymentTime = paymentRecord.payment_time ?? (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
     const payments = this.store.order.addOrderPayment({
       ...paymentRecord,
-      metadata
+      metadata,
+      payment_time: paymentTime
     });
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();

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

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

@@ -109,7 +109,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      *
      * @returns loadSalesDetail 的返回值
      */
-    refreshSalesDetail(): Promise<ISalesDetail>;
+    refreshSalesDetail(params?: {
+        forceRemote?: boolean;
+    }): Promise<ISalesDetail>;
     /**
      * 获取商品列表
      * @param params 包含 schedule_date 的参数
@@ -310,7 +312,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/solution/BookingTicket/index.js

@@ -465,7 +465,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    *
    * @returns loadSalesDetail 的返回值
    */
-  async refreshSalesDetail() {
+  async refreshSalesDetail(params = {}) {
     var _a, _b;
     const tempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
     if (!tempOrder) {
@@ -477,8 +477,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return this.loadSalesDetail({
       orderId: Number(orderId),
-      merge: true
-      // forceRemote: true,
+      // merge: true
+      forceRemote: params.forceRemote
     });
   }
   /**

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

@@ -305,6 +305,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      *
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
+    /** @deprecated */
     private cleanupExpiredOrdersAsync;
     /**
      * 清除计算缓存

package/lib/solution/Checkout/index.js

@@ -80,8 +80,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currentCustomer: void 0
     };
     await this.initializeSubModules(core, options);
-    await this.preloadPaymentMethods();
-    await this.cleanupExpiredOrdersAsync();
     console.log("[Checkout] 初始化完成");
     await this.core.effects.emit(`${this.name}:onCheckoutInitialized`, {
       timestamp: Date.now()
@@ -1900,6 +1898,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    *
    * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
    */
+  /** @deprecated */
   async cleanupExpiredOrdersAsync() {
     var _a, _b, _c;
     try {

package/package.json

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