@pisell/pisellos 2.1.23 → 2.1.25

package/dist/solution/BookingByStep/index.js

@@ -2598,17 +2598,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               // 这里为什么要设置个 map，因为有可能日程有重叠，所以要把重叠的 event_list 去除
               var mSet = new Map();
-              n.event_list.forEach(function (m) {
-                // 需要确认 m 的时间段是否和 item 的时间段有交集
-                if (isConflict({
-                  start_at: m.start_at,
-                  end_at: m.end_at
-                }, {
-                  start_at: dayjs(item.start),
-                  end_at: dayjs(item.end)
-                })) {
-                  mSet.set(m.id, m.pax || 1);
-                }
+              mTimes.forEach(function (n) {
+                // acc += n.event_list?.reduce((acc: any, curr: any) => acc + curr.pax, 0);
+                // mSet.set(n)
+                n.event_list.forEach(function (m) {
+                  // 需要确认 m 的时间段是否和 item 的时间段有交集
+                  if (isConflict({
+                    start_at: m.start_at,
+                    end_at: m.end_at
+                  }, {
+                    start_at: dayjs(item.start),
+                    end_at: dayjs(item.end)
+                  })) {
+                    mSet.set(m.id, m.pax || 1);
+                  }
+                });
               });
               acc += Array.from(mSet.values()).reduce(function (acc, curr) {
                 return acc + curr;

package/dist/solution/Checkout/index.js

@@ -841,7 +841,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 订单ID替换后更新 stateAmount
               _context12.next = 15;
-              return this.updateStateAmountToRemaining();
+              return this.updateStateAmountToRemaining(false);
             case 15:
               return _context12.abrupt("return", updatedOrder);
             case 18:
@@ -1129,30 +1129,29 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _context15.next = 38;
               return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0))), CheckoutErrorType.OrderCreationFailed);
             case 38:
-              _context15.next = 40;
-              return this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
+              // 触发支付项添加事件（可以复用支付开始事件）
+              this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
                 paymentMethodName: paymentItem.name,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 40:
-              _context15.next = 48;
+              _context15.next = 47;
               break;
-            case 42:
-              _context15.prev = 42;
+            case 41:
+              _context15.prev = 41;
               _context15.t1 = _context15["catch"](1);
               this.logError('添加支付项失败:', _context15.t1);
-              _context15.next = 47;
+              _context15.next = 46;
               return this.handleError(_context15.t1, CheckoutErrorType.PaymentFailed);
-            case 47:
+            case 46:
               throw _context15.t1;
-            case 48:
+            case 47:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 42], [26, 33]]);
+        }, _callee15, this, [[1, 41], [26, 33]]);
       }));
       function addPaymentItemAsync(_x14) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1362,7 +1361,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 更新 stateAmount 为剩余未支付金额
               _context17.next = 24;
-              return this.updateStateAmountToRemaining();
+              return this.updateStateAmountToRemaining(false);
             case 24:
               _context17.next = 26;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
@@ -2669,14 +2668,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateStateAmountToRemaining",
     value: (function () {
       var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var remainingAmount, currentStateAmount;
+        var checkOrder,
+          remainingAmount,
+          currentStateAmount,
+          _args33 = arguments;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              _context33.prev = 0;
-              _context33.next = 3;
+              checkOrder = _args33.length > 0 && _args33[0] !== undefined ? _args33[0] : true;
+              _context33.prev = 1;
+              _context33.next = 4;
               return this.calculateRemainingAmountAsync();
-            case 3:
+            case 4:
               remainingAmount = _context33.sent;
               currentStateAmount = this.store.stateAmount; // 只有当剩余金额与当前 stateAmount 不同时才更新
               if (remainingAmount !== currentStateAmount) {
@@ -2700,23 +2703,27 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 同步更新系统内部的 balanceDueAmount
-              _context33.next = 8;
+              _context33.next = 9;
               return this.updateBalanceDueAmount();
-            case 8:
-              _context33.next = 10;
+            case 9:
+              if (!checkOrder) {
+                _context33.next = 12;
+                break;
+              }
+              _context33.next = 12;
               return this.checkOrderPaymentCompletion();
-            case 10:
-              _context33.next = 15;
-              break;
             case 12:
-              _context33.prev = 12;
-              _context33.t0 = _context33["catch"](0);
+              _context33.next = 17;
+              break;
+            case 14:
+              _context33.prev = 14;
+              _context33.t0 = _context33["catch"](1);
               this.logError('更新 stateAmount 为剩余金额失败:', _context33.t0);
-            case 15:
+            case 17:
             case "end":
               return _context33.stop();
           }
-        }, _callee33, this, [[0, 12]]);
+        }, _callee33, this, [[1, 14]]);
       }));
       function updateStateAmountToRemaining() {
         return _updateStateAmountToRemaining.apply(this, arguments);

package/lib/solution/BookingByStep/index.js

@@ -1826,13 +1826,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n2.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n2.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
             });
             const mSet = /* @__PURE__ */ new Map();
-            n.event_list.forEach((m) => {
-              if ((0, import_resources.isConflict)(
-                { start_at: m.start_at, end_at: m.end_at },
-                { start_at: (0, import_dayjs.default)(item.start), end_at: (0, import_dayjs.default)(item.end) }
-              )) {
-                mSet.set(m.id, m.pax || 1);
-              }
+            mTimes.forEach((n2) => {
+              n2.event_list.forEach((m) => {
+                if ((0, import_resources.isConflict)(
+                  { start_at: m.start_at, end_at: m.end_at },
+                  { start_at: (0, import_dayjs.default)(item.start), end_at: (0, import_dayjs.default)(item.end) }
+                )) {
+                  mSet.set(m.id, m.pax || 1);
+                }
+              });
             });
             acc += Array.from(mSet.values()).reduce((acc2, curr2) => acc2 + curr2, 0);
             return acc;

package/lib/solution/Checkout/index.js

@@ -504,7 +504,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           newOrderId: updatedOrder.id
         });
         this.store.isOrderSynced = true;
-        await this.updateStateAmountToRemaining();
+        await this.updateStateAmountToRemaining(false);
       }
       return updatedOrder;
     } catch (error) {
@@ -687,7 +687,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
+      this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
         paymentMethodName: paymentItem.name,
@@ -852,7 +852,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
         this.store.currentOrder = updatedOrder;
       }
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: "VOUCHER_BATCH",
@@ -1640,7 +1640,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   /**
    * 更新 stateAmount 为当前剩余未支付金额
    */
-  async updateStateAmountToRemaining() {
+  async updateStateAmountToRemaining(checkOrder = true) {
     try {
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const currentStateAmount = this.store.stateAmount;
@@ -1662,7 +1662,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         });
       }
       await this.updateBalanceDueAmount();
-      await this.checkOrderPaymentCompletion();
+      if (checkOrder) {
+        await this.checkOrderPaymentCompletion();
+      }
     } catch (error) {
       this.logError("更新 stateAmount 为剩余金额失败:", error);
     }

package/package.json

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