@pisell/pisellos 0.0.255 → 0.0.257

package/dist/modules/Payment/walletpass.js

@@ -42,7 +42,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       try {
         this.paymentModule.core.effects.emit(hook, data);
       } catch (error) {
-        console.error('[WalletPass] 发送事件失败:', hook, error);
+        this.paymentModule.logError('[WalletPass] 发送事件失败', error, {
+          hook: hook
+        });
       }
     }
 
@@ -53,6 +55,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
   }, {
     key: "generateWalletParams",
     value: function generateWalletParams(businessData) {
+      var _walletParams$product;
       var customer_id = businessData.customer_id,
         amountInfo = businessData.amountInfo,
         products = businessData.products,
@@ -77,7 +80,13 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
 
       // 存储生成的参数到模块中
       this.walletParams = walletParams;
-      console.log('[WalletPass] 钱包默认参数已生成并存储:', walletParams);
+      this.paymentModule.logInfo('[WalletPass] 钱包默认参数已生成并存储', {
+        customer_id: walletParams.customer_id,
+        order_expect_amount: walletParams.order_expect_amount,
+        order_product_amount: walletParams.order_product_amount,
+        order_wait_pay_amount: walletParams.order_wait_pay_amount,
+        products_count: ((_walletParams$product = walletParams.products) === null || _walletParams$product === void 0 ? void 0 : _walletParams$product.length) || 0
+      });
       return walletParams;
     }
 
@@ -99,7 +108,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "clearStoredWalletParams",
     value: function clearStoredWalletParams() {
       this.walletParams = null;
-      console.log('[WalletPass] 已存储的钱包参数已清理');
+      this.paymentModule.logInfo('[WalletPass] 已存储的钱包参数已清理');
     }
 
     /**
@@ -110,8 +119,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "initializeWalletDataFromBusinessAsync",
     value: (function () {
       var _initializeWalletDataFromBusinessAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(businessData) {
-        var _businessData$amountI, _businessData$amountI2;
-        var startTime, walletParams, result, endTime, duration, _endTime, _duration;
+        var _businessData$amountI, _businessData$amountI2, _businessData$amountI3, _businessData$amountI4, _businessData$product;
+        var startTime, walletParams, _result$walletRecomme, _result$userIdentific, result, endTime, duration, _businessData$amountI5, _endTime, _duration;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -131,10 +140,17 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 businessData: businessData,
                 startTime: startTime
               });
-              _context.prev = 5;
-              _context.next = 8;
+              this.paymentModule.logInfo('[WalletPass] 开始从业务数据初始化钱包数据', {
+                customer_id: businessData.customer_id,
+                totalAmount: (_businessData$amountI3 = businessData.amountInfo) === null || _businessData$amountI3 === void 0 ? void 0 : _businessData$amountI3.totalAmount,
+                subTotal: (_businessData$amountI4 = businessData.amountInfo) === null || _businessData$amountI4 === void 0 ? void 0 : _businessData$amountI4.subTotal,
+                order_wait_pay_amount: businessData.order_wait_pay_amount,
+                products_count: ((_businessData$product = businessData.products) === null || _businessData$product === void 0 ? void 0 : _businessData$product.length) || 0
+              });
+              _context.prev = 6;
+              _context.next = 9;
               return this.initializeWalletDataAsync(walletParams);
-            case 8:
+            case 9:
               result = _context.sent;
               endTime = Date.now();
               duration = endTime - startTime; // 发送初始化完成事件
@@ -145,11 +161,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 endTime: endTime,
                 duration: duration
               });
-              console.log("[WalletPass] \u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u6210\u529F\uFF0C\u8017\u65F6: ".concat(duration, "ms"));
+              this.paymentModule.logInfo("[WalletPass] \u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u6210\u529F", {
+                duration: "".concat(duration, "ms"),
+                walletRecommendList_count: ((_result$walletRecomme = result.walletRecommendList) === null || _result$walletRecomme === void 0 ? void 0 : _result$walletRecomme.length) || 0,
+                userIdentificationCodes_count: ((_result$userIdentific = result.userIdentificationCodes) === null || _result$userIdentific === void 0 ? void 0 : _result$userIdentific.length) || 0
+              });
               return _context.abrupt("return", result);
-            case 16:
-              _context.prev = 16;
-              _context.t0 = _context["catch"](5);
+            case 17:
+              _context.prev = 17;
+              _context.t0 = _context["catch"](6);
               _endTime = Date.now();
               _duration = _endTime - startTime; // 发送初始化失败事件
               this.emitEvent(WalletPassHooks.OnWalletInitializationFailed, {
@@ -159,13 +179,17 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 endTime: _endTime,
                 duration: _duration
               });
-              console.error("[WalletPass] \u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u5931\u8D25\uFF0C\u8017\u65F6: ".concat(_duration, "ms"), _context.t0);
+              this.paymentModule.logError("[WalletPass] \u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u5931\u8D25", _context.t0, {
+                duration: "".concat(_duration, "ms"),
+                customer_id: businessData.customer_id,
+                totalAmount: (_businessData$amountI5 = businessData.amountInfo) === null || _businessData$amountI5 === void 0 ? void 0 : _businessData$amountI5.totalAmount
+              });
               throw _context.t0;
-            case 23:
+            case 24:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[5, 16]]);
+        }, _callee, this, [[6, 17]]);
       }));
       function initializeWalletDataFromBusinessAsync(_x) {
         return _initializeWalletDataFromBusinessAsync.apply(this, arguments);
@@ -208,7 +232,10 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case 11:
               _context2.prev = 11;
               _context2.t0 = _context2["catch"](0);
-              console.error('[WalletPass] 初始化钱包数据失败:', _context2.t0);
+              this.paymentModule.logError('[WalletPass] 初始化钱包数据失败', _context2.t0, {
+                customer_id: baseParams.customer_id,
+                order_expect_amount: baseParams.order_expect_amount
+              });
               throw _context2.t0;
             case 15:
             case "end":
@@ -230,10 +257,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.prev = 0;
-              _context3.next = 3;
+              this.paymentModule.logInfo('[WalletPass] 开始获取钱包推荐列表', {
+                customer_id: params.customer_id,
+                order_expect_amount: params.order_expect_amount,
+                sale_channel: params.sale_channel
+              });
+              _context3.next = 4;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/recommend', params // 将 params 作为请求体数据
               );
-            case 3:
+            case 4:
               response = _context3.sent;
               this.walletRecommendList = (response === null || response === void 0 ? void 0 : response.data) || [];
 
@@ -241,19 +273,33 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.emitEvent(WalletPassHooks.OnWalletRecommendListUpdated, {
                 walletRecommendList: this.walletRecommendList
               });
-              console.log('[WalletPass] 钱包推荐列表已更新:', this.walletRecommendList.length, '项');
+              this.paymentModule.logInfo('[WalletPass] 钱包推荐列表已更新', {
+                count: this.walletRecommendList.length,
+                items: this.walletRecommendList.map(function (item) {
+                  return {
+                    voucher_id: item.voucher_id,
+                    name: item.name,
+                    amount: item.amount,
+                    tag: item.tag
+                  };
+                })
+              });
               return _context3.abrupt("return", this.walletRecommendList);
-            case 10:
-              _context3.prev = 10;
+            case 11:
+              _context3.prev = 11;
               _context3.t0 = _context3["catch"](0);
-              console.error('获取钱包推荐列表失败:', _context3.t0);
+              this.paymentModule.logError('[WalletPass] 获取钱包推荐列表失败', _context3.t0, {
+                customer_id: params.customer_id,
+                order_expect_amount: params.order_expect_amount,
+                sale_channel: params.sale_channel
+              });
               // throw error;
               return _context3.abrupt("return", []);
-            case 14:
+            case 15:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 10]]);
+        }, _callee3, this, [[0, 11]]);
       }));
       function getWalletPassRecommendListAsync(_x3) {
         return _getWalletPassRecommendListAsync.apply(this, arguments);
@@ -269,15 +315,21 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var newParams, response, sortedData;
+        var _newParams$prepare_pa, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.prev = 0;
               newParams = _objectSpread(_objectSpread({}, this.walletParams), params);
-              _context4.next = 4;
+              this.paymentModule.logInfo('[WalletPass] 开始获取用户识别码列表', {
+                customer_id: newParams.customer_id,
+                available: newParams.available,
+                prepare_payments_count: ((_newParams$prepare_pa = newParams.prepare_payments) === null || _newParams$prepare_pa === void 0 ? void 0 : _newParams$prepare_pa.length) || 0,
+                filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass
+              });
+              _context4.next = 5;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 4:
+            case 5:
               response = _context4.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -287,18 +339,30 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
                 userIdentificationCodes: this.userIdentificationCodes
               });
-              console.log('[WalletPass] 用户识别码列表已更新:', this.userIdentificationCodes.length, '项');
+              this.paymentModule.logInfo('[WalletPass] 用户识别码列表已更新', {
+                count: this.userIdentificationCodes.length,
+                sorted_items: this.userIdentificationCodes.slice(0, 5).map(function (item) {
+                  return {
+                    code: item.code,
+                    error_code: item.error_code,
+                    error_msg: item.error_msg
+                  };
+                })
+              });
               return _context4.abrupt("return", this.userIdentificationCodes);
-            case 12:
-              _context4.prev = 12;
+            case 13:
+              _context4.prev = 13;
               _context4.t0 = _context4["catch"](0);
-              console.error('获取用户识别码列表失败:', _context4.t0);
+              this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context4.t0, {
+                customer_id: params.customer_id,
+                available: params.available
+              });
               return _context4.abrupt("return", []);
-            case 16:
+            case 17:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[0, 12]]);
+        }, _callee4, this, [[0, 13]]);
       }));
       function getUserIdentificationCodeListAsync(_x4) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);
@@ -334,12 +398,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case 0:
               config = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
               _context5.prev = 1;
-              code = params.code; // 检查识别码是否为9位且前3位为"000"
+              code = params.code;
+              this.paymentModule.logInfo('[WalletPass] 开始搜索识别码', {
+                code: code,
+                code_length: code.length,
+                noCache: config.noCache || false
+              });
+
+              // 检查识别码是否为9位且前3位为"000"
               // const isWalletCode = code.length === 9 && code.startsWith('000');
               // 测试环境先使用 WL
               isWalletCode = code.startsWith('WL');
               if (!isWalletCode) {
-                _context5.next = 11;
+                _context5.next = 14;
                 break;
               }
               // 钱包识别码直接调用专门接口，不缓存，直接返回
@@ -348,21 +419,31 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 with_customer: 1,
                 with: ['wallet']
               };
-              _context5.next = 8;
+              this.paymentModule.logInfo('[WalletPass] 搜索钱包识别码', {
+                code: code,
+                with_customer: walletDetailParams.with_customer,
+                with: walletDetailParams.with
+              });
+              _context5.next = 10;
               return this.paymentModule.request.post('/wallet/detail/search', walletDetailParams);
-            case 8:
+            case 10:
               _response = _context5.sent;
               _searchResults = (_response === null || _response === void 0 ? void 0 : _response.data) || [];
+              this.paymentModule.logInfo('[WalletPass] 钱包识别码搜索完成', {
+                code: code,
+                results_count: _searchResults.length,
+                type: 'walletCode'
+              });
               return _context5.abrupt("return", {
                 type: 'walletCode',
                 data: _searchResults
               });
-            case 11:
+            case 14:
               // 合并钱包参数和搜索参数
               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),
@@ -374,20 +455,26 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 // 搜索特有参数
                 code: params.code
               };
-              _context5.next = 15;
+              this.paymentModule.logInfo('[WalletPass] 搜索普通识别码', {
+                code: searchParams.code,
+                customer_id: searchParams.customer_id,
+                order_expect_amount: searchParams.order_expect_amount,
+                multiple: searchParams.multiple
+              });
+              _context5.next = 19;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);
-            case 15:
+            case 19:
               response = _context5.sent;
               searchResults = (response === null || response === void 0 ? void 0 : response.data) || [];
               if (!config.noCache) {
-                _context5.next = 19;
+                _context5.next = 23;
                 break;
               }
               return _context5.abrupt("return", {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 19:
+            case 23:
               // 将搜索结果存储到缓存数组中
               if (searchResults.length > 0) {
                 // 避免重复存储相同的识别码
@@ -407,20 +494,30 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 cachedSearchResults: _toConsumableArray(this.searchResults),
                 searchParams: params
               });
+              this.paymentModule.logInfo('[WalletPass] 普通识别码搜索完成', {
+                code: params.code,
+                results_count: searchResults.length,
+                cached_results_count: this.searchResults.length,
+                type: 'normalCode'
+              });
               return _context5.abrupt("return", {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 24:
-              _context5.prev = 24;
+            case 29:
+              _context5.prev = 29;
               _context5.t0 = _context5["catch"](1);
-              console.error('[WalletPass] 搜索识别码信息失败:', _context5.t0);
+              this.paymentModule.logError('[WalletPass] 搜索识别码信息失败', _context5.t0, {
+                code: params.code,
+                customer_id: params.customer_id,
+                order_expect_amount: params.order_expect_amount
+              });
               throw _context5.t0;
-            case 28:
+            case 33:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[1, 24]]);
+        }, _callee5, this, [[1, 29]]);
       }));
       function searchIdentificationCodeAsync(_x5) {
         return _searchIdentificationCodeAsync.apply(this, arguments);
@@ -435,16 +532,26 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context6.next = 2;
+              this.paymentModule.logInfo('[WalletPass] 开始处理钱包支付', {
+                amount: amount,
+                orderUuid: orderUuid,
+                voucherId: voucherId || 'none'
+              });
+              _context6.next = 3;
               return this.paymentModule.getWalletPaymentMethod();
-            case 2:
+            case 3:
               walletMethod = _context6.sent;
               if (walletMethod) {
-                _context6.next = 5;
+                _context6.next = 7;
                 break;
               }
+              this.paymentModule.logError('[WalletPass] 钱包支付方式未找到', null, {
+                amount: amount,
+                orderUuid: orderUuid,
+                voucherId: voucherId
+              });
               throw new Error('钱包支付方式未找到');
-            case 5:
+            case 7:
               paymentItem = {
                 amount: amount.toString(),
                 code: walletMethod.code,
@@ -453,9 +560,16 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 type: walletMethod.type,
                 voucher_id: voucherId || ''
               };
-              _context6.next = 8;
+              _context6.next = 10;
               return this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
-            case 8:
+            case 10:
+              this.paymentModule.logInfo('[WalletPass] 钱包支付处理完成', {
+                amount: amount,
+                orderUuid: orderUuid,
+                voucherId: voucherId || 'none',
+                payment_method: walletMethod.name
+              });
+            case 11:
             case "end":
               return _context6.stop();
           }
@@ -515,7 +629,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       this.emitEvent(WalletPassHooks.OnWalletRecommendListCleared, {
         clearedTypes: ['walletRecommendList']
       });
-      console.log('[WalletPass] 钱包推荐列表已清除');
+      this.paymentModule.logInfo('[WalletPass] 钱包推荐列表已清除');
     }
 
     /**
@@ -530,7 +644,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       this.emitEvent(WalletPassHooks.OnUserIdentificationCodesCleared, {
         clearedTypes: ['userIdentificationCodes']
       });
-      console.log('[WalletPass] 用户识别码列表已清除');
+      this.paymentModule.logInfo('[WalletPass] 用户识别码列表已清除');
     }
 
     /**
@@ -560,7 +674,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "clearSearchResults",
     value: function clearSearchResults() {
       this.searchResults = [];
-      console.log('[WalletPass] 搜索结果缓存已清除');
+      this.paymentModule.logInfo('[WalletPass] 搜索结果缓存已清除');
     }
 
     /**
@@ -578,7 +692,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       this.emitEvent(WalletPassHooks.OnWalletCacheCleared, {
         clearedTypes: ['all']
       });
-      console.log('[WalletPass] 所有缓存数据已清除（包括钱包参数和搜索结果）');
+      this.paymentModule.logInfo('[WalletPass] 所有缓存数据已清除', {
+        cleared_types: ['walletRecommendList', 'userIdentificationCodes', 'searchResults', 'walletParams']
+      });
     }
   }]);
   return WalletPassPaymentImpl;

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

@@ -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
      *