@pisell/pisellos 0.0.252 → 0.0.253

package/dist/solution/Checkout/utils/index.d.ts

@@ -1,4 +1,5 @@
-import { CheckoutInitParams, CheckoutError, CheckoutErrorType, CheckoutStatus, CheckoutStep } from '../types';
+import { CheckoutInitParams, CheckoutError, CheckoutErrorType, CheckoutStatus, CheckoutStep, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
+import { CartItem } from '../../../modules/Cart/types';
 /**
  * 验证结账数据
  */
@@ -71,3 +72,46 @@ export declare const logger: {
     error: (message: string, ...args: any[]) => void;
     debug: (message: string, ...args: any[]) => void;
 };
+/**
+ * 验证本地订单数据
+ */
+export declare function validateLocalOrderData(orderData: LocalOrderData): {
+    valid: boolean;
+    errors: string[];
+};
+/**
+ * 生成本地订单ID
+ */
+export declare function generateLocalOrderId(): string;
+/**
+ * 格式化日期时间为 YYYY-MM-DD hh:mm:ss 格式
+ *
+ * @param date 要格式化的日期对象
+ * @returns 格式化后的日期时间字符串
+ */
+export declare function formatDateTime(date: Date): string;
+/**
+ * 从购物车小计数据中提取金额信息
+ */
+export declare function extractAmountFromCartSummary(cartSummary: CartSummaryItem[]): ExtractedAmountInfo;
+/**
+ * 计算购物车总金额
+ */
+export declare function calculateTotalAmount(cartItems: CartItem[]): string;
+/**
+ * 判断订单ID是否为本地生成的虚拟ID
+ *
+ * @param orderId 订单ID
+ * @returns true 表示是虚拟ID，false 表示是真实的后端ID
+ */
+export declare function isVirtualOrderId(orderId: string): boolean;
+/**
+ * 判断支付方式是否需要同步订单到后端
+ *
+ * 现金支付(CASHMANUAL)和自定义支付不需要同步，其他支付方式需要同步
+ *
+ * @param paymentCode 支付方式代码
+ * @param paymentType 支付方式类型
+ * @returns 是否需要同步订单
+ */
+export declare function shouldSyncOrderForPayment(paymentCode: string, paymentType: string): boolean;

package/dist/solution/Checkout/utils/index.js

@@ -3,6 +3,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { CheckoutStatus, CheckoutStep } from "../types";
+import { PaymentMethodType } from "../../../modules/Payment/types";
 
 /**
  * 验证结账数据
@@ -368,4 +369,181 @@ export var logger = {
       (_console4 = console).debug.apply(_console4, ["[Checkout] ".concat(message)].concat(args));
     }
   }
-};
+};
+
+// ========== 从 CheckoutImpl 类中移出的纯静态方法 ==========
+
+/**
+ * 验证本地订单数据
+ */
+export function validateLocalOrderData(orderData) {
+  var _orderData$relation_p;
+  var errors = [];
+
+  // 验证基本字段
+  if (!orderData.type) {
+    errors.push('订单类型不能为空');
+  }
+  if (!orderData.platform) {
+    errors.push('平台信息不能为空');
+  }
+  if ((!orderData.bookings || orderData.bookings.length === 0) && !(orderData !== null && orderData !== void 0 && (_orderData$relation_p = orderData.relation_products) !== null && _orderData$relation_p !== void 0 && _orderData$relation_p.length)) {
+    errors.push('预订信息不能为空');
+  }
+
+  // 验证预订信息
+  if (orderData.bookings) {
+    orderData.bookings.forEach(function (booking, index) {
+      if (!booking.product || !booking.product.product_id) {
+        errors.push("\u9884\u8BA2\u9879 ".concat(index + 1, " \u7F3A\u5C11\u5546\u54C1\u4FE1\u606F"));
+      }
+      if (!booking.start_date) {
+        errors.push("\u9884\u8BA2\u9879 ".concat(index + 1, " \u7F3A\u5C11\u5F00\u59CB\u65E5\u671F"));
+      }
+      if (!booking.start_time) {
+        errors.push("\u9884\u8BA2\u9879 ".concat(index + 1, " \u7F3A\u5C11\u5F00\u59CB\u65F6\u95F4"));
+      }
+    });
+  }
+  return {
+    valid: errors.length === 0,
+    errors: errors
+  };
+}
+
+/**
+ * 生成本地订单ID
+ */
+export function generateLocalOrderId() {
+  var timestamp = Date.now();
+  var random = Math.floor(Math.random() * 10000).toString().padStart(4, '0');
+  return "local_order_".concat(timestamp, "_").concat(random);
+}
+
+/**
+ * 格式化日期时间为 YYYY-MM-DD hh:mm:ss 格式
+ * 
+ * @param date 要格式化的日期对象
+ * @returns 格式化后的日期时间字符串
+ */
+export function formatDateTime(date) {
+  var year = date.getFullYear();
+  var month = String(date.getMonth() + 1).padStart(2, '0');
+  var day = String(date.getDate()).padStart(2, '0');
+  var hours = String(date.getHours()).padStart(2, '0');
+  var minutes = String(date.getMinutes()).padStart(2, '0');
+  var seconds = String(date.getSeconds()).padStart(2, '0');
+  return "".concat(year, "-").concat(month, "-").concat(day, " ").concat(hours, ":").concat(minutes, ":").concat(seconds);
+}
+
+/**
+ * 从购物车小计数据中提取金额信息
+ */
+export function extractAmountFromCartSummary(cartSummary) {
+  var result = {
+    totalAmount: '0.00',
+    subTotal: '0.00',
+    taxAmount: '0.00',
+    discountAmount: '0.00',
+    shopDiscountAmount: '0.00',
+    roundingAmount: '0.00'
+  };
+  cartSummary.forEach(function (item) {
+    var value = Number(item.value).toFixed(2);
+    switch (item.key) {
+      case 'expect_amount':
+        result.totalAmount = value;
+        break;
+      case 'sub_total':
+        result.subTotal = value;
+        break;
+      case 'tax':
+        result.taxAmount = value;
+        if (item.tax) {
+          result.taxDetails = item.tax;
+        }
+        break;
+      case 'discount':
+        result.discountAmount = value;
+        break;
+      case 'shop_discount':
+        result.shopDiscountAmount = value;
+        break;
+      case 'custom_roundingAmount':
+        result.roundingAmount = value;
+        break;
+      default:
+        // 处理其他可能的键，如定金等
+        if (item.key.includes('deposit')) {
+          result.depositAmount = value;
+        }
+        break;
+    }
+  });
+  console.log('[Checkout] 从购物车小计提取金额信息:', {
+    totalAmount: result.totalAmount,
+    subTotal: result.subTotal,
+    taxAmount: result.taxAmount,
+    discountAmount: result.discountAmount,
+    shopDiscountAmount: result.shopDiscountAmount,
+    roundingAmount: result.roundingAmount
+  });
+  return result;
+}
+
+/**
+ * 计算购物车总金额
+ */
+export function calculateTotalAmount(cartItems) {
+  var total = cartItems.reduce(function (sum, item) {
+    var price = parseFloat(String(item.price) || '0');
+    var quantity = item.quantity || 1;
+    return sum + price * quantity;
+  }, 0);
+  return total.toFixed(2);
+}
+
+/**
+ * 判断订单ID是否为本地生成的虚拟ID
+ * 
+ * @param orderId 订单ID
+ * @returns true 表示是虚拟ID，false 表示是真实的后端ID
+ */
+export function isVirtualOrderId(orderId) {
+  return orderId.startsWith('local_order_');
+}
+
+/**
+ * 判断支付方式是否需要同步订单到后端
+ *
+ * 现金支付(CASHMANUAL)和自定义支付不需要同步，其他支付方式需要同步
+ *
+ * @param paymentCode 支付方式代码
+ * @param paymentType 支付方式类型
+ * @returns 是否需要同步订单
+ */
+export function shouldSyncOrderForPayment(paymentCode, paymentType) {
+  var codeUpper = (paymentCode === null || paymentCode === void 0 ? void 0 : paymentCode.toUpperCase()) || '';
+  var typeUpper = (paymentType === null || paymentType === void 0 ? void 0 : paymentType.toUpperCase()) || '';
+
+  // 现金支付不需要同步 - 支持多种现金支付识别方式
+  var cashIdentifiers = ['CASHMANUAL', 'CASH', 'MANUAL'];
+  if (cashIdentifiers.some(function (id) {
+    return codeUpper.includes(id) || typeUpper.includes(id);
+  })) {
+    return false;
+  }
+
+  // 标准现金支付代码检查
+  if (paymentCode === PaymentMethodType.Cash || paymentType === PaymentMethodType.Cash) {
+    return false;
+  }
+
+  // 自定义支付不需要同步
+  if (codeUpper.includes('CUSTOM') || typeUpper.includes('CUSTOM')) {
+    return false;
+  }
+
+  // 其他支付方式都需要同步
+  return true;
+}

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

@@ -7,8 +7,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     protected defaultVersion: string;
     private store;
     private request;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 记录信息日志
+     */
+    private logInfo;
+    /**
+     * 记录警告日志
+     */
+    private logWarning;
+    /**
+     * 记录错误日志
+     */
+    private logError;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
         platform: string;

package/lib/modules/Order/index.js

@@ -37,6 +37,7 @@ var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var OrderModule = class extends import_BaseModule.BaseModule {
+  // LoggerManager 实例
   constructor(name, version) {
     super(name, version);
     this.defaultName = "order";
@@ -46,6 +47,44 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
+    this.logger = this.core.getPlugin("logger");
+    this.logInfo("OrderModule initialized successfully");
+  }
+  /**
+   * 记录信息日志
+   */
+  logInfo(title, metadata) {
+    if (this.logger) {
+      this.logger.addLog({
+        type: "info",
+        title: `[OrderModule] ${title}`,
+        metadata: metadata || {}
+      });
+    }
+  }
+  /**
+   * 记录警告日志
+   */
+  logWarning(title, metadata) {
+    if (this.logger) {
+      this.logger.addLog({
+        type: "warning",
+        title: `[OrderModule] ${title}`,
+        metadata: metadata || {}
+      });
+    }
+  }
+  /**
+   * 记录错误日志
+   */
+  logError(title, metadata) {
+    if (this.logger) {
+      this.logger.addLog({
+        type: "error",
+        title: `[OrderModule] ${title}`,
+        metadata: metadata || {}
+      });
+    }
   }
   createOrder(params) {
     var _a;
@@ -97,6 +136,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return order;
   }
   checkBeforeSubmitOrder(params) {
+    var _a;
+    this.logInfo("checkBeforeSubmitOrder called", {
+      cartItemsCount: ((_a = params.cartItems) == null ? void 0 : _a.length) || 0,
+      type: params.type
+    });
     const { cartItems, type } = params;
     if (type === "holder") {
       const hasNoHolderId = cartItems.some((item) => !item.holder_id);
@@ -107,9 +151,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return true;
   }
   async submitOrder(order) {
+    var _a, _b, _c;
+    this.logInfo("submitOrder called", {
+      url: order.url,
+      orderType: order.query.type,
+      platform: order.query.platform,
+      cartItemsCount: ((_a = order.query.cartItems) == null ? void 0 : _a.length) || 0
+    });
     const { url, query } = order;
     const fetchUrl = url || "/order/appointment";
     const params = this.createOrder(query);
+    this.logInfo("Calling backend order API", {
+      url: fetchUrl,
+      orderType: params.type,
+      platform: params.platform,
+      isDeposit: params.is_deposit,
+      bookingsCount: ((_b = params.bookings) == null ? void 0 : _b.length) || 0,
+      relationProductsCount: ((_c = params.relation_products) == null ? void 0 : _c.length) || 0,
+      scheduleDate: params.schedule_date
+    });
     return this.request.post(fetchUrl, params);
   }
   /**
@@ -123,15 +183,31 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的订单数据（包含订单ID等）
    */
   async createOrderByCheckout(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-    console.log("[Order] createOrderByCheckout 开始创建订单:", {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    this.logInfo("createOrderByCheckout called", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
       bookingsCount: ((_a = params.bookings) == null ? void 0 : _a.length) || 0,
       relationProductsCount: ((_b = params.relation_products) == null ? void 0 : _b.length) || 0,
-      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0
+      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0,
+      depositAmount: params.deposit_amount,
+      productTaxFee: params.product_tax_fee,
+      note: params.note,
+      scheduleDate: params.schedule_date,
+      hasOrderId: !!params.order_id,
+      orderIdIncluded: params.order_id,
+      paymentMethods: ((_d = params.payments) == null ? void 0 : _d.map((p) => p.code)) || []
+    });
+    console.log("[Order] createOrderByCheckout 开始创建订单:", {
+      type: params.type,
+      platform: params.platform,
+      is_deposit: params.is_deposit,
+      customer_id: params.customer_id,
+      bookingsCount: ((_e = params.bookings) == null ? void 0 : _e.length) || 0,
+      relationProductsCount: ((_f = params.relation_products) == null ? void 0 : _f.length) || 0,
+      paymentsCount: ((_g = params.payments) == null ? void 0 : _g.length) || 0
     });
     try {
       const orderData = {
@@ -147,7 +223,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...params
         // 使用传入的参数覆盖默认值
       };
-      if ((_d = orderData.payments) == null ? void 0 : _d.length) {
+      if ((_h = orderData.payments) == null ? void 0 : _h.length) {
         orderData.small_ticket_data_flag = 1;
       }
       if (params.order_id) {
@@ -163,15 +239,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         platform: orderData.platform,
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
-        bookingsCount: ((_e = orderData.bookings) == null ? void 0 : _e.length) || 0,
-        relationProductsCount: ((_f = orderData.relation_products) == null ? void 0 : _f.length) || 0,
-        paymentsCount: ((_g = orderData.payments) == null ? void 0 : _g.length) || 0,
-        paymentsMethods: ((_h = orderData.payments) == null ? void 0 : _h.map((p) => p.code)) || []
+        bookingsCount: ((_i = orderData.bookings) == null ? void 0 : _i.length) || 0,
+        relationProductsCount: ((_j = orderData.relation_products) == null ? void 0 : _j.length) || 0,
+        paymentsCount: ((_k = orderData.payments) == null ? void 0 : _k.length) || 0,
+        paymentsMethods: ((_l = orderData.payments) == null ? void 0 : _l.map((p) => p.code)) || []
+      });
+      this.logInfo("Calling backend checkout API", {
+        url: "/order/checkout",
+        orderType: orderData.type,
+        platform: orderData.platform,
+        isDeposit: orderData.is_deposit,
+        customerId: orderData.customer_id,
+        depositAmount: orderData.deposit_amount,
+        bookingsCount: ((_m = orderData.bookings) == null ? void 0 : _m.length) || 0,
+        relationProductsCount: ((_n = orderData.relation_products) == null ? void 0 : _n.length) || 0,
+        paymentsCount: ((_o = orderData.payments) == null ? void 0 : _o.length) || 0,
+        paymentMethods: ((_p = orderData.payments) == null ? void 0 : _p.map((p) => ({
+          code: p.code,
+          amount: p.amount,
+          type: p.type,
+          hasVoucherId: !!p.voucher_id,
+          orderPaymentType: p.order_payment_type
+        }))) || [],
+        productTaxFee: orderData.product_tax_fee,
+        note: orderData.note,
+        scheduleDate: orderData.schedule_date,
+        hasOrderId: !!orderData.order_id,
+        smallTicketDataFlag: orderData.small_ticket_data_flag
       });
       const response = await this.request.post("/order/checkout", orderData);
       console.log("[Order] 订单创建成功，后端响应:", {
         success: !!response,
-        hasOrderId: !!(((_i = response == null ? void 0 : response.data) == null ? void 0 : _i.order_id) || (response == null ? void 0 : response.order_id))
+        hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
       });
       return response;
     } catch (error) {

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

@@ -18,10 +18,23 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private request;
     private store;
     private otherParams;
+    private logger;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 记录信息日志
+     */
+    private logInfo;
+    /**
+     * 记录警告日志
+     */
+    private logWarning;
+    /**
+     * 记录错误日志
+     */
+    private logError;
     /**
      * 初始化子模块
      */
@@ -366,33 +379,16 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 验证结账参数
      */
     private validateCheckoutParams;
-    /**
-     * 验证本地订单数据
-     */
-    private validateLocalOrderData;
-    /**
-     * 生成本地订单ID
-     */
-    private generateLocalOrderId;
-    /**
-     * 格式化日期时间为 YYYY-MM-DD hh:mm:ss 格式
-     *
-     * @param date 要格式化的日期对象
-     * @returns 格式化后的日期时间字符串
-     */
-    private formatDateTime;
-    /**
-     * 从购物车小计数据中提取金额信息
-     */
-    private extractAmountFromCartSummary;
     /**
      * 预加载支付方式（在初始化时调用）
      */
     private preloadPaymentMethods;
     /**
-     * 计算总金额
+     * 清理过期的已同步订单数据
+     *
+     * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
-    private calculateTotalAmount;
+    private cleanupExpiredOrdersAsync;
     /**
      * 计算已支付金额（从 Payment 模块获取最新数据）
      */
@@ -415,28 +411,11 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
      */
     private checkOrderPaymentCompletion;
-    /**
-     * 判断支付方式是否需要同步订单到后端
-     *
-     * 现金支付(CASHMANUAL)和自定义支付不需要同步，其他支付方式需要同步
-     *
-     * @param paymentCode 支付方式代码
-     * @param paymentType 支付方式类型
-     * @returns 是否需要同步订单
-     */
-    private shouldSyncOrderForPayment;
     /**
      * 同步订单到后端
      *
      * 调用后端 /order/checkout 接口创建真实订单
      */
-    /**
-     * 判断订单ID是否为本地生成的虚拟ID
-     *
-     * @param orderId 订单ID
-     * @returns true 表示是虚拟ID，false 表示是真实的后端ID
-     */
-    private isVirtualOrderId;
     /**
      * 同步订单到后端并返回真实订单ID
      *