@pisell/pisellos 0.0.252 → 0.0.254

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

@@ -7,8 +7,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     protected defaultVersion: string;
     private store;
     private request;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 记录信息日志
+     */
+    private logInfo;
+    /**
+     * 记录警告日志
+     */
+    private logWarning;
+    /**
+     * 记录错误日志
+     */
+    private logError;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
         platform: string;

package/dist/modules/Order/index.js

@@ -30,6 +30,8 @@ import dayjs from 'dayjs';
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
+  // LoggerManager 实例
+
   function OrderModule(name, version) {
     var _this;
     _classCallCheck(this, OrderModule);
@@ -38,6 +40,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     return _this;
   }
   _createClass(OrderModule, [{
@@ -50,7 +53,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store;
               this.request = this.core.getPlugin('request');
-            case 3:
+              this.logger = this.core.getPlugin('logger');
+              this.logInfo('OrderModule initialized successfully');
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -61,6 +66,50 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 记录信息日志
+     */
+  }, {
+    key: "logInfo",
+    value: function logInfo(title, metadata) {
+      if (this.logger) {
+        this.logger.addLog({
+          type: 'info',
+          title: "[OrderModule] ".concat(title),
+          metadata: metadata || {}
+        });
+      }
+    }
+
+    /**
+     * 记录警告日志
+     */
+  }, {
+    key: "logWarning",
+    value: function logWarning(title, metadata) {
+      if (this.logger) {
+        this.logger.addLog({
+          type: 'warning',
+          title: "[OrderModule] ".concat(title),
+          metadata: metadata || {}
+        });
+      }
+    }
+
+    /**
+     * 记录错误日志
+     */
+  }, {
+    key: "logError",
+    value: function logError(title, metadata) {
+      if (this.logger) {
+        this.logger.addLog({
+          type: 'error',
+          title: "[OrderModule] ".concat(title),
+          metadata: metadata || {}
+        });
+      }
+    }
   }, {
     key: "createOrder",
     value: function createOrder(params) {
@@ -120,6 +169,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkBeforeSubmitOrder",
     value: function checkBeforeSubmitOrder(params) {
+      var _params$cartItems;
+      this.logInfo('checkBeforeSubmitOrder called', {
+        cartItemsCount: ((_params$cartItems = params.cartItems) === null || _params$cartItems === void 0 ? void 0 : _params$cartItems.length) || 0,
+        type: params.type
+      });
       var cartItems = params.cartItems,
         type = params.type;
       if (type === 'holder') {
@@ -137,15 +191,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "submitOrder",
     value: function () {
       var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(order) {
+        var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              this.logInfo('submitOrder called', {
+                url: order.url,
+                orderType: order.query.type,
+                platform: order.query.platform,
+                cartItemsCount: ((_order$query$cartItem = order.query.cartItems) === null || _order$query$cartItem === void 0 ? void 0 : _order$query$cartItem.length) || 0
+              });
               url = order.url, query = order.query;
               fetchUrl = url || '/order/appointment';
               params = this.createOrder(query);
+              this.logInfo('Calling backend order API', {
+                url: fetchUrl,
+                orderType: params.type,
+                platform: params.platform,
+                isDeposit: params.is_deposit,
+                bookingsCount: ((_params$bookings = params.bookings) === null || _params$bookings === void 0 ? void 0 : _params$bookings.length) || 0,
+                relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
+                scheduleDate: params.schedule_date
+              });
               return _context2.abrupt("return", this.request.post(fetchUrl, params));
-            case 4:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -170,21 +240,39 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrderByCheckout",
     value: (function () {
       var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _params$bookings, _params$relation_prod, _params$payments;
-        var _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _response$data, orderData, response;
+        var _params$bookings2, _params$relation_prod2, _params$payments, _params$payments2, _params$bookings3, _params$relation_prod3, _params$payments3;
+        var _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              this.logInfo('createOrderByCheckout called', {
+                type: params.type,
+                platform: params.platform,
+                is_deposit: params.is_deposit,
+                customer_id: params.customer_id,
+                bookingsCount: ((_params$bookings2 = params.bookings) === null || _params$bookings2 === void 0 ? void 0 : _params$bookings2.length) || 0,
+                relationProductsCount: ((_params$relation_prod2 = params.relation_products) === null || _params$relation_prod2 === void 0 ? void 0 : _params$relation_prod2.length) || 0,
+                paymentsCount: ((_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.length) || 0,
+                depositAmount: params.deposit_amount,
+                productTaxFee: params.product_tax_fee,
+                note: params.note,
+                scheduleDate: params.schedule_date,
+                hasOrderId: !!params.order_id,
+                orderIdIncluded: params.order_id,
+                paymentMethods: ((_params$payments2 = params.payments) === null || _params$payments2 === void 0 ? void 0 : _params$payments2.map(function (p) {
+                  return p.code;
+                })) || []
+              });
               console.log('[Order] createOrderByCheckout 开始创建订单:', {
                 type: params.type,
                 platform: params.platform,
                 is_deposit: params.is_deposit,
                 customer_id: params.customer_id,
-                bookingsCount: ((_params$bookings = params.bookings) === null || _params$bookings === void 0 ? void 0 : _params$bookings.length) || 0,
-                relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
-                paymentsCount: ((_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.length) || 0
+                bookingsCount: ((_params$bookings3 = params.bookings) === null || _params$bookings3 === void 0 ? void 0 : _params$bookings3.length) || 0,
+                relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
+                paymentsCount: ((_params$payments3 = params.payments) === null || _params$payments3 === void 0 ? void 0 : _params$payments3.length) || 0
               });
-              _context3.prev = 1;
+              _context3.prev = 2;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -225,26 +313,53 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })) || []
               });
 
+              // 记录接口调用详情
+              this.logInfo('Calling backend checkout API', {
+                url: '/order/checkout',
+                orderType: orderData.type,
+                platform: orderData.platform,
+                isDeposit: orderData.is_deposit,
+                customerId: orderData.customer_id,
+                depositAmount: orderData.deposit_amount,
+                bookingsCount: ((_orderData$bookings2 = orderData.bookings) === null || _orderData$bookings2 === void 0 ? void 0 : _orderData$bookings2.length) || 0,
+                relationProductsCount: ((_orderData$relation_p2 = orderData.relation_products) === null || _orderData$relation_p2 === void 0 ? void 0 : _orderData$relation_p2.length) || 0,
+                paymentsCount: ((_orderData$payments4 = orderData.payments) === null || _orderData$payments4 === void 0 ? void 0 : _orderData$payments4.length) || 0,
+                paymentMethods: ((_orderData$payments5 = orderData.payments) === null || _orderData$payments5 === void 0 ? void 0 : _orderData$payments5.map(function (p) {
+                  return {
+                    code: p.code,
+                    amount: p.amount,
+                    type: p.type,
+                    hasVoucherId: !!p.voucher_id,
+                    orderPaymentType: p.order_payment_type
+                  };
+                })) || [],
+                productTaxFee: orderData.product_tax_fee,
+                note: orderData.note,
+                scheduleDate: orderData.schedule_date,
+                hasOrderId: !!orderData.order_id,
+                smallTicketDataFlag: orderData.small_ticket_data_flag
+              });
+
               // 调用后端接口
-              _context3.next = 9;
+              _context3.next = 11;
               return this.request.post('/order/checkout', orderData);
-            case 9:
+            case 11:
               response = _context3.sent;
               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 14:
-              _context3.prev = 14;
-              _context3.t0 = _context3["catch"](1);
+            case 16:
+              _context3.prev = 16;
+              _context3.t0 = _context3["catch"](2);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
               throw _context3.t0;
-            case 18:
+            case 20:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 14]]);
+        }, _callee3, this, [[2, 16]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

package/dist/modules/Payment/walletpass.js

@@ -116,23 +116,22 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               startTime = Date.now();
-              if (!(Number((businessData === null || businessData === void 0 || (_businessData$amountI = businessData.amountInfo) === null || _businessData$amountI === void 0 ? void 0 : _businessData$amountI.totalAmount) || 0) <= 0 || Number((businessData === null || businessData === void 0 || (_businessData$amountI2 = businessData.amountInfo) === null || _businessData$amountI2 === void 0 ? void 0 : _businessData$amountI2.subTotal) || 0) <= 0)) {
-                _context.next = 3;
+              walletParams = this.generateWalletParams(businessData);
+              if (!(Number((businessData === null || businessData === void 0 || (_businessData$amountI = businessData.amountInfo) === null || _businessData$amountI === void 0 ? void 0 : _businessData$amountI.totalAmount) || 0) < 0 || Number((businessData === null || businessData === void 0 || (_businessData$amountI2 = businessData.amountInfo) === null || _businessData$amountI2 === void 0 ? void 0 : _businessData$amountI2.subTotal) || 0) < 0)) {
+                _context.next = 4;
                 break;
               }
               return _context.abrupt("return", {
                 walletRecommendList: [],
                 userIdentificationCodes: []
               });
-            case 3:
+            case 4:
               // 发送初始化开始事件
               this.emitEvent(WalletPassHooks.OnWalletInitializationStarted, {
                 businessData: businessData,
                 startTime: startTime
               });
-              _context.prev = 4;
-              // 生成钱包API参数
-              walletParams = this.generateWalletParams(businessData); // 调用标准的初始化流程
+              _context.prev = 5;
               _context.next = 8;
               return this.initializeWalletDataAsync(walletParams);
             case 8:
@@ -150,7 +149,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               return _context.abrupt("return", result);
             case 16:
               _context.prev = 16;
-              _context.t0 = _context["catch"](4);
+              _context.t0 = _context["catch"](5);
               _endTime = Date.now();
               _duration = _endTime - startTime; // 发送初始化失败事件
               this.emitEvent(WalletPassHooks.OnWalletInitializationFailed, {
@@ -166,7 +165,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 16]]);
+        }, _callee, this, [[5, 16]]);
       }));
       function initializeWalletDataFromBusinessAsync(_x) {
         return _initializeWalletDataFromBusinessAsync.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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

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

@@ -18,10 +18,23 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private request;
     private store;
     private otherParams;
+    private logger;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 记录信息日志
+     */
+    private logInfo;
+    /**
+     * 记录警告日志
+     */
+    private logWarning;
+    /**
+     * 记录错误日志
+     */
+    private logError;
     /**
      * 初始化子模块
      */
@@ -366,33 +379,16 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 验证结账参数
      */
     private validateCheckoutParams;
-    /**
-     * 验证本地订单数据
-     */
-    private validateLocalOrderData;
-    /**
-     * 生成本地订单ID
-     */
-    private generateLocalOrderId;
-    /**
-     * 格式化日期时间为 YYYY-MM-DD hh:mm:ss 格式
-     *
-     * @param date 要格式化的日期对象
-     * @returns 格式化后的日期时间字符串
-     */
-    private formatDateTime;
-    /**
-     * 从购物车小计数据中提取金额信息
-     */
-    private extractAmountFromCartSummary;
     /**
      * 预加载支付方式（在初始化时调用）
      */
     private preloadPaymentMethods;
     /**
-     * 计算总金额
+     * 清理过期的已同步订单数据
+     *
+     * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
-    private calculateTotalAmount;
+    private cleanupExpiredOrdersAsync;
     /**
      * 计算已支付金额（从 Payment 模块获取最新数据）
      */
@@ -415,28 +411,11 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
      */
     private checkOrderPaymentCompletion;
-    /**
-     * 判断支付方式是否需要同步订单到后端
-     *
-     * 现金支付(CASHMANUAL)和自定义支付不需要同步，其他支付方式需要同步
-     *
-     * @param paymentCode 支付方式代码
-     * @param paymentType 支付方式类型
-     * @returns 是否需要同步订单
-     */
-    private shouldSyncOrderForPayment;
     /**
      * 同步订单到后端
      *
      * 调用后端 /order/checkout 接口创建真实订单
      */
-    /**
-     * 判断订单ID是否为本地生成的虚拟ID
-     *
-     * @param orderId 订单ID
-     * @returns true 表示是虚拟ID，false 表示是真实的后端ID
-     */
-    private isVirtualOrderId;
     /**
      * 同步订单到后端并返回真实订单ID
      *