@pisell/pisellos 0.0.232 → 0.0.233

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

@@ -517,7 +517,7 @@ export interface WalletDeductionRecommendParams {
     /** 订单待支付金额 */
     order_wait_pay_amount: number;
     /** 统计计数用户id */
-    order_behavior_count_customer_id: number;
+    order_behavior_count_customer_id?: number;
     /** 已选商品 */
     products: {
         /** 商品id */
@@ -555,6 +555,7 @@ export interface WalletInitBusinessData {
         quantity: number;
         selling_price: number;
     }[];
+    order_wait_pay_amount?: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/lib/modules/Payment/walletpass.js

@@ -48,15 +48,19 @@ var WalletPassPaymentImpl = class {
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
    */
   generateWalletParams(businessData) {
-    const { customer_id, amountInfo, products } = businessData;
-    const totalAmount = Number(amountInfo.subTotal) || Number(amountInfo.totalAmount);
+    const { customer_id, amountInfo, products, order_wait_pay_amount } = businessData;
+    const totalAmount = Number(amountInfo.totalAmount);
+    const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
-      sale_channel: "kiosk",
-      customer_id,
+      sale_channel: "pos",
+      customer_id: customer_id || 0,
+      // 提供默认值，确保类型为 number
       order_expect_amount: totalAmount,
-      order_product_amount: totalAmount,
-      order_wait_pay_amount: totalAmount,
-      order_behavior_count_customer_id: 1,
+      // 订单小计金额
+      order_product_amount: subTotal,
+      // 订单待支付金额
+      order_wait_pay_amount: order_wait_pay_amount || totalAmount,
+      // order_behavior_count_customer_id: 1,
       products,
       prepare_payments: []
     };
@@ -135,7 +139,7 @@ var WalletPassPaymentImpl = class {
       return this.walletRecommendList;
     } catch (error) {
       console.error("获取钱包推荐列表失败:", error);
-      throw error;
+      return [];
     }
   }
   formatWalletPassList2PreparePayments(list) {
@@ -164,7 +168,7 @@ var WalletPassPaymentImpl = class {
       return this.userIdentificationCodes;
     } catch (error) {
       console.error("获取用户识别码列表失败:", error);
-      throw error;
+      return [];
     }
   }
   /**

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

@@ -30,7 +30,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
      * @returns
      */
-    static isInScheduleByDate({ date, schedule }: {
+    static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;
     }): true | undefined;

package/lib/modules/Schedule/index.js

@@ -162,9 +162,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   /**
    * 传入一个时间, 判断改时间是否在schedule 内
    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-   * @returns 
+   * @returns
    */
-  static isInScheduleByDate({ date, schedule }) {
+  static isInScheduleByDate({
+    date,
+    schedule
+  }) {
     var _a, _b, _c, _d;
     let _schedule = {
       ...schedule,
@@ -173,16 +176,28 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       end_time: (0, import_dayjs.default)(date).add(1, "day").format("YYYY-MM-DD HH:mm:ss")
     };
     if (((_b = (_a = _schedule.repeat_rule) == null ? void 0 : _a.end) == null ? void 0 : _b.type) === "never") {
-      _schedule.repeat_rule.end = {
-        type: "date",
-        end_date: _schedule.end_time,
-        occurrence: null
+      _schedule = {
+        ..._schedule,
+        repeat_rule: {
+          ..._schedule.repeat_rule,
+          end: {
+            type: "date",
+            end_date: _schedule.end_time,
+            occurrence: null
+          }
+        }
       };
     }
     if (((_d = (_c = _schedule.repeat_rule) == null ? void 0 : _c.end) == null ? void 0 : _d.type) === "date") {
-      _schedule.repeat_rule.end = {
-        ..._schedule.repeat_rule.end,
-        end_date: _schedule.end_time
+      _schedule = {
+        ..._schedule,
+        repeat_rule: {
+          ..._schedule.repeat_rule,
+          end: {
+            ..._schedule.repeat_rule.end,
+            end_date: _schedule.end_time
+          }
+        }
       };
     }
     const dateRanges = (0, import_utils2.calcScheduleDateRange)({ ..._schedule });

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -83,74 +83,93 @@ function findFastestAvailableResource({
   const currentTime = (0, import_dayjs.default)();
   let fastestTime = null;
   let fastestResources = [];
+  console.log("[TimeslotUtils] 查找最快可用资源:", {
+    currentTime: currentTime.format("YYYY-MM-DD HH:mm:ss"),
+    resourceCount: resources.length,
+    currentCapacity,
+    countMap
+  });
   for (const resource of resources) {
     const todayTimes = resource.times.filter((time) => {
-      return (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+      return isToday && isStillWorking;
     });
-    if (todayTimes.length === 0)
+    if (todayTimes.length === 0) {
+      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
-    todayTimes.sort((a, b) => {
-      return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at));
-    });
+    }
     for (const time of todayTimes) {
-      const startTime = (0, import_dayjs.default)(time.start_at);
-      if (startTime.isBefore(currentTime))
-        continue;
-      if (resource.resourceType === "single") {
-        const hasBooking = (_a = time.event_list) == null ? void 0 : _a.some((event) => {
-          return (0, import_dayjs.default)(event.start_at).isSame(startTime);
+      const workStartTime = (0, import_dayjs.default)(time.start_at);
+      const workEndTime = (0, import_dayjs.default)(time.end_at);
+      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+      console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
+        workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
+        checkStartTime: nextAvailableTime.format("HH:mm:ss"),
+        eventCount: ((_a = time.event_list) == null ? void 0 : _a.length) || 0
+      });
+      const relevantEvents = ((_b = time.event_list) == null ? void 0 : _b.filter((event) => {
+        const eventEnd = (0, import_dayjs.default)(event.end_at);
+        return eventEnd.isAfter(nextAvailableTime);
+      })) || [];
+      relevantEvents.sort(
+        (a, b) => (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at))
+      );
+      let finalAvailableTime = nextAvailableTime;
+      for (const event of relevantEvents) {
+        const eventStart = (0, import_dayjs.default)(event.start_at);
+        const eventEnd = (0, import_dayjs.default)(event.end_at);
+        console.log(`[TimeslotUtils] 检查事件冲突:`, {
+          resourceId: resource.id,
+          eventTime: `${eventStart.format("HH:mm")}-${eventEnd.format("HH:mm")}`,
+          checkTime: finalAvailableTime.format("HH:mm:ss"),
+          pax: event.pax || 1
         });
-        if (!hasBooking) {
-          if (!fastestTime || startTime.isSame(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources.push(resource);
-          } else if (startTime.isBefore(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources = [resource];
+        if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+            finalAvailableTime = eventEnd;
+            console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
-          break;
-        }
-      } else {
-        const totalCapacity = resource.capacity || 0;
-        const usedCapacity = ((_b = time.event_list) == null ? void 0 : _b.reduce((sum, event) => {
-          return (0, import_dayjs.default)(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
-        }, 0)) || 0;
-        const remainingCapacity = totalCapacity - usedCapacity;
-        if (remainingCapacity >= (countMap[resource.id] || 0) + currentCapacity) {
-          if (!fastestTime || startTime.isSame(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources.push(resource);
-          } else if (startTime.isBefore(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources = [resource];
+        } else {
+          const totalCapacity = resource.capacity || 0;
+          const currentUsedCapacity = countMap[resource.id] || 0;
+          const eventUsedCapacity = event.pax || 1;
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+            const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
+            if (totalRequiredCapacity > totalCapacity) {
+              finalAvailableTime = eventEnd;
+              console.log(`[TimeslotUtils] 容量不足，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
+            }
           }
-          break;
         }
       }
+      if (finalAvailableTime.isAfter(workEndTime)) {
+        console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
+        continue;
+      }
+      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 最快可用时间: ${finalAvailableTime.format("HH:mm:ss")}`);
+      if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
+        fastestTime = finalAvailableTime;
+        fastestResources = [resource];
+        console.log(`[TimeslotUtils] 更新最快时间: ${fastestTime.format("HH:mm:ss")}, 资源: ${resource.main_field}`);
+      } else if (finalAvailableTime.isSame(fastestTime)) {
+        fastestResources.push(resource);
+        console.log(`[TimeslotUtils] 添加相同时间资源: ${resource.main_field}`);
+      }
+      break;
     }
   }
-  if (!fastestTime || fastestResources.length === 0)
+  if (!fastestTime || fastestResources.length === 0) {
+    console.log("[TimeslotUtils] 未找到可用资源");
     return null;
-  if (fastestResources.length === 1)
+  }
+  console.log(`[TimeslotUtils] 找到 ${fastestResources.length} 个最快可用资源，时间: ${fastestTime.format("HH:mm:ss")}`);
+  if (fastestResources.length === 1) {
+    console.log(`[TimeslotUtils] 返回唯一最快资源: ${fastestResources[0].main_field}`);
     return fastestResources[0];
-  let maxIdleTime = 0;
-  let selectedResource = null;
-  for (const resource of fastestResources) {
-    const idleTime = calculateResourceAvailableTime({
-      resource,
-      timeSlots: {
-        start_time: fastestTime.format("HH:mm"),
-        end_time: fastestTime.format("HH:mm"),
-        start_at: fastestTime,
-        end_at: fastestTime
-      },
-      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
-    });
-    if (idleTime > maxIdleTime) {
-      maxIdleTime = idleTime;
-      selectedResource = resource;
-    }
   }
+  const selectedResource = fastestResources[0];
+  console.log(`[TimeslotUtils] 返回多个资源中的第一个: ${selectedResource.main_field}`);
   return selectedResource;
 }
 function filterConditionTimeSlots(times, startTime, endTime) {

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -40,6 +40,9 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
         quantity: number;
         selling_price: number;
     }[];
+    initWalletData(params?: {
+        order_wait_pay_amount: number;
+    }): Promise<void>;
     /**
      * 创建本地订单 (前端模拟下单流程)
      *

package/lib/solution/Checkout/index.js

@@ -124,14 +124,40 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.currentOrder) {
       return [];
     }
-    const productList = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings.map((item) => ({
-      product_id: item.product.product_id,
-      product_variant_id: item.product.product_variant_id,
-      quantity: item.product.num,
-      selling_price: item.product.price - (item.product.discount_amount || 0)
-    }));
+    const getDiscountListAmount = (list) => {
+      return list.reduce((pre, item) => {
+        return pre + (item.amount || 0);
+      }, 0);
+    };
+    const productList = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings.map(
+      (item) => ({
+        product_id: item.product.product_id,
+        product_variant_id: item.product.product_variant_id,
+        quantity: item.product.num,
+        selling_price: item.product.price - (item.product.discount_amount || 0) - getDiscountListAmount(item.product.discount_list)
+      })
+    );
     return productList;
   }
+  async initWalletData(params) {
+    var _a, _b, _c;
+    const amountInfo = (_b = (_a = this.store.currentOrder) == null ? void 0 : _a.order_info) == null ? void 0 : _b.amount_breakdown;
+    if (!amountInfo) {
+      return;
+    }
+    const walletBusinessData = {
+      customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
+      amountInfo: {
+        totalAmount: amountInfo.totalAmount,
+        subTotal: amountInfo.subTotal
+      },
+      products: this.getProductListByOrder(),
+      ...params
+    };
+    await this.payment.wallet.initializeWalletDataFromBusinessAsync(
+      walletBusinessData
+    );
+  }
   /**
    * 创建本地订单 (前端模拟下单流程)
    * 
@@ -140,7 +166,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 方法会记录参数并创建本地虚拟订单，然后用 Payment 模块管理支付流程。
    */
   async createLocalOrderAsync(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     try {
       await this.setStatus(import_types.CheckoutStatus.CreatingOrder);
       const validation = await this.validateLocalOrderData(params.orderData);
@@ -186,17 +212,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       });
       this.store.currentOrder = paymentOrder;
-      const walletBusinessData = {
-        customer_id: ((_e = this.store.currentCustomer) == null ? void 0 : _e.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
-        amountInfo: {
-          totalAmount: amountInfo.totalAmount,
-          subTotal: amountInfo.subTotal
-        },
-        products: this.getProductListByOrder()
-      };
-      const walletData = await this.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
-      console.log(walletData.walletRecommendList, "walletRecommendList");
-      console.log(walletData.userIdentificationCodes, "userIdentificationCodes");
+      await this.initWalletData();
       await this.setStatus(import_types.CheckoutStatus.OrderCreated);
       await this.setStep(import_types.CheckoutStep.PaymentMethod);
       if (params.autoPayment) {

package/package.json

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