@pisell/pisellos 0.0.254 → 0.0.255

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/Order/index.js

@@ -47,7 +47,12 @@ 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");
+    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");
   }
   /**

package/lib/modules/Payment/index.js

@@ -504,7 +504,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 为某个订单添加支付项（新方法）
    */
   async addPaymentItemAsync(orderUuid, paymentItem) {
-    var _a;
+    var _a, _b, _c;
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
@@ -532,6 +532,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         order_payment_type: paymentItem.order_payment_type || "normal",
         // 默认为正常支付
         metadata: {
+          ...paymentItem.metadata,
+          // 保留传入的所有 metadata 字段
           unique_payment_number: paymentUuid
           // 设置唯一支付号为支付项的 uuid
         }
@@ -547,7 +549,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         orderUuid,
         paymentUuid: newPaymentItem.uuid,
         uniquePaymentNumber: (_a = newPaymentItem.metadata) == null ? void 0 : _a.unique_payment_number,
-        newExpectAmount: order.expect_amount
+        newExpectAmount: order.expect_amount,
+        paymentAmount: newPaymentItem.amount,
+        paymentCode: newPaymentItem.code,
+        orderPaymentType: newPaymentItem.order_payment_type,
+        metadataFields: Object.keys(newPaymentItem.metadata || {}),
+        // 现金支付找零信息
+        actualPaidAmount: (_b = newPaymentItem.metadata) == null ? void 0 : _b.actual_paid_amount,
+        changeGivenAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.change_given_amount
       });
     } catch (error) {
       console.error("[PaymentModule] 添加支付项失败", error);

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

@@ -111,6 +111,10 @@ export interface PaymentItem {
         unique_payment_number?: string;
         /** rouding规则 */
         rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
     };
     /** rouding金额 */
     rounding_amount?: string;
@@ -230,6 +234,10 @@ export interface PaymentItemInput {
         unique_payment_number?: string;
         /** rounding规则 */
         rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
     };
 }
 /**

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -379,6 +379,21 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 验证结账参数
      */
     private validateCheckoutParams;
+    /**
+     * 处理现金支付项的找零逻辑
+     *
+     * @param paymentItem 原始支付项
+     * @returns 处理后的支付项（包含找零信息）
+     */
+    private processCashPaymentItem;
+    /**
+     * 判断是否为现金支付
+     *
+     * @param paymentCode 支付代码
+     * @param paymentType 支付类型
+     * @returns 是否为现金支付
+     */
+    private isCashPayment;
     /**
      * 预加载支付方式（在初始化时调用）
      */

package/lib/solution/Checkout/index.js

@@ -45,7 +45,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("Checkout 解决方案需要 request 插件支持");
     }
-    this.logger = core.getPlugin("logger");
+    const appPlugin = core.getPlugin("app");
+    if (!appPlugin) {
+      throw new Error("Checkout 解决方案需要 app 插件支持");
+    }
+    const app = appPlugin.getApp();
+    this.logger = app.logger;
     this.order = new import_Order.OrderModule();
     this.payment = new import_Payment.PaymentModule();
     this.store = {
@@ -874,6 +879,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (oldAmount === formattedAmount) {
         return;
       }
+      this.logger.info("[Checkout] 设置自定义支付金额:", {
+        oldAmount,
+        newAmount: formattedAmount
+      });
       this.store.stateAmount = formattedAmount;
       await this.core.effects.emit(import_types.CheckoutHooks.OnStateAmountChanged, {
         oldAmount,
@@ -997,7 +1006,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @throws 当前没有活跃订单时抛出错误
    */
   async addPaymentItemAsync(paymentItem) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     this.logInfo("addPaymentItemAsync called", {
       paymentCode: paymentItem.code,
       paymentType: paymentItem.type,
@@ -1018,13 +1027,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         );
       }
       const orderPaymentType = this.store.currentOrder.is_deposit === 1 ? "deposit" : "normal";
+      const processedPaymentItem = await this.processCashPaymentItem(paymentItem);
       const metadata = {
-        ...paymentItem.metadata,
+        ...processedPaymentItem.metadata,
         rounding_rule: this.otherParams.order_rounding_setting,
         shop_wallet_pass_id: this.otherParams.shop_wallet_pass_id
       };
       const paymentItemWithType = {
-        ...paymentItem,
+        ...processedPaymentItem,
         order_payment_type: orderPaymentType,
         metadata
       };
@@ -1042,14 +1052,20 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           metadata: paymentItemWithType.metadata
         },
         orderDepositStatus: this.store.currentOrder.is_deposit,
-        calculatedOrderPaymentType: orderPaymentType
+        calculatedOrderPaymentType: orderPaymentType,
+        // 现金支付找零详情
+        isCashPayment: this.isCashPayment(paymentItem.code, paymentItem.type),
+        originalAmount: paymentItem.amount,
+        processedAmount: paymentItemWithType.amount,
+        actualPaidAmount: (_c = paymentItemWithType.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = paymentItemWithType.metadata) == null ? void 0 : _d.change_given_amount
       });
       await this.payment.addPaymentItemAsync(
         this.store.currentOrder.uuid,
         paymentItemWithType
       );
       console.log("[Checkout] 支付项添加成功");
-      const isEftposPayment = ((_c = paymentItem.type) == null ? void 0 : _c.toLowerCase()) === "eftpos" || ((_d = paymentItem.code) == null ? void 0 : _d.toUpperCase().includes("EFTPOS"));
+      const isEftposPayment = ((_e = paymentItem.type) == null ? void 0 : _e.toLowerCase()) === "eftpos" || ((_f = paymentItem.code) == null ? void 0 : _f.toUpperCase().includes("EFTPOS"));
       console.log("[Checkout] EFTPOS 支付检查:", {
         paymentCode: paymentItem.code,
         paymentType: paymentItem.type,
@@ -1905,6 +1921,75 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   validateCheckoutParams(params) {
     return (0, import_utils.validateCheckoutData)(params);
   }
+  /**
+   * 处理现金支付项的找零逻辑
+   * 
+   * @param paymentItem 原始支付项
+   * @returns 处理后的支付项（包含找零信息）
+   */
+  async processCashPaymentItem(paymentItem) {
+    const isCashPayment = this.isCashPayment(paymentItem.code, paymentItem.type);
+    if (!isCashPayment) {
+      return paymentItem;
+    }
+    try {
+      const remainingAmountStr = await this.calculateRemainingAmountAsync();
+      const remainingAmount = parseFloat(remainingAmountStr);
+      const cashAmount = parseFloat(String(paymentItem.amount));
+      console.log("[Checkout] 现金支付处理:", {
+        cashAmount,
+        remainingAmount,
+        needsChange: cashAmount > remainingAmount
+      });
+      if (cashAmount <= remainingAmount) {
+        return paymentItem;
+      }
+      const changeAmount = cashAmount - remainingAmount;
+      console.log("[Checkout] 现金支付需要找零:", {
+        actualPaidAmount: cashAmount,
+        chargedAmount: remainingAmount,
+        changeGivenAmount: changeAmount
+      });
+      const processedPaymentItem = {
+        ...paymentItem,
+        amount: remainingAmount,
+        // 将 amount 设置为剩余待付金额
+        metadata: {
+          ...paymentItem.metadata,
+          actual_paid_amount: cashAmount,
+          // 实付金额
+          change_given_amount: changeAmount
+          // 找零金额
+        }
+      };
+      this.logInfo("Cash payment with change processed", {
+        originalAmount: cashAmount,
+        chargedAmount: remainingAmount,
+        changeAmount,
+        paymentCode: paymentItem.code,
+        paymentType: paymentItem.type
+      });
+      return processedPaymentItem;
+    } catch (error) {
+      console.error("[Checkout] 处理现金支付项时出错:", error);
+      return paymentItem;
+    }
+  }
+  /**
+   * 判断是否为现金支付
+   * 
+   * @param paymentCode 支付代码
+   * @param paymentType 支付类型
+   * @returns 是否为现金支付
+   */
+  isCashPayment(paymentCode, paymentType) {
+    const codeUpper = (paymentCode == null ? void 0 : paymentCode.toUpperCase()) || "";
+    const typeUpper = (paymentType == null ? void 0 : paymentType.toUpperCase()) || "";
+    const cashIdentifiers = ["CASH", "CASHMANUAL", "MANUAL"];
+    return cashIdentifiers.some(
+      (identifier) => codeUpper.includes(identifier) || typeUpper.includes(identifier)
+    );
+  }
   /**
    * 预加载支付方式（在初始化时调用）
    */
@@ -2311,11 +2396,19 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       originalCount: paymentItems.length,
       processedCount: processedPaymentItems.length,
       sampleMetadata: (_b = processedPaymentItems[0]) == null ? void 0 : _b.metadata,
-      allPaymentItems: processedPaymentItems.map((p) => ({
-        code: p.code,
-        amount: p.amount,
-        metadata: p.metadata
-      }))
+      allPaymentItems: processedPaymentItems.map((p) => {
+        var _a2, _b2;
+        return {
+          code: p.code,
+          amount: p.amount,
+          voucherId: p.voucher_id,
+          orderPaymentType: p.order_payment_type,
+          metadata: p.metadata,
+          // 现金支付找零信息
+          actualPaidAmount: (_a2 = p.metadata) == null ? void 0 : _a2.actual_paid_amount,
+          changeGivenAmount: (_b2 = p.metadata) == null ? void 0 : _b2.change_given_amount
+        };
+      })
     });
     const orderParams = {
       ...this.store.localOrderData,

package/package.json

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