@pisell/pisellos 2.1.5 → 2.1.7

package/dist/modules/Payment/walletpass.js

@@ -443,7 +443,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               baseWalletParams = this.walletParams; // 构建完整的搜索参数，包含钱包扣款推荐的所有参数
               searchParams = {
                 // 基础钱包参数
-                sale_channel: params.sale_channel || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.sale_channel),
+                sale_channel: params.sale_channel || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.sale_channel) || "pos",
                 customer_id: params.customer_id || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.customer_id),
                 order_expect_amount: params.order_expect_amount || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.order_expect_amount),
                 order_product_amount: params.order_product_amount || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.order_product_amount),

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

@@ -33,5 +33,5 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;
-    }): true | undefined;
+    }): boolean | undefined;
 }

package/dist/modules/Schedule/index.js

@@ -254,6 +254,15 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       var _schedule$repeat_rule, _schedule$repeat_rule2;
       var date = _ref2.date,
         schedule = _ref2.schedule;
+      if (schedule.start_time && schedule.end_time) {
+        var isBeforeStartTime = dayjs(date).isBefore(dayjs(schedule.start_time));
+        var isAfterEndTime = dayjs(date).isAfter(dayjs(schedule.end_time));
+        // 如果不在 schedule 日期区间内直接返回false
+        if (isBeforeStartTime || isAfterEndTime) {
+          return false;
+        }
+      }
+
       // 节约性能, 强制将schedule的时间范围改为前后一天，避免大量计算.
       var _schedule = _objectSpread(_objectSpread({}, schedule), {}, {
         // 开始时间向前推一天

package/dist/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/dist/solution/Checkout/index.js

@@ -1532,7 +1532,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
               return _context22.abrupt("return");
             case 8:
-              this.logger.info('[Checkout] 设置自定义支付金额:', {
+              this.logInfo('[Checkout] 设置自定义支付金额:', {
                 oldAmount: oldAmount,
                 newAmount: formattedAmount
               });

package/lib/modules/Payment/walletpass.js

@@ -298,7 +298,7 @@ var WalletPassPaymentImpl = class {
       const baseWalletParams = this.walletParams;
       const searchParams = {
         // 基础钱包参数
-        sale_channel: params.sale_channel || (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel),
+        sale_channel: params.sale_channel || (baseWalletParams == null ? void 0 : baseWalletParams.sale_channel) || "pos",
         customer_id: params.customer_id || (baseWalletParams == null ? void 0 : baseWalletParams.customer_id),
         order_expect_amount: params.order_expect_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_expect_amount),
         order_product_amount: params.order_product_amount || (baseWalletParams == null ? void 0 : baseWalletParams.order_product_amount),

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

@@ -33,5 +33,5 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;
-    }): true | undefined;
+    }): boolean | undefined;
 }

package/lib/modules/Schedule/index.js

@@ -169,6 +169,15 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     schedule
   }) {
     var _a, _b, _c, _d;
+    if (schedule.start_time && schedule.end_time) {
+      const isBeforeStartTime = (0, import_dayjs.default)(date).isBefore(
+        (0, import_dayjs.default)(schedule.start_time)
+      );
+      const isAfterEndTime = (0, import_dayjs.default)(date).isAfter((0, import_dayjs.default)(schedule.end_time));
+      if (isBeforeStartTime || isAfterEndTime) {
+        return false;
+      }
+    }
     let _schedule = {
       ...schedule,
       // 开始时间向前推一天

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.js

@@ -890,7 +890,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (oldAmount === formattedAmount) {
         return;
       }
-      this.logger.info("[Checkout] 设置自定义支付金额:", {
+      this.logInfo("[Checkout] 设置自定义支付金额:", {
         oldAmount,
         newAmount: formattedAmount
       });

package/package.json

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