@pisell/pisellos 2.1.40 → 2.1.42

package/dist/modules/Payment/index.js

@@ -1054,7 +1054,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
+        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1065,16 +1065,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderPaymentType: paymentItem.order_payment_type
               });
               _context13.prev = 1;
-              _context13.next = 4;
+              this.logInfo('准备获取订单', {
+                orderUuid: orderUuid
+              });
+              _context13.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 4:
+            case 5:
               order = _context13.sent;
+              this.logInfo('获取订单信息成功', {
+                orderUuid: orderUuid,
+                order: order
+              });
               if (order) {
-                _context13.next = 7;
+                _context13.next = 9;
                 break;
               }
               throw new Error("Order not found: ".concat(orderUuid));
-            case 7:
+            case 9:
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
               expectAmount = new Decimal(order.expect_amount);
               paidDepositAmount = order.payment.reduce(function (sum, payment) {
@@ -1085,7 +1092,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
               if (!(expectAmount.lte(0) && expectedDepositAmount.eq(0))) {
-                _context13.next = 15;
+                _context13.next = 17;
                 break;
               }
               warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
@@ -1102,8 +1109,12 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw new Error(warningMessage);
-            case 15:
-              paymentUuid = getUniqueId('payment_');
+            case 17:
+              if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
+                paymentUuid = paymentItem.metadata.unique_payment_number;
+              } else {
+                paymentUuid = getUniqueId('payment_');
+              }
               newPaymentItem = {
                 uuid: paymentUuid,
                 id: paymentItem.id || 0,
@@ -1125,15 +1136,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 21;
+              this.logInfo('开始更新订单支付项', {
+                orderUuid: orderUuid,
+                order: order
+              });
+              _context13.next = 24;
               return this.dbManager.update('order', order);
-            case 21:
-              _context13.next = 23;
-              return this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
+            case 24:
+              this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 23:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1147,10 +1160,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 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 = 31;
+              _context13.next = 33;
               break;
-            case 26:
-              _context13.prev = 26;
+            case 28:
+              _context13.prev = 28;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1158,11 +1171,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 31:
+            case 33:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 26]]);
+        }, _callee13, this, [[1, 28]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);

package/dist/solution/BookingByStep/index.js

@@ -2732,7 +2732,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkMaxDurationCapacity",
     value: function checkMaxDurationCapacity() {
       var _this15 = this;
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (item) {
+        return !isNormalProduct(item._productOrigin);
+      });
       if (cartItems.length === 0) return {
         success: true,
         minAvailableCount: 0
@@ -3155,7 +3157,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var product = _ref13.product,
         date = _ref13.date,
         account = _ref13.account;
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (item) {
+        return !isNormalProduct(item._productOrigin);
+      });
 
       // 将 ProductData 转换为 CartItem 但不真正添加到购物车
       var currentCartItem = this.convertProductToCartItem({

package/dist/solution/BookingByStep/utils/capacity.js

@@ -24,8 +24,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
       var id = d.bundle_product_id;
+      var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id;
+        return item.product_id === id || item.product_id === variantId;
       });
       return {
         id: id,

package/dist/solution/Checkout/index.js

@@ -3191,8 +3191,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 depositPaidAmount = paymentItems.filter(function (item) {
                   return item.order_payment_type === 'deposit' && item.status !== 'voided';
                 }).reduce(function (sum, item) {
-                  // 如果是 wallet，并且还没同步到后端，则不计入这一部分金额
-                  if (item.voucher_id && !item.isSynced) {
+                  // 如果是 wallet，并且还没同步到后端，且此时还没有其他类型的支付项（现金，eftpos，标记支付）,不计入已付金额
+                  // 如果有其他支付项了，代表此时处于马上要同步的状态，所以计入
+                  if (item.voucher_id && !item.isSynced && paymentItems.filter(function (item) {
+                    return !item.voucher_id;
+                  }).length === 0) {
                     return sum;
                   }
                   var amount = new Decimal(item.amount || '0');

package/lib/modules/Payment/index.js

@@ -502,7 +502,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 为某个订单添加支付项（新方法）
    */
   async addPaymentItemAsync(orderUuid, paymentItem) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
@@ -510,7 +510,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       orderPaymentType: paymentItem.order_payment_type
     });
     try {
+      this.logInfo("准备获取订单", {
+        orderUuid
+      });
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
+      this.logInfo("获取订单信息成功", {
+        orderUuid,
+        order
+      });
       if (!order) {
         throw new Error(`Order not found: ${orderUuid}`);
       }
@@ -538,7 +545,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
       const newPaymentItem = {
         uuid: paymentUuid,
         id: paymentItem.id || 0,
@@ -562,23 +574,27 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       };
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
+      this.logInfo("开始更新订单支付项", {
+        orderUuid,
+        order
+      });
       await this.dbManager.update("order", order);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         payment: newPaymentItem
       });
       this.logInfo("addPaymentItemAsync completed successfully", {
         orderUuid,
         paymentUuid: newPaymentItem.uuid,
-        uniquePaymentNumber: (_a = newPaymentItem.metadata) == null ? void 0 : _a.unique_payment_number,
+        uniquePaymentNumber: (_b = newPaymentItem.metadata) == null ? void 0 : _b.unique_payment_number,
         newExpectAmount: order.expect_amount,
         paymentAmount: newPaymentItem.amount,
         paymentCode: newPaymentItem.code,
         orderPaymentType: newPaymentItem.order_payment_type,
         metadataFields: Object.keys(newPaymentItem.metadata || {}),
         // 现金支付找零信息
-        actualPaidAmount: (_b = newPaymentItem.metadata) == null ? void 0 : _b.actual_paid_amount,
-        changeGivenAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.change_given_amount
+        actualPaidAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
       });
     } catch (error) {
       console.error("[PaymentModule] 添加支付项失败", error);

package/lib/solution/BookingByStep/index.js

@@ -1921,7 +1921,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   checkMaxDurationCapacity() {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     if (cartItems.length === 0)
       return { success: true, minAvailableCount: 0 };
     const itemsWithTime = [];
@@ -2183,7 +2183,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     account
   }) {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     const currentCartItem = this.convertProductToCartItem({ product, date, account });
     cartItems.push(currentCartItem);
     if (cartItems.length === 0)

package/lib/solution/BookingByStep/utils/capacity.js

@@ -47,8 +47,9 @@ var formatDefaultCapacitys = ({
   if ((capacity == null ? void 0 : capacity.type) === "package") {
     return (product_bundle || []).map((d) => {
       const id = d.bundle_product_id;
+      const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
+        (item2) => item2.product_id === id || item2.product_id === variantId
       );
       return {
         id,

package/lib/solution/Checkout/index.js

@@ -1967,7 +1967,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const depositPaidAmount = paymentItems.filter(
           (item) => item.order_payment_type === "deposit" && item.status !== "voided"
         ).reduce((sum, item) => {
-          if (item.voucher_id && !item.isSynced) {
+          if (item.voucher_id && !item.isSynced && paymentItems.filter((item2) => !item2.voucher_id).length === 0) {
             return sum;
           }
           const amount = new import_decimal.default(item.amount || "0");

package/package.json

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