@pisell/pisellos 2.2.40 → 2.2.42

package/dist/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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -25,6 +25,15 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+    isInScheduleByDate({ date, schedule, }: {
+        date: string;
+        schedule: any;
+    }): boolean | undefined;
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/dist/modules/Schedule/index.js

@@ -248,12 +248,28 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
      * @returns
      */
-  }], [{
+  }, {
     key: "isInScheduleByDate",
     value: function isInScheduleByDate(_ref2) {
-      var _schedule$repeat_rule, _schedule$repeat_rule2;
       var date = _ref2.date,
         schedule = _ref2.schedule;
+      return ScheduleModule.isInScheduleByDate({
+        date: date,
+        schedule: schedule
+      });
+    }
+
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+  }], [{
+    key: "isInScheduleByDate",
+    value: function isInScheduleByDate(_ref3) {
+      var _schedule$repeat_rule, _schedule$repeat_rule2;
+      var date = _ref3.date,
+        schedule = _ref3.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));

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

@@ -123,7 +123,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/dist/solution/Checkout/index.js

@@ -1800,7 +1800,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               paymentItems = _context18.sent;
               if (!(!voucherPaymentItems || (voucherPaymentItems === null || voucherPaymentItems === void 0 ? void 0 : voucherPaymentItems.length) === 0)) {
-                _context18.next = 12;
+                _context18.next = 13;
                 break;
               }
               savedVoucherPaymentItems = (paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.filter(function (item) {
@@ -1811,22 +1811,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 savedVoucherPaymentItems: savedVoucherPaymentItems
               });
               if (!((savedVoucherPaymentItems === null || savedVoucherPaymentItems === void 0 ? void 0 : savedVoucherPaymentItems.length) === 0)) {
-                _context18.next = 12;
+                _context18.next = 13;
                 break;
               }
+              this.updateStateAmountToRemaining(false);
               return _context18.abrupt("return");
-            case 12:
+            case 13:
               allPaymentItemsSynced = paymentItems.every(function (item) {
                 return item.isSynced;
               });
-              _context18.next = 15;
+              _context18.next = 16;
               return this.calculateRemainingAmountAsync();
-            case 15:
+            case 16:
               remainingAmount = _context18.sent;
               remainingValue = new Decimal(remainingAmount);
               isOrderSynced = this.store.isOrderSynced;
               if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced)) {
-                _context18.next = 21;
+                _context18.next = 22;
                 break;
               }
               this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
@@ -1838,7 +1839,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 reason: 'Order synced and payment completed, skip clear vouchers to avoid duplicate sync'
               });
               return _context18.abrupt("return");
-            case 21:
+            case 22:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1860,18 +1861,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context18.next = 26;
+              _context18.next = 27;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 26:
+            case 27:
               // 🚀 清除计算缓存，确保获取最新数据
               this.clearCalculationCache();
 
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context18.next = 31;
+              _context18.next = 32;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 31:
+            case 32:
               updatedOrder = _context18.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
@@ -1886,10 +1887,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context18.next = 35;
+              _context18.next = 36;
               return this.updateStateAmountToRemaining(false);
-            case 35:
-              _context18.next = 37;
+            case 36:
+              _context18.next = 38;
               return this.core.effects.emit("".concat(this.name, ":onPaymentStarted"), {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1898,23 +1899,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 37:
+            case 38:
               this.logInfo('代金券支付项批量更新成功');
-              _context18.next = 46;
+              _context18.next = 47;
               break;
-            case 40:
-              _context18.prev = 40;
+            case 41:
+              _context18.prev = 41;
               _context18.t0 = _context18["catch"](0);
               this.logError('[Checkout] 批量更新代金券支付项失败:', _context18.t0);
-              _context18.next = 45;
+              _context18.next = 46;
               return this.handleError(_context18.t0, CheckoutErrorType.PaymentFailed);
-            case 45:
-              throw _context18.t0;
             case 46:
+              throw _context18.t0;
+            case 47:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[0, 40]]);
+        }, _callee18, this, [[0, 41]]);
       }));
       function updateVoucherPaymentItemsAsync(_x18) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);

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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -25,6 +25,15 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+    isInScheduleByDate({ date, schedule, }: {
+        date: string;
+        schedule: any;
+    }): boolean | undefined;
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/lib/modules/Schedule/index.js

@@ -159,6 +159,17 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  /**
+   * 传入一个时间, 判断改时间是否在schedule 内
+   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+   * @returns
+   */
+  isInScheduleByDate({
+    date,
+    schedule
+  }) {
+    return ScheduleModule.isInScheduleByDate({ date, schedule });
+  }
   /**
    * 传入一个时间, 判断改时间是否在schedule 内
    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

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

@@ -123,7 +123,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.js

@@ -1212,8 +1212,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           voucherPaymentItems,
           savedVoucherPaymentItems
         });
-        if ((savedVoucherPaymentItems == null ? void 0 : savedVoucherPaymentItems.length) === 0)
+        if ((savedVoucherPaymentItems == null ? void 0 : savedVoucherPaymentItems.length) === 0) {
+          this.updateStateAmountToRemaining(false);
           return;
+        }
       }
       const allPaymentItemsSynced = paymentItems.every((item) => item.isSynced);
       const remainingAmount = await this.calculateRemainingAmountAsync();

package/package.json

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