@pisell/pisellos 2.1.17 → 2.1.19

package/dist/modules/Date/index.js

@@ -267,6 +267,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
           return resource;
         }
+        // 如果resource.advanced 为 null 或者 resource.advanced.unit 为 0，则不进行修正
+        if (!resource.advanced || resource.advanced.unit === 0) {
+          return resource;
+        }
         var resourceStartTime = dayjs(resource.start_time);
 
         // 过滤和修正时间段

package/dist/modules/Payment/index.js

@@ -1264,7 +1264,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, voucherPaymentItems) {
-        var order, expectAmount, warningMessage, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
+        var order, existingVoucherItems, _iterator5, _step5, voucherItem, _iterator6, _step6, _voucherItem, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1291,43 +1291,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
             case 7:
-              // 🔒 订单状态检查：如果订单待付金额已经为0且尝试清空代金券（空数组），跳过操作
-              expectAmount = new Decimal(order.expect_amount);
-              if (!(expectAmount.lte(0) && voucherPaymentItems.length === 0)) {
-                _context15.next = 12;
-                break;
-              }
-              console.warn('[PaymentModule] Skipping voucher update - order already fully paid:', {
-                orderUuid: orderUuid,
-                expectAmount: order.expect_amount,
-                attemptedOperation: 'clear_vouchers',
-                reason: 'Order payment completed, no need to clear vouchers'
-              });
-              this.logInfo('updateVoucherPaymentItemsAsync skipped - order already paid', {
-                orderUuid: orderUuid,
-                expectAmount: order.expect_amount,
-                voucherCount: voucherPaymentItems.length
-              });
-              return _context15.abrupt("return");
-            case 12:
-              if (!(expectAmount.lte(0) && voucherPaymentItems.length > 0)) {
-                _context15.next = 17;
-                break;
-              }
-              warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5DF2\u5B8C\u6210\u652F\u4ED8\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879");
-              console.warn('[PaymentModule] Voucher update blocked - order already fully paid:', {
-                orderUuid: orderUuid,
-                expectAmount: order.expect_amount,
-                attemptedVoucherCount: voucherPaymentItems.length,
-                reason: 'Order already fully paid'
-              });
-              this.logError('updateVoucherPaymentItemsAsync blocked', new Error(warningMessage), {
-                orderUuid: orderUuid,
-                expectAmount: order.expect_amount,
-                voucherPaymentItems: voucherPaymentItems
-              });
-              throw new Error(warningMessage);
-            case 17:
               // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided）
               existingVoucherItems = order.payment.filter(function (payment) {
                 return payment.voucher_id && payment.status !== 'voided';
@@ -1347,96 +1310,96 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 2. 删除所有现有的代金券支付项
               _iterator5 = _createForOfIteratorHelper(existingVoucherItems);
-              _context15.prev = 20;
+              _context15.prev = 10;
               _iterator5.s();
-            case 22:
+            case 12:
               if ((_step5 = _iterator5.n()).done) {
-                _context15.next = 29;
+                _context15.next = 19;
                 break;
               }
               voucherItem = _step5.value;
               console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
-              _context15.next = 27;
+              _context15.next = 17;
               return this.deletePaymentAsync(orderUuid, voucherItem.uuid);
-            case 27:
-              _context15.next = 22;
+            case 17:
+              _context15.next = 12;
               break;
-            case 29:
-              _context15.next = 34;
+            case 19:
+              _context15.next = 24;
               break;
-            case 31:
-              _context15.prev = 31;
-              _context15.t0 = _context15["catch"](20);
+            case 21:
+              _context15.prev = 21;
+              _context15.t0 = _context15["catch"](10);
               _iterator5.e(_context15.t0);
-            case 34:
-              _context15.prev = 34;
+            case 24:
+              _context15.prev = 24;
               _iterator5.f();
-              return _context15.finish(34);
-            case 37:
+              return _context15.finish(24);
+            case 27:
               // 3. 添加新的代金券支付项
               console.log('[PaymentModule] 添加新的代金券支付项:', {
                 orderUuid: orderUuid,
                 newItemCount: voucherPaymentItems.length
               });
               _iterator6 = _createForOfIteratorHelper(voucherPaymentItems);
-              _context15.prev = 39;
+              _context15.prev = 29;
               _iterator6.s();
-            case 41:
+            case 31:
               if ((_step6 = _iterator6.n()).done) {
-                _context15.next = 50;
+                _context15.next = 40;
                 break;
               }
               _voucherItem = _step6.value;
               if (_voucherItem.voucher_id) {
-                _context15.next = 45;
+                _context15.next = 35;
                 break;
               }
               throw new Error("\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(_voucherItem)));
-            case 45:
+            case 35:
               console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", {
                 code: _voucherItem.code,
                 amount: _voucherItem.amount,
                 voucher_id: _voucherItem.voucher_id,
                 order_payment_type: _voucherItem.order_payment_type
               });
-              _context15.next = 48;
+              _context15.next = 38;
               return this.addPaymentItemAsync(orderUuid, _voucherItem);
-            case 48:
-              _context15.next = 41;
+            case 38:
+              _context15.next = 31;
               break;
-            case 50:
-              _context15.next = 55;
+            case 40:
+              _context15.next = 45;
               break;
-            case 52:
-              _context15.prev = 52;
-              _context15.t1 = _context15["catch"](39);
+            case 42:
+              _context15.prev = 42;
+              _context15.t1 = _context15["catch"](29);
               _iterator6.e(_context15.t1);
-            case 55:
-              _context15.prev = 55;
+            case 45:
+              _context15.prev = 45;
               _iterator6.f();
-              return _context15.finish(55);
-            case 58:
-              _context15.next = 60;
+              return _context15.finish(45);
+            case 48:
+              _context15.next = 50;
               return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 60:
+            case 50:
               updatedOrder = _context15.sent;
-              _context15.next = 63;
+              _context15.next = 53;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 order: updatedOrder,
                 payment: null // 批量操作不提供单个支付项
               });
-            case 63:
+            case 53:
               this.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
                 orderUuid: orderUuid,
                 removedVoucherCount: existingVoucherItems.length,
                 addedVoucherCount: voucherPaymentItems.length,
                 finalExpectAmount: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.expect_amount
               });
-              _context15.next = 71;
+              _context15.next = 61;
               break;
-            case 66:
-              _context15.prev = 66;
+            case 56:
+              _context15.prev = 56;
               _context15.t2 = _context15["catch"](1);
               console.error('[PaymentModule] 批量更新代金券支付项失败:', _context15.t2);
               this.logError('updateVoucherPaymentItemsAsync failed', _context15.t2, {
@@ -1444,11 +1407,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 voucherPaymentItems: voucherPaymentItems
               });
               throw _context15.t2;
-            case 71:
+            case 61:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 66], [20, 31, 34, 37], [39, 52, 55, 58]]);
+        }, _callee15, this, [[1, 56], [10, 21, 24, 27], [29, 42, 45, 48]]);
       }));
       function updateVoucherPaymentItemsAsync(_x18, _x19) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);

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

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

@@ -180,7 +180,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param {ProductData} productData
      * @memberof BookingByStepImpl
      */
-    storeProduct(productData: ProductData): Promise<void>;
+    storeProduct(productData: ProductData): {
+        success: boolean;
+        errorCode?: string;
+    };
     /**
      * 往购物车加商品数据
      *
@@ -203,7 +206,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
             endTime: string;
         } | null;
         account?: Account | null;
-    }): void;
+    }): {
+        success: boolean;
+        errorCode?: string;
+    };
     /**
      * 添加完购物车以后做的一些检测，比如日期是否在同一天
      *
@@ -294,8 +300,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     getTimeSlotByAllResources(resources_code: string): any[];
     submitTimeSlot(timeSlots: TimeSliceItem): void;
-    clearCache(): void;
-    clearCacheByModule(module: string): void;
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
@@ -312,6 +316,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
     }[];
+    /**
+     * 找到多个资源的公共可用时间段
+     */
+    private findCommonAvailableTimeSlots;
+    checkMaxDurationCapacity(): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;