@pisell/pisellos 1.0.65 → 1.0.67

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

@@ -354,21 +354,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post('/order/checkout', orderData);
             case 11:
               response = _context3.sent;
+              this.logInfo('Order API called successfully', {
+                response: response
+              });
               console.log('[Order] 订单创建成功，后端响应:', {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
               return _context3.abrupt("return", response);
-            case 16:
-              _context3.prev = 16;
+            case 17:
+              _context3.prev = 17;
               _context3.t0 = _context3["catch"](2);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
+              this.logInfo('Order API called failed', {
+                error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
+              });
               throw _context3.t0;
-            case 20:
+            case 22:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 16]]);
+        }, _callee3, this, [[2, 17]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

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

@@ -23,6 +23,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private store;
     private dbManager;
     private logger;
+    protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
     wallet: WalletPassPayment;

package/dist/modules/Payment/index.js

@@ -85,6 +85,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     // 支付方式实例
     _defineProperty(_assertThisInitialized(_this), "cash", void 0);
     _defineProperty(_assertThisInitialized(_this), "eftpos", void 0);
@@ -104,34 +105,35 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.otherParams = options.otherParams || {};
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
               if (this.request) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 6:
+            case 7:
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 8:
+            case 9:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 13;
+              _context.next = 14;
               return this.ensurePaymentTables();
-            case 13:
+            case 14:
               this.registerNetworkHandlers();
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 16:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -148,6 +150,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {
+      var _this$otherParams;
+      if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.fatherModule) {
+        var _this$otherParams2;
+        var fatherModule = this.core.getModule((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule);
+        if (fatherModule) {
+          fatherModule.logInfo("".concat(title), metadata);
+          return;
+        }
+      }
       if (this.logger) {
         this.logger.addLog({
           type: 'info',
@@ -646,7 +657,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "createPaymentOrderAsync",
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var existingOrders, existingOrder, originalOrder, newOrder;
+        var existingOrder, newOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -656,19 +667,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               _context7.prev = 1;
               _context7.next = 4;
-              return this.dbManager.getAll('order');
+              return this.dbManager.get('order', params.order_id);
             case 4:
-              existingOrders = _context7.sent;
-              existingOrder = existingOrders.find(function (order) {
-                return String(order.id) === String(params.order_id);
+              existingOrder = _context7.sent;
+              this.logInfo('createPaymentOrderAsync existingOrder', {
+                existingOrder: existingOrder
               });
+              // const existingOrder = existingOrders.find(
+              //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
+              // );
               if (!existingOrder) {
-                _context7.next = 21;
+                _context7.next = 20;
                 break;
               }
               // 如果存在相同 order_id 的订单，更新该订单信息
-              console.log("[PaymentModule] \u53D1\u73B0\u91CD\u590D\u8BA2\u5355 ID: ".concat(params.order_id, "\uFF0C\u66F4\u65B0\u73B0\u6709\u652F\u4ED8\u8BA2\u5355"));
-              originalOrder = _objectSpread({}, existingOrder);
+              this.logInfo("createPaymentOrderAsync found duplicate order ID: ".concat(params.order_id, ", updating existing payment order"));
+
+              // const originalOrder = { ...existingOrder };
               existingOrder.order_info = params.order_info;
               existingOrder.total_amount = params.total_amount;
               existingOrder.is_deposit = params.is_deposit || 0;
@@ -678,14 +693,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(existingOrder);
 
               // 更新到数据库
-              _context7.next = 16;
+              _context7.next = 15;
               return this.dbManager.update('order', existingOrder);
-            case 16:
-              _context7.next = 18;
+            case 15:
+              _context7.next = 17;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 18:
+            case 17:
               return _context7.abrupt("return", existingOrder);
-            case 21:
+            case 20:
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -701,33 +716,31 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
               };
-              _context7.next = 24;
+              _context7.next = 23;
               return this.dbManager.add('order', newOrder);
-            case 24:
-              _context7.next = 26;
-              return this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
-            case 26:
+            case 23:
+              this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
               this.logInfo('createPaymentOrderAsync completed - new payment order created', {
                 orderUuid: newOrder.uuid,
                 orderId: newOrder.id
               });
               return _context7.abrupt("return", newOrder);
-            case 28:
-              _context7.next = 35;
+            case 26:
+              _context7.next = 33;
               break;
-            case 30:
-              _context7.prev = 30;
+            case 28:
+              _context7.prev = 28;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 35:
+            case 33:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 30]]);
+        }, _callee7, this, [[1, 28]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);
@@ -1030,7 +1043,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, paymentUuid, newPaymentItem;
+        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, warningMessage, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1051,6 +1064,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("Order not found: ".concat(orderUuid));
             case 7:
+              // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
+              expectAmount = new Decimal(order.expect_amount);
+              if (!expectAmount.lte(0)) {
+                _context13.next = 13;
+                break;
+              }
+              warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
+              console.warn('[PaymentModule] Payment lock triggered:', {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                attemptedPaymentAmount: paymentItem.amount,
+                attemptedPaymentCode: paymentItem.code,
+                reason: 'Order already fully paid'
+              });
+              this.logError('addPaymentItemAsync blocked by payment lock', new Error(warningMessage), {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                paymentItem: paymentItem
+              });
+              throw new Error(warningMessage);
+            case 13:
               paymentUuid = getUniqueId('payment_');
               newPaymentItem = {
                 uuid: paymentUuid,
@@ -1073,15 +1107,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 13;
+              _context13.next = 19;
               return this.dbManager.update('order', order);
-            case 13:
-              _context13.next = 15;
+            case 19:
+              _context13.next = 21;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 15:
+            case 21:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1095,10 +1129,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context13.next = 23;
+              _context13.next = 29;
               break;
-            case 18:
-              _context13.prev = 18;
+            case 24:
+              _context13.prev = 24;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1106,11 +1140,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 23:
+            case 29:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 18]]);
+        }, _callee13, this, [[1, 24]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);

package/dist/modules/Payment/walletpass.js

@@ -406,9 +406,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
 
               // 检查识别码是否为9位且前3位为"000"
-              // const isWalletCode = code.length === 9 && code.startsWith('000');
-              // 测试环境先使用 WL
-              isWalletCode = code.startsWith('WL');
+              isWalletCode = code.length === 9 && code.startsWith('000'); // 测试环境先使用 WL
+              // const isWalletCode = code.startsWith('WL');
               if (!isWalletCode) {
                 _context5.next = 14;
                 break;
@@ -443,7 +442,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/Rules/index.js

@@ -329,6 +329,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               tag: discountType,
               discount: {
                 discount_card_type: discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type,
+                fixed_amount: product.price,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
@@ -498,6 +499,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             type: discountType,
             discount: {
               discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
+              fixed_amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,

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/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">;