@pisell/pisellos 2.2.221 → 2.2.223

package/lib/modules/Customer/index.js

@@ -48,6 +48,29 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     this.openCache = false;
     this.otherParams = {};
   }
+  /**
+   * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
+   *
+   * @example
+   * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
+   */
+  isSameSelectedCustomer(current, next) {
+    const normalizedNext = !next ? import_constants.DEFAULT_CUSTOMER : next;
+    const normalizedCurrent = current || null;
+    if (!normalizedCurrent)
+      return false;
+    if (String((normalizedCurrent == null ? void 0 : normalizedCurrent.id) ?? "") === "1" && String((normalizedNext == null ? void 0 : normalizedNext.id) ?? "") === "1") {
+      return true;
+    }
+    const keys = [
+      "id",
+      "name",
+      "phone",
+      "email",
+      "country_calling_code"
+    ];
+    return keys.every((key) => String((normalizedCurrent == null ? void 0 : normalizedCurrent[key]) ?? "") === String((normalizedNext == null ? void 0 : normalizedNext[key]) ?? ""));
+  }
   async initialize(core, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.core = core;
@@ -225,6 +248,9 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
    * @param customer 选择的客户
    */
   setSelectedCustomer(customer) {
+    if (this.isSameSelectedCustomer(this.store.selectedCustomer, customer)) {
+      return;
+    }
     this.store.selectedCustomer = !customer ? import_constants.DEFAULT_CUSTOMER : (0, import_lodash_es.cloneDeep)(customer);
     this.core.effects.emit(
       `${this.name}:onCustomerSelected`,

package/lib/modules/OpenData/index.js

@@ -94,7 +94,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   }
   checkAvailability(scheduleModule) {
     var _a;
-    const scheduleList = scheduleModule ? scheduleModule.getScheduleListByIds(
+    const scheduleList = scheduleModule ? scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(
       ((_a = this.store.data) == null ? void 0 : _a["availability.operating_hours"]) || []
     ) : void 0;
     return (0, import_utils.computeAvailability)({

package/lib/modules/Order/index.js

@@ -3050,7 +3050,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 例如数组字段、商品行唯一值、价格 metadata、summary 派生状态和 _extend。
    */
   async hydrateTempOrderFromRecord(record, options) {
-    var _a, _b;
+    var _a, _b, _c;
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
     const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
@@ -3073,8 +3073,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     this.store.lastOrderInfo = raw.lastOrderInfo || raw;
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-    await ((_a = this.store.discount) == null ? void 0 : _a.setOriginalDiscountList(hydratedEditDiscounts));
-    await ((_b = this.store.discount) == null ? void 0 : _b.setDiscountList(hydratedEditDiscounts));
+    const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
+    const shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
+    if (!shouldSkipEmptyDiscountSync) {
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
+    }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });
     }

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

@@ -434,6 +434,8 @@ export interface PaymentItemData {
     name: string;
     /** 支付类型 */
     type: string;
+    /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    payment_time?: string;
     /** @deprecated BaseSales/Sales 协议不提交该字段；旧 Checkout/Payment 内部仍可能使用 */
     isSynced?: boolean;
 }
@@ -456,6 +458,7 @@ export interface OrderPaymentData {
     origin_amount?: string;
     service_fee?: string;
     status?: 'active' | 'voided' | string;
+    /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
     wallet_pass_use_value?: string | number | null;

package/lib/modules/Order/utils.js

@@ -818,6 +818,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
       metadata[key] = item[key];
     }
   }
+  const paymentTime = item.payment_time ?? (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
   return {
     ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
     amount: String(item.amount ?? "0.00"),
@@ -829,7 +830,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
     ...item.origin_amount !== void 0 ? { origin_amount: String(item.origin_amount) } : {},
     ...item.service_fee !== void 0 ? { service_fee: String(item.service_fee) } : {},
     ...item.status !== void 0 ? { status: item.status } : {},
-    ...item.payment_time !== void 0 ? { payment_time: item.payment_time } : {},
+    payment_time: paymentTime,
     ...item.wallet_pass_usage_unit !== void 0 ? { wallet_pass_usage_unit: item.wallet_pass_usage_unit } : {},
     ...item.wallet_pass_use_value !== void 0 ? { wallet_pass_use_value: item.wallet_pass_use_value } : {},
     ...item.fund_record && typeof item.fund_record === "object" && !Array.isArray(item.fund_record) ? { fund_record: { ...item.fund_record } } : {},

package/lib/modules/Payment/types.d.ts

@@ -135,6 +135,8 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    payment_time?: string;
     /** 本支付项是否已成功同步到后端 */
     isSynced?: boolean;
     /** 最近一次同步失败信息（存在则代表同步失败过） */

package/lib/modules/SalesSummary/index.js

@@ -100,12 +100,13 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     };
   }
   async getSummary(params) {
+    var _a, _b;
     const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
     const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`
     );
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (_b = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids)) == null ? void 0 : _b.flat();
     const scheduleList = summarySchedule == null ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

package/lib/modules/Schedule/index.js

@@ -135,8 +135,10 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
+    var _a;
     const idSet = new Set(ids.map((id) => String(id)));
-    const list = this.store.scheduleList.filter((n) => idSet.has(String(n.id)));
+    console.log("getScheduleListByIds", this.store.scheduleList);
+    const list = (_a = this.store.scheduleList) == null ? void 0 : _a.filter((n) => idSet.has(String(n.id)));
     return list;
   }
   setAvailabilityScheduleDateList(list) {

package/lib/modules/Summary/index.js

@@ -74,10 +74,10 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
   }
   async getSummary(cartItems) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
     const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (_c = this.store.surchargeList) == null ? void 0 : _c.map((item) => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
@@ -85,7 +85,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
         scheduleById[item.id] = item;
       }
     }
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_c = import_Schedule.ScheduleModule) == null ? void 0 : _c.isInScheduleByDate, this.store.surchargeList, scheduleById);
+    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_d = import_Schedule.ScheduleModule) == null ? void 0 : _d.isInScheduleByDate, this.store.surchargeList, scheduleById);
     this.store.summary = summary;
     return this.store.summary;
   }
@@ -119,8 +119,9 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     });
   }
   getSurchargeforUtils(items) {
+    var _a;
     const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

package/lib/server/index.d.ts

@@ -412,6 +412,8 @@ declare class Server {
     private getProductTitleSnapshotCurrentLocale;
     private normalizeProductTitleSnapshotLocale;
     private resolveProductTitleValue;
+    private canAssignStringProductTitleToLocale;
+    private hasCjkText;
     private resolveFirstProductTitleValue;
     private withLocalSmallTicketData;
     private handleOrderSalesDetail;

package/lib/server/index.js

@@ -2611,6 +2611,7 @@ var Server = class {
           total_amount: (_d = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _d.total_amount,
           payment_status: pendingOrder == null ? void 0 : pendingOrder.payment_status,
           payment_info: {
+            ...(pendingOrder == null ? void 0 : pendingOrder.payment_info) || {},
             current_change_given_amount: changeGivenAmount
           }
         }
@@ -2705,11 +2706,22 @@ var Server = class {
   async buildSmallTicketProductMap(order) {
     var _a;
     const products = Array.isArray(order == null ? void 0 : order.products) ? order.products : [];
-    const productIds = Array.from(
-      new Set(
-        products.map((product) => (product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id)).filter((id) => id !== void 0 && id !== null && id !== "")
-      )
-    );
+    const productIdSet = /* @__PURE__ */ new Set();
+    products.forEach((product) => {
+      const productId = (product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id);
+      if (productId !== void 0 && productId !== null && productId !== "") {
+        productIdSet.add(productId);
+      }
+      if (Array.isArray(product == null ? void 0 : product.product_bundle)) {
+        product.product_bundle.forEach((bundle) => {
+          const bundleProductId = (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id);
+          if (bundleProductId !== void 0 && bundleProductId !== null && bundleProductId !== "") {
+            productIdSet.add(bundleProductId);
+          }
+        });
+      }
+    });
+    const productIds = Array.from(productIdSet);
     if (!productIds.length || typeof ((_a = this.products) == null ? void 0 : _a.getProductById) !== "function")
       return {};
     const entries = await Promise.all(
@@ -2777,8 +2789,11 @@ var Server = class {
     if (value === void 0 || value === null || value === "")
       return null;
     if (typeof value !== "object") {
-      if (key === "auto" || key === "original" || key === currentLocale)
-        return String(value);
+      const title = String(value);
+      if (key === "auto" || key === "original")
+        return title;
+      if (key === currentLocale && this.canAssignStringProductTitleToLocale(title, currentLocale))
+        return title;
       return null;
     }
     const normalizedKey = key.replace("-", "_");
@@ -2790,6 +2805,21 @@ var Server = class {
       return this.resolveFirstProductTitleValue(rawValue);
     return String(rawValue);
   }
+  canAssignStringProductTitleToLocale(title, locale) {
+    if (!locale)
+      return false;
+    if (locale === "zh-CN" || locale === "zh-HK" || locale === "kitchen") {
+      return this.hasCjkText(title);
+    }
+    if (locale === "ja")
+      return /[\u3040-\u30ff]/.test(title) || this.hasCjkText(title);
+    if (locale === "en" || locale === "pt")
+      return !this.hasCjkText(title);
+    return false;
+  }
+  hasCjkText(value) {
+    return /[\u3400-\u9fff]/.test(value);
+  }
   resolveFirstProductTitleValue(value) {
     if (value === void 0 || value === null || value === "")
       return null;

package/lib/server/modules/order/index.js

@@ -71,6 +71,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.emitOrdersChanged([freshOrder], 'pubsub.bodyUpsert')
    */
   async emitOrdersChanged(changedOrders = [], source) {
+    console.log("触发emitOrdersChanged");
     const payload = {
       list: this.store.list,
       changedOrders: changedOrders.map((order) => this.normalizeOrderForMemoryList(order)),

package/lib/server/modules/order/types.d.ts

@@ -239,7 +239,7 @@ export interface OrderPaymentItem {
     rounding_amount?: OrderMoneyString;
     /** 支付状态：paid / voided / payment_pending 等 */
     status?: OrderPaymentRecordStatus;
-    /** 支付时间（仅输出）。来源：OrderPayment.payment_time */
+    /** 支付时间（输入/输出均保留）。来源：OrderPayment.payment_time */
     payment_time?: string | null;
     /** 手续费配置。来源：OrderPayment.service_charge */
     service_charge?: Record<string, unknown> | null;

package/lib/server/modules/order/utils/filterBookings.js

@@ -168,9 +168,13 @@ function matchOrder(order, ctx) {
   return true;
 }
 function matchBooking(booking, orderInfo, ctx) {
-  if (ctx.enableChildBookingFilter) {
-    const parentId = Number(booking.parent_id ?? 0);
-    const itemType = String(booking.item_type ?? "");
+  if (ctx.enableChildBookingFilter && booking.booking_id) {
+    const parentId = Number(
+      booking.parent_id ?? 0
+    );
+    const itemType = String(
+      booking.item_type ?? ""
+    );
     const isMatched = parentId !== 0 && itemType !== "recurring_booking" || parentId === 0 && itemType === "recurring_booking";
     if (!isMatched)
       return false;

package/lib/server/modules/schedule/index.d.ts

@@ -64,15 +64,15 @@ export declare class ScheduleModuleEx extends BaseModule implements Module, Sche
      */
     getDateIsInSchedule(date: string, scheduleList: (ScheduleItem | number)[]): boolean;
     /**
-     * 从 IndexDB 加载日程数据
+     * 从 SQLite 加载日程数据
      * @private
      */
-    private loadScheduleFromIndexDB;
+    private loadScheduleFromSQLite;
     /**
-     * 保存日程数据到 IndexDB
+     * 保存日程数据到 SQLite
      * @private
      */
-    private saveScheduleToIndexDB;
+    private saveScheduleToSQLite;
     /**
      * 预加载模块数据（统一接口）
      * 在模块注册后自动调用

package/lib/server/modules/schedule/index.js

@@ -40,7 +40,7 @@ var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_utils = require("../../../solution/ShopDiscount/utils");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
-var INDEXDB_STORE_NAME = "schedule";
+var SCHEDULE_STORE_NAME = "schedule";
 var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
@@ -117,12 +117,12 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
     const appPlugin = core.getPlugin("app");
     if (appPlugin) {
       const app = appPlugin.getApp();
-      this.dbManager = app.dbManager;
+      this.dbManager = app.sqlite;
       this.logger = app.logger;
       if (this.dbManager) {
-        console.log("[Schedule] IndexDB Manager 已初始化");
+        console.log("[Schedule] SQLite 已初始化");
       } else {
-        console.warn("[Schedule] IndexDB Manager 未找到");
+        console.warn("[Schedule] SQLite 未找到");
       }
     }
     this.logInfo("模块初始化完成", {
@@ -150,7 +150,7 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
         scheduleCount: list.length,
         duration: `${duration}ms`
       });
-      await this.saveScheduleToIndexDB(list);
+      await this.saveScheduleToSQLite(list);
       this.setScheduleList(list);
       return list;
     } catch (error) {
@@ -220,13 +220,13 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
     this.store.map.clear();
     if (this.dbManager) {
       try {
-        await this.dbManager.clear(INDEXDB_STORE_NAME);
-        console.log("[Schedule] IndexDB 缓存已清空");
-        this.logInfo("IndexDB 缓存已清空");
+        await this.dbManager.clear(SCHEDULE_STORE_NAME);
+        console.log("[Schedule] SQLite 缓存已清空");
+        this.logInfo("SQLite 缓存已清空");
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error("[Schedule] 清空 IndexDB 缓存失败:", error);
-        this.logError("清空 IndexDB 缓存失败", { error: errorMessage });
+        console.error("[Schedule] 清空 SQLite 缓存失败:", error);
+        this.logError("清空 SQLite 缓存失败", { error: errorMessage });
       }
     }
     this.logInfo("缓存清空完成");
@@ -255,51 +255,58 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
     return result;
   }
   /**
-   * 从 IndexDB 加载日程数据
+   * 从 SQLite 加载日程数据
    * @private
    */
-  async loadScheduleFromIndexDB() {
+  async loadScheduleFromSQLite() {
     if (!this.dbManager) {
-      this.logWarning("loadScheduleFromIndexDB: dbManager 不可用");
+      this.logWarning("loadScheduleFromSQLite: SQLite 不可用");
       return [];
     }
     try {
-      const scheduleList = await this.dbManager.getAll(INDEXDB_STORE_NAME);
-      this.logInfo("从 IndexDB 加载日程数据", {
+      const scheduleList = await this.dbManager.getAll(SCHEDULE_STORE_NAME);
+      this.logInfo("从 SQLite 加载日程数据", {
         scheduleCount: (scheduleList == null ? void 0 : scheduleList.length) ?? 0
       });
       return scheduleList || [];
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error("[Schedule] 从 IndexDB 读取数据失败:", error);
-      this.logError("从 IndexDB 读取数据失败", { error: errorMessage });
+      console.error("[Schedule] 从 SQLite 读取数据失败:", error);
+      this.logError("从 SQLite 读取数据失败", { error: errorMessage });
       return [];
     }
   }
   /**
-   * 保存日程数据到 IndexDB
+   * 保存日程数据到 SQLite
    * @private
    */
-  async saveScheduleToIndexDB(scheduleList) {
+  async saveScheduleToSQLite(scheduleList) {
     if (!this.dbManager) {
-      this.logWarning("saveScheduleToIndexDB: dbManager 不可用");
+      this.logWarning("saveScheduleToSQLite: SQLite 不可用");
       return;
     }
-    this.logInfo("开始保存日程数据到 IndexDB", { scheduleCount: scheduleList.length });
+    this.logInfo("开始保存日程数据到 SQLite", { scheduleCount: scheduleList.length });
     try {
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
-      const savePromises = scheduleList.map(
-        (schedule) => this.dbManager.add(INDEXDB_STORE_NAME, schedule)
-      );
-      await Promise.all(savePromises);
+      await this.dbManager.clear(SCHEDULE_STORE_NAME);
+      if (scheduleList.length > 0) {
+        if (typeof this.dbManager.bulkAdd === "function") {
+          await this.dbManager.bulkAdd(SCHEDULE_STORE_NAME, scheduleList);
+        } else if (typeof this.dbManager.bulkUpdate === "function") {
+          await this.dbManager.bulkUpdate(SCHEDULE_STORE_NAME, scheduleList);
+        } else {
+          await Promise.all(scheduleList.map(
+            (schedule) => this.dbManager.add(SCHEDULE_STORE_NAME, schedule)
+          ));
+        }
+      }
       console.log(
-        `[Schedule] 已将 ${scheduleList.length} 条日程数据保存到 IndexDB`
+        `[Schedule] 已将 ${scheduleList.length} 条日程数据保存到 SQLite`
       );
-      this.logInfo("日程数据已保存到 IndexDB", { scheduleCount: scheduleList.length });
+      this.logInfo("日程数据已保存到 SQLite", { scheduleCount: scheduleList.length });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error("[Schedule] 保存数据到 IndexDB 失败:", error);
-      this.logError("保存数据到 IndexDB 失败", {
+      console.error("[Schedule] 保存数据到 SQLite 失败:", error);
+      this.logError("保存数据到 SQLite 失败", {
         scheduleCount: scheduleList.length,
         error: errorMessage
       });
@@ -314,31 +321,30 @@ var ScheduleModuleEx = class extends import_BaseModule.BaseModule {
     const startTime = Date.now();
     this.logInfo("开始预加载数据");
     try {
-      const cachedData = await this.loadScheduleFromIndexDB();
+      const cachedData = await this.loadScheduleFromSQLite();
       if (cachedData && cachedData.length > 0) {
         console.log(
-          `[Schedule] 从 IndexDB 加载了 ${cachedData.length} 条日程数据`
+          `[Schedule] 从 SQLite 加载了 ${cachedData.length} 条日程数据`
         );
         this.store.scheduleList = (0, import_lodash_es.cloneDeep)(cachedData);
         this.syncScheduleMap();
         const duration = Date.now() - startTime;
-        this.logInfo("预加载完成（从 IndexDB）", {
+        this.logInfo("预加载完成（从 SQLite）", {
           scheduleCount: cachedData.length,
           duration: `${duration}ms`,
-          source: "IndexDB"
+          source: "SQLite"
         });
         return;
       }
-      console.log("[Schedule] IndexDB 中没有缓存数据，从服务器加载...");
-      this.logInfo("IndexDB 中没有缓存数据，准备从服务器加载");
+      console.log("[Schedule] SQLite 中没有缓存数据，从服务器加载...");
+      this.logInfo("SQLite 中没有缓存数据，准备从服务器加载");
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.warn("[Schedule] 从 IndexDB 加载数据失败:", error);
-      this.logWarning("从 IndexDB 加载数据失败，准备从服务器加载", { error: errorMessage });
+      console.warn("[Schedule] 从 SQLite 加载数据失败:", error);
+      this.logWarning("从 SQLite 加载数据失败，准备从服务器加载", { error: errorMessage });
     }
     const scheduleList = await this.loadAllSchedule();
     if (scheduleList && scheduleList.length > 0) {
-      await this.saveScheduleToIndexDB(scheduleList);
       this.store.scheduleList = (0, import_lodash_es.cloneDeep)(scheduleList);
       this.syncScheduleMap();
       const duration = Date.now() - startTime;

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

@@ -37,7 +37,9 @@ export interface SmallTicketProduct {
     extension_list: any[];
     options?: Array<{
         name: string;
-        value: string;
+        num?: number;
+        price?: string;
+        value?: string;
     }>;
     variant?: string;
     combinations?: any[];

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 = [];