@pisell/pisellos 0.0.212 → 0.0.214

package/dist/modules/Payment/index.js

@@ -1219,7 +1219,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               _context15.prev = 0;
               paymentData = {
                 payments: order.payment.map(function (payment) {
-                  return payment;
+                  return {
+                    uuid: payment.uuid,
+                    amount: payment.amount,
+                    code: payment.code,
+                    id: payment.id,
+                    name: payment.name,
+                    type: payment.type,
+                    voucher_id: payment.voucher_id,
+                    metadata: payment.metadata,
+                    rounding_amount: payment.rounding_amount,
+                    service_charge: payment.service_charge
+                  };
                 }),
                 payment_status: 'pending'
               }; // 计算总支付金额
@@ -1984,7 +1995,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 构造支付数据
               paymentData = {
                 payments: order.payment.map(function (payment) {
-                  return payment;
+                  return {
+                    uuid: payment.uuid,
+                    amount: payment.amount,
+                    code: payment.code,
+                    id: payment.id,
+                    name: payment.name,
+                    type: payment.type,
+                    voucher_id: payment.voucher_id,
+                    metadata: payment.metadata,
+                    rounding_amount: payment.rounding_amount,
+                    service_charge: payment.service_charge
+                  };
                 }),
                 payment_status: order.payment_status === PaymentStatus.Finished ? 'paid' : 'partially_paid'
               }; // 检查是否已经在队列中，避免重复添加

package/dist/modules/Schedule/utils.js

@@ -140,6 +140,12 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+
+      // 如果计算出的日期早于startTmp，则跳到下一周的相同星期几
+      if (_start.isBefore(startTmp, 'day')) {
+        _start = _start.add(1, 'week');
+      }
+
       // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
       if (_end.isAfter(deadline, 'day')) {
@@ -161,7 +167,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
         daysArr.push.apply(daysArr, _toConsumableArray(getDaysByStartEnd(_start, _end)));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, 'week');
+    startTmp = startTmp.add(frequency, 'week');
   }
   return Array.from(new Set(daysArr));
 };

package/lib/modules/Payment/index.js

@@ -567,7 +567,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   async submitSingleOrderPayment(order) {
     try {
       const paymentData = {
-        payments: order.payment.map((payment) => payment),
+        payments: order.payment.map((payment) => ({
+          uuid: payment.uuid,
+          amount: payment.amount,
+          code: payment.code,
+          id: payment.id,
+          name: payment.name,
+          type: payment.type,
+          voucher_id: payment.voucher_id,
+          metadata: payment.metadata,
+          rounding_amount: payment.rounding_amount,
+          service_charge: payment.service_charge
+        })),
         payment_status: "pending"
       };
       const totalPaidAmount = paymentData.payments.reduce(
@@ -1116,7 +1127,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   async reAddOrderToSyncQueue(order) {
     try {
       const paymentData = {
-        payments: order.payment.map((payment) => payment),
+        payments: order.payment.map((payment) => ({
+          uuid: payment.uuid,
+          amount: payment.amount,
+          code: payment.code,
+          id: payment.id,
+          name: payment.name,
+          type: payment.type,
+          voucher_id: payment.voucher_id,
+          metadata: payment.metadata,
+          rounding_amount: payment.rounding_amount,
+          service_charge: payment.service_charge
+        })),
         payment_status: order.payment_status === import_types.PaymentStatus.Finished ? "paid" : "partially_paid"
       };
       const existingQueue = this.app.tasksManager.getTaskQueue({

package/lib/modules/Schedule/utils.js

@@ -139,7 +139,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
   while (startTmp.isBefore(deadline, "day") || startTmp.isSame(deadline, "day")) {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
-      const _start = startTmp.day(item);
+      let _start = startTmp.day(item);
+      if (_start.isBefore(startTmp, "day")) {
+        _start = _start.add(1, "week");
+      }
       let _end = _start.add(scheduleDiff, "second");
       if (_end.isAfter(deadline, "day")) {
         _end = deadline;
@@ -160,7 +163,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
         daysArr.push(...getDaysByStartEnd(_start, _end));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, "week");
+    startTmp = startTmp.add(frequency, "week");
   }
   return Array.from(new Set(daysArr));
 };
@@ -585,7 +588,9 @@ function getAllSortedDateRanges(schedules) {
     return durationA - durationB;
   });
   const uniqueDateRanges = sortedDateRanges.filter(
-    (range, index, self) => index === self.findIndex((t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end)))
+    (range, index, self) => index === self.findIndex(
+      (t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end))
+    )
   );
   return uniqueDateRanges;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.212",
+  "version": "0.0.214",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",