@pisell/pisellos 2.1.3 → 2.1.5

package/lib/modules/Customer/types.js

@@ -0,0 +1,37 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Customer/types.ts
+var types_exports = {};
+__export(types_exports, {
+  CustomerHooks: () => CustomerHooks
+});
+module.exports = __toCommonJS(types_exports);
+var CustomerHooks = /* @__PURE__ */ ((CustomerHooks2) => {
+  CustomerHooks2["OnCustomerListUpdate"] = "customer:onUpdate";
+  CustomerHooks2["OnCustomerListError"] = "customer:onError";
+  CustomerHooks2["OnCustomerSelected"] = "customer:onSelected";
+  CustomerHooks2["OnPaginationChange"] = "customer:onPaginationChange";
+  CustomerHooks2["OnScrollLoadMore"] = "customer:onScrollLoadMore";
+  CustomerHooks2["OnScrollLoadComplete"] = "customer:onScrollLoadComplete";
+  return CustomerHooks2;
+})(CustomerHooks || {});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CustomerHooks
+});

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

@@ -17,6 +17,23 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateList(): ITime[];
     setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     *
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+    private roundUpToNext10Minutes;
+    /**
+     * 校正资源时间段数据
+     *
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     *
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+    private correctResourceTimeSlots;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;

package/lib/modules/Date/index.js

@@ -32,6 +32,7 @@ __export(Date_exports, {
   DateModule: () => DateModule
 });
 module.exports = __toCommonJS(Date_exports);
+var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var import_cloneDeep = __toESM(require("lodash-es/cloneDeep"));
@@ -138,11 +139,74 @@ var DateModule = class extends import_BaseModule.BaseModule {
       }, {
         useCache
       });
+      if ((res == null ? void 0 : res.data) && Array.isArray(res.data)) {
+        res.data = this.correctResourceTimeSlots(res.data);
+      }
       return res;
     } catch (error) {
       console.error(error);
     }
   }
+  /**
+   * 将时间向上取整到下一个10分钟整数
+   * 
+   * @param time dayjs 时间对象
+   * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+   */
+  roundUpToNext10Minutes(time) {
+    const minutes = time.minute();
+    const remainder = minutes % 10;
+    if (remainder === 0) {
+      return time.format("YYYY-MM-DD HH:mm");
+    } else {
+      const minutesToAdd = 10 - remainder;
+      const roundedTime = time.add(minutesToAdd, "minute");
+      return roundedTime.format("YYYY-MM-DD HH:mm");
+    }
+  }
+  /**
+   * 校正资源时间段数据
+   * 
+   * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+   * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+   * 
+   * @param resourcesData 资源数据数组
+   * @returns 校正后的资源数据数组
+   */
+  correctResourceTimeSlots(resourcesData) {
+    return resourcesData.map((resource) => {
+      if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
+        return resource;
+      }
+      const resourceStartTime = (0, import_dayjs.default)(resource.start_time);
+      const correctedTimes = resource.times.map((timeSlot) => {
+        if (!timeSlot.start_at || !timeSlot.end_at) {
+          return timeSlot;
+        }
+        const startAt = (0, import_dayjs.default)(timeSlot.start_at);
+        const endAt = (0, import_dayjs.default)(timeSlot.end_at);
+        if (startAt.isBefore(resourceStartTime)) {
+          const roundedStartTime = this.roundUpToNext10Minutes(resourceStartTime);
+          const roundedStartTimeDayjs = (0, import_dayjs.default)(roundedStartTime);
+          console.log(`[DateModule] 修正时间段开始时间: ${timeSlot.start_at} -> ${roundedStartTime} (资源ID: ${resource.id}, 原始start_time: ${resource.start_time})`);
+          const correctedTimeSlot = {
+            ...timeSlot,
+            start_at: roundedStartTime
+          };
+          if (endAt.isBefore(roundedStartTimeDayjs)) {
+            console.log(`[DateModule] 时间段无效，将被删除: ${timeSlot.start_at} - ${timeSlot.end_at} (资源ID: ${resource.id}, 修正后start_time: ${roundedStartTime})`);
+            return null;
+          }
+          return correctedTimeSlot;
+        }
+        return timeSlot;
+      }).filter((timeSlot) => timeSlot !== null);
+      return {
+        ...resource,
+        times: correctedTimes
+      };
+    });
+  }
   async getResourceAvailableTimeList(params) {
     var _a;
     const { query, rules, type } = params;

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

@@ -30,3 +30,4 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     clear(): Promise<void>;
     storeChange(): void;
 }
+export type { Discount } from './types';

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

@@ -1,14 +1,27 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     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;
@@ -26,4 +39,15 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type: 'holder' | 'account';
     }): boolean;
     submitOrder(order: CommitOrderParams): Promise<void>;
+    /**
+     * Checkout 专用：创建订单到后端
+     *
+     * 专门为 Checkout 模块设计的订单创建方法，
+     * 直接调用 /order/checkout 接口创建订单
+     * 接收已经处理好的订单数据，无需再处理购物车
+     *
+     * @param params Checkout 订单参数（已处理的订单数据）
+     * @returns 后端返回的订单数据（包含订单ID等）
+     */
+    createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
 }

package/lib/modules/Order/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Order/index.ts
@@ -25,7 +35,9 @@ module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
 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";
@@ -35,6 +47,49 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
+    const appPlugin = this.core.getPlugin("app");
+    if (!appPlugin) {
+      throw new Error("Order 模块需要 app 插件支持");
+    }
+    const app = appPlugin.getApp();
+    this.logger = app.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;
@@ -86,6 +141,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);
@@ -96,11 +156,133 @@ 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);
   }
+  /**
+   * Checkout 专用：创建订单到后端
+   * 
+   * 专门为 Checkout 模块设计的订单创建方法，
+   * 直接调用 /order/checkout 接口创建订单
+   * 接收已经处理好的订单数据，无需再处理购物车
+   * 
+   * @param params Checkout 订单参数（已处理的订单数据）
+   * @returns 后端返回的订单数据（包含订单ID等）
+   */
+  async createOrderByCheckout(params) {
+    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,
+      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 = {
+        sales_channel: "my_pisel",
+        order_sales_channel: "online_store",
+        shop_note: "",
+        schedule_date: "",
+        is_deposit: 0,
+        bookings: [],
+        relation_products: [],
+        relation_forms: [],
+        payments: [],
+        ...params
+        // 使用传入的参数覆盖默认值
+      };
+      if ((_h = orderData.payments) == null ? void 0 : _h.length) {
+        orderData.small_ticket_data_flag = 1;
+      }
+      if (params.order_id) {
+        orderData.bookings = [];
+        orderData.relation_products = [];
+      }
+      if (!params.order_id && !orderData.schedule_date) {
+        orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+      }
+      console.log("[Order] 调用后端接口创建订单:", {
+        url: "/order/checkout",
+        orderType: orderData.type,
+        platform: orderData.platform,
+        isDeposit: orderData.is_deposit,
+        customerId: orderData.customer_id,
+        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: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
+      });
+      return response;
+    } catch (error) {
+      console.error("[Order] createOrderByCheckout 创建订单失败:", error);
+      throw error;
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -18,6 +18,45 @@ export interface CommitOrderParams {
         platform?: 'pc' | 'h5';
     };
 }
+/**
+ * 支付项数据
+ */
+export interface PaymentItemData {
+    /** 当前支付项的唯一 ID */
+    uuid: string;
+    /** 当前支付方式付出去多少钱 */
+    amount: string;
+    /** 支付类型代码 */
+    code: string;
+    /** 支付类型id */
+    id: number;
+    /** 支付类型名称 */
+    name: string;
+    /** 支付类型 */
+    type: string;
+    /** 是否已同步到后端 */
+    isSynced?: boolean;
+}
+/**
+ * Checkout 专用订单创建参数
+ */
+export interface CheckoutOrderParams {
+    type: 'virtual' | 'appointment_booking';
+    platform: 'PC' | 'H5';
+    sales_channel?: string;
+    order_sales_channel?: string;
+    bookings?: any[];
+    shop_note?: string;
+    schedule_date?: string;
+    is_deposit?: number;
+    relation_products?: any[];
+    relation_forms?: any[];
+    payments?: PaymentItemData[];
+    customer_id?: string;
+    /** 小票数据标记，当有支付项时设置为1 */
+    small_ticket_data_flag?: number;
+    [key: string]: any;
+}
 /**
  * 订单模块 API
  */
@@ -40,4 +79,10 @@ export interface OrderModuleAPI {
      * @param params 订单信息
      */
     submitOrder: (params: CommitOrderParams) => Promise<void>;
+    /**
+     * Checkout 专用：创建订单到后端
+     * @param params 订单参数
+     * @returns 后端返回的订单数据
+     */
+    createOrderByCheckout: (params: CheckoutOrderParams) => Promise<any>;
 }

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

@@ -0,0 +1,19 @@
+import { CashPayment } from './types';
+import type { PaymentModule } from './index';
+/**
+ * 现金支付实现
+ */
+export declare class CashPaymentImpl implements CashPayment {
+    private paymentModule;
+    constructor(paymentModule: PaymentModule);
+    processCashPayment(amount: number, orderUuid: string): Promise<void>;
+    getCashBalance(): Promise<number>;
+    /**
+     * 获取推荐支付金额
+     * 基于目标金额和货币类型，返回最优支付金额建议
+     * @param money 目标支付金额
+     * @param currency 货币代码 (如: 'CNY', 'USD', 'EUR' 等)
+     * @returns 推荐支付金额数组
+     */
+    getRecommendedAmount(money: number, currency: string): number[];
+}

package/lib/modules/Payment/cash.js

@@ -0,0 +1,64 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Payment/cash.ts
+var cash_exports = {};
+__export(cash_exports, {
+  CashPaymentImpl: () => CashPaymentImpl
+});
+module.exports = __toCommonJS(cash_exports);
+var import_cashRecommendationAlgorithm = require("./cashRecommendationAlgorithm");
+var CashPaymentImpl = class {
+  constructor(paymentModule) {
+    this.paymentModule = paymentModule;
+  }
+  async processCashPayment(amount, orderUuid) {
+    const cashMethod = await this.paymentModule.getCashPaymentMethod();
+    if (!cashMethod) {
+      throw new Error("现金支付方式未找到");
+    }
+    const paymentItem = {
+      amount: amount.toString(),
+      code: cashMethod.code,
+      id: cashMethod.id,
+      name: cashMethod.name,
+      type: cashMethod.type,
+      voucher_id: ""
+    };
+    await this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
+  }
+  async getCashBalance() {
+    return 0;
+  }
+  /**
+   * 获取推荐支付金额
+   * 基于目标金额和货币类型，返回最优支付金额建议
+   * @param money 目标支付金额
+   * @param currency 货币代码 (如: 'CNY', 'USD', 'EUR' 等)
+   * @returns 推荐支付金额数组
+   */
+  getRecommendedAmount(money, currency) {
+    const upperCurrency = currency.toUpperCase();
+    const denominations = import_cashRecommendationAlgorithm.CURRENCY_DENOMINATIONS[upperCurrency] || import_cashRecommendationAlgorithm.CURRENCY_DENOMINATIONS["DEFAULT"];
+    return (0, import_cashRecommendationAlgorithm.recommendOptimalPayments)(money, denominations);
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CashPaymentImpl
+});

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

@@ -0,0 +1,22 @@
+/**
+ * 现金支付推荐算法
+ *
+ * 核心原理：
+ * 1. 每个推荐金额都应该是独立的最优组合
+ * 2. 不推荐在已有最优解基础上添加额外面额的组合
+ * 3. 优先推荐使用不同数量币种的组合
+ * 4. 根据组合判断去重，避免扩展组合
+ */
+/**
+ * 常见国家货币面额配置
+ */
+export declare const CURRENCY_DENOMINATIONS: Record<string, number[]>;
+/**
+ * 最优支付金额推荐算法
+ * 推荐通过不同数量面额组合刚好足够支付的最小金额
+ *
+ * @param targetAmount 目标金额
+ * @param denominations 币种面值数组
+ * @returns 推荐支付金额数组
+ */
+export declare function recommendOptimalPayments(targetAmount: number, denominations: number[]): number[];