@pisell/pisellos 1.0.60 → 1.0.62

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

@@ -17,6 +17,23 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateList(): ITime[];
     setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     *
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+    private roundUpToNext10Minutes;
+    /**
+     * 校正资源时间段数据
+     *
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     *
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+    private correctResourceTimeSlots;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;

package/dist/modules/Date/index.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -21,6 +23,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
 import { BaseModule } from "../BaseModule";
 import { disableAllDates, generateMonthDates, handleAvailableDateByResource, handleAvailableDatesByRules } from "./utils";
 import cloneDeep from 'lodash-es/cloneDeep';
@@ -204,22 +207,107 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               res = _context3.sent;
+              // 校正资源时间段数据
+              if (res !== null && res !== void 0 && res.data && Array.isArray(res.data)) {
+                res.data = this.correctResourceTimeSlots(res.data);
+              }
               return _context3.abrupt("return", res);
-            case 10:
-              _context3.prev = 10;
+            case 11:
+              _context3.prev = 11;
               _context3.t0 = _context3["catch"](3);
               console.error(_context3.t0);
-            case 13:
+            case 14:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[3, 10]]);
+        }, _callee3, this, [[3, 11]]);
       }));
       function fetchResourceDates(_x4) {
         return _fetchResourceDates.apply(this, arguments);
       }
       return fetchResourceDates;
     }()
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     * 
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+  }, {
+    key: "roundUpToNext10Minutes",
+    value: function roundUpToNext10Minutes(time) {
+      var minutes = time.minute();
+      var remainder = minutes % 10;
+      if (remainder === 0) {
+        // 如果已经是10分钟的整数，保持不变
+        return time.format('YYYY-MM-DD HH:mm');
+      } else {
+        // 向上取整到下一个10分钟
+        var minutesToAdd = 10 - remainder;
+        var roundedTime = time.add(minutesToAdd, 'minute');
+        return roundedTime.format('YYYY-MM-DD HH:mm');
+      }
+    }
+
+    /**
+     * 校正资源时间段数据
+     * 
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     * 
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+  }, {
+    key: "correctResourceTimeSlots",
+    value: function correctResourceTimeSlots(resourcesData) {
+      var _this2 = this;
+      return resourcesData.map(function (resource) {
+        // 检查资源是否有 times 数组和 start_time
+        if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
+          return resource;
+        }
+        var resourceStartTime = dayjs(resource.start_time);
+
+        // 过滤和修正时间段
+        var correctedTimes = resource.times.map(function (timeSlot) {
+          if (!timeSlot.start_at || !timeSlot.end_at) {
+            return timeSlot;
+          }
+          var startAt = dayjs(timeSlot.start_at);
+          var endAt = dayjs(timeSlot.end_at);
+
+          // 如果 start_at 早于资源的 start_time，需要修正
+          if (startAt.isBefore(resourceStartTime)) {
+            // 将 start_time 向上取整到下一个10分钟整数
+            var roundedStartTime = _this2.roundUpToNext10Minutes(resourceStartTime);
+            var roundedStartTimeDayjs = dayjs(roundedStartTime);
+            console.log("[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ".concat(timeSlot.start_at, " -> ").concat(roundedStartTime, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u539F\u59CBstart_time: ").concat(resource.start_time, ")"));
+
+            // 将 start_at 修正为向上取整后的时间
+            var correctedTimeSlot = _objectSpread(_objectSpread({}, timeSlot), {}, {
+              start_at: roundedStartTime
+            });
+
+            // 检查修正后的 end_at 是否也早于修正后的 start_time
+            if (endAt.isBefore(roundedStartTimeDayjs)) {
+              console.log("[DateModule] \u65F6\u95F4\u6BB5\u65E0\u6548\uFF0C\u5C06\u88AB\u5220\u9664: ".concat(timeSlot.start_at, " - ").concat(timeSlot.end_at, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u4FEE\u6B63\u540Estart_time: ").concat(roundedStartTime, ")"));
+              return null; // 标记为删除
+            }
+            return correctedTimeSlot;
+          }
+
+          // 不需要修正的时间段直接返回
+          return timeSlot;
+        }).filter(function (timeSlot) {
+          return timeSlot !== null;
+        }); // 过滤掉被删除的时间段
+
+        return _objectSpread(_objectSpread({}, resource), {}, {
+          times: correctedTimes
+        });
+      });
+    }
   }, {
     key: "getResourceAvailableTimeList",
     value: function () {

package/dist/modules/Order/index.js

@@ -47,15 +47,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var appPlugin, app;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.store = options.store;
               this.request = this.core.getPlugin('request');
-              this.logger = this.core.getPlugin('logger');
+              appPlugin = this.core.getPlugin('app');
+              if (appPlugin) {
+                _context.next = 6;
+                break;
+              }
+              throw new Error('Order 模块需要 app 插件支持');
+            case 6:
+              app = appPlugin.getApp();
+              this.logger = app.logger;
               this.logInfo('OrderModule initialized successfully');
-            case 5:
+            case 9:
             case "end":
               return _context.stop();
           }

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

@@ -31,19 +31,19 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 记录信息日志
      */
-    private logInfo;
+    logInfo(title: string, metadata?: any): void;
     /**
      * 记录警告日志
      */
-    private logWarning;
+    logWarning(title: string, metadata?: any): void;
     /**
      * 记录错误日志
      */
-    private logError;
+    logError(title: string, error?: any, metadata?: any): void;
     /**
      * 记录调试日志
      */
-    private logDebug;
+    logDebug(title: string, metadata?: any): void;
     /**
      * 网络恢复以后，尝试执行队列
      *

package/dist/modules/Payment/index.js

@@ -1030,7 +1030,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, order, paymentUuid, newPaymentItem;
+        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1066,9 +1066,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 新支付项默认为活跃状态
                 order_payment_type: paymentItem.order_payment_type || 'normal',
                 // 默认为正常支付
-                metadata: {
+                metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
+                  // 保留传入的所有 metadata 字段
                   unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid
-                }
+                })
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
@@ -1085,7 +1086,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
                 uniquePaymentNumber: (_newPaymentItem$metad = newPaymentItem.metadata) === null || _newPaymentItem$metad === void 0 ? void 0 : _newPaymentItem$metad.unique_payment_number,
-                newExpectAmount: order.expect_amount
+                newExpectAmount: order.expect_amount,
+                paymentAmount: newPaymentItem.amount,
+                paymentCode: newPaymentItem.code,
+                orderPaymentType: newPaymentItem.order_payment_type,
+                metadataFields: Object.keys(newPaymentItem.metadata || {}),
+                // 现金支付找零信息
+                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;
               break;

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

@@ -111,6 +111,10 @@ export interface PaymentItem {
         unique_payment_number?: string;
         /** rouding规则 */
         rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
     };
     /** rouding金额 */
     rounding_amount?: string;
@@ -230,6 +234,10 @@ export interface PaymentItemInput {
         unique_payment_number?: string;
         /** rounding规则 */
         rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
     };
 }
 /**