payment-kit 1.21.2 → 1.21.4

package/api/src/libs/vendor-util/adapters/didnames-adapter.ts

@@ -409,4 +409,10 @@ export class DidnamesAdapter implements VendorAdapter {
 
     return data;
   }
+
+  connectTest(): Promise<any> {
+    const url = formatVendorUrl(this.vendorConfig!, '/api/vendor/health');
+    const { headers } = VendorAuth.signRequestWithHeaders({});
+    return fetch(url, { headers }).then((res) => res.json());
+  }
 }

package/api/src/libs/vendor-util/adapters/launcher-adapter.ts

@@ -267,4 +267,10 @@ export class LauncherAdapter implements VendorAdapter {
 
     return doRequestVendorData(vendor, orderId, url, options);
   }
+
+  connectTest(): Promise<any> {
+    const url = formatVendorUrl(this.vendorConfig!, '/api/vendor/health');
+    const { headers } = VendorAuth.signRequestWithHeaders({});
+    return fetch(url, { headers }).then((res) => res.json());
+  }
 }

package/api/src/libs/vendor-util/adapters/types.ts

@@ -89,4 +89,5 @@ export interface VendorAdapter {
   checkOrderStatus(params: CheckOrderStatusParams): Promise<CheckOrderStatusResult>;
   getOrder(vendor: ProductVendor, orderId: string, option?: Record<string, any>): Promise<any>;
   getOrderStatus(vendor: ProductVendor, orderId: string, option?: Record<string, any>): Promise<any>;
+  connectTest(): Promise<any>;
 }

package/api/src/libs/vendor-util/adapters/util.ts

@@ -2,6 +2,6 @@ import { joinURL } from 'ufo';
 
 import type { VendorConfig } from './types';
 
-export const formatVendorUrl = (vendorConfig: VendorConfig, p: string) => {
-  return joinURL(vendorConfig.app_url, vendorConfig.metadata?.mountPoint || '', p);
+export const formatVendorUrl = (vendorConfig: VendorConfig, ...args: string[]) => {
+  return joinURL(vendorConfig.app_url, vendorConfig.metadata?.mountPoint || '', ...args);
 };

package/api/src/routes/checkout-sessions.ts

@@ -1329,6 +1329,11 @@ router.get('/retrieve/:id', user, async (req, res) => {
   });
 });
 
+async function checkVendorConfig(items: TLineItemExpanded[]) {
+  const lineItems = await Price.expand(items, { upsell: true });
+  return lineItems?.some((item: TLineItemExpanded) => !!item?.price?.product?.vendor_config?.length);
+}
+
 // submit order
 router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
   try {
@@ -1336,6 +1341,17 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       return res.status(403).json({ code: 'REQUIRE_LOGIN', error: 'Please login to continue' });
     }
 
+    const hasVendorConfig = await checkVendorConfig(req.doc.line_items);
+    if (hasVendorConfig) {
+      const { user: userDetail } = await blocklet.getUser(req.user.did, { enableConnectedAccount: true });
+      if (!userDetail?.sourceAppPid) {
+        return res.status(403).json({
+          code: 'UNIFIED_APP_REQUIRED',
+          error: 'This action requires a unified account. Please switch accounts and try again.',
+        });
+      }
+    }
+
     const checkoutSession = req.doc as CheckoutSession;
     if (checkoutSession.line_items) {
       try {

package/api/src/routes/meter-events.ts

@@ -222,7 +222,7 @@ router.post('/', auth, async (req, res) => {
       return res.status(400).json({ error: `Event with identifier "${req.body.identifier}" already exists` });
     }
 
-    const meter = await Meter.getMeterByEventName(req.body.event_name, !!req.livemode);
+    const meter = await Meter.getMeterByEventName(req.body.event_name);
     if (!meter) {
       return res
         .status(400)
@@ -361,7 +361,7 @@ router.get('/:id', authMine, async (req, res) => {
     if (customer.did !== req.user?.did && !['owner', 'admin'].includes(req.user?.role || '')) {
       return res.status(403).json({ error: 'You are not allowed to access this resource' });
     }
-    const meter = await Meter.getMeterByEventName(event.event_name, event.livemode);
+    const meter = await Meter.getMeterByEventName(event.event_name);
     let paymentCurrency = null;
     if (meter) {
       paymentCurrency = await PaymentCurrency.findByPk(meter.currency_id);

package/api/src/routes/meters.ts

@@ -68,7 +68,7 @@ router.post('/', auth, async (req, res) => {
     }
 
     const existing = await Meter.findOne({
-      where: { event_name: req.body.event_name, livemode: !!req.livemode },
+      where: { event_name: req.body.event_name },
     });
     if (existing) {
       return res.status(409).json({ error: `Meter with event_name "${req.body.event_name}" already exists` });

package/api/src/routes/vendor.ts

@@ -1,11 +1,14 @@
+import { middleware } from '@blocklet/payment-vendor';
 import { getUrl } from '@blocklet/sdk/lib/component';
 import { Router } from 'express';
 import Joi from 'joi';
-import { middleware } from '@blocklet/payment-vendor';
 
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { gte } from 'semver';
 import { MetadataSchema } from '../libs/api';
 import { wallet } from '../libs/auth';
 import dayjs from '../libs/dayjs';
+import env from '../libs/env';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { formatToShortUrl } from '../libs/url';
@@ -298,18 +301,40 @@ async function testVendorConnection(req: any, res: any) {
   try {
     const vendor = await ProductVendor.findByPk(req.params.id);
     if (!vendor) {
-      return res.status(404).json({ error: 'Vendor not found' });
+      return res.status(404).json({
+        code: 'VENDOR_NOT_FOUND',
+        error: 'Vendor not found',
+      });
     }
 
-    return res.json({
-      success: true,
-      message: 'Connection test completed',
-      vendor: {
-        id: vendor.id,
-        name: vendor.name,
-        app_url: vendor.app_url,
-      },
-    });
+    const vendorAdapter = await VendorFulfillmentService.getVendorAdapter(vendor.vendor_key);
+    const result = await vendorAdapter.connectTest();
+
+    if (result.connected) {
+      if (env.appId !== result.did) {
+        return res.status(400).json({
+          code: 'VENDOR_CONNECT_TEST_FAILED',
+          error: 'Vendor connection test failed! Please check the DID in the vendor preferences config',
+        });
+      }
+      return res.status(200).json({ ...result });
+    }
+
+    if (result.error) {
+      return res.status(400).json({
+        code: 'VENDOR_CONNECT_TEST_FAILED',
+        error: result.error,
+      });
+    }
+
+    if (!result.sdkVersion) {
+      return res.status(400).json({
+        code: 'VENDOR_CONNECT_TEST_FAILED',
+        error: 'Vendor SDK version is too low. Please upgrade to the latest version (>=1.21.4)',
+      });
+    }
+
+    return res.status(400).json({ ...result });
   } catch (error: any) {
     logger.error('Failed to test vendor connection', { error, id: req.params.id });
     return res.status(500).json({ error: 'Internal server error' });
@@ -588,22 +613,35 @@ async function handleSubscriptionRedirect(req: any, res: any) {
   return res.redirect(getUrl(`/customer/subscription/${checkoutSession.subscription_id}`));
 }
 
+function getVendorConnectTest(req: any, res: any) {
+  const sdkVersion = req.headers['x-broker-vendor-version'];
+  if (sdkVersion && gte(sdkVersion, '1.21.4')) {
+    return res.json({ connected: true, sdkVersion });
+  }
+  return res.json({
+    connected: false,
+    sdkVersion,
+    error: 'Vendor SDK version is too low, please upgrade to the latest version (>=1.21.4)',
+  });
+}
+
 const router = Router();
 
 const ensureVendorAuth = middleware.ensureVendorAuth((vendorPk: string) =>
   ProductVendor.findOne({ where: { 'extends.appPk': vendorPk } }).then((v) => v as any)
 );
 
-// FIXME: Authentication not yet added, awaiting implementation @Pengfei
 router.get('/order/:sessionId/status', loginAuth, validateParams(sessionIdParamSchema), getVendorFulfillmentStatus);
 router.get('/order/:sessionId/detail', loginAuth, validateParams(sessionIdParamSchema), getVendorFulfillmentDetail);
 
+// Those for Vendor Call
+router.get('/connectTest', ensureVendorAuth, getVendorConnectTest);
 router.get('/subscription/:sessionId/redirect', handleSubscriptionRedirect);
 router.get('/subscription/:sessionId', ensureVendorAuth, getVendorSubscription);
 
 router.get(
   '/open/:subscriptionId',
-  authAdmin,
+  loginAuth,
   validateParams(subscriptionIdParamSchema),
   validateQuery(vendorRedirectQuerySchema),
   redirectToVendor

package/api/src/store/models/meter-event.ts

@@ -374,7 +374,7 @@ export class MeterEvent extends Model<InferAttributes<MeterEvent>, InferCreation
 
     await Promise.all(
       events.map(async (event) => {
-        const meter = await Meter.getMeterByEventName(event.event_name, event.livemode);
+        const meter = await Meter.getMeterByEventName(event.event_name);
         if (!meter) {
           return;
         }

package/api/src/store/models/meter.ts

@@ -146,11 +146,8 @@ export class Meter extends Model<InferAttributes<Meter>, InferCreationAttributes
     });
   }
 
-  public static getMeterByEventName(eventName: string, livemode?: boolean): Promise<Meter | null> {
-    const whereClause: any = { event_name: eventName, livemode: true };
-    if (livemode !== undefined) {
-      whereClause.livemode = livemode;
-    }
+  public static getMeterByEventName(eventName: string): Promise<Meter | null> {
+    const whereClause: any = { event_name: eventName };
     return this.findOne({ where: whereClause });
   }
 

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.21.2
+version: 1.21.4
 logo: logo.png
 files:
   - dist
@@ -84,11 +84,11 @@ capabilities:
   clusterMode: false
   component: true
 screenshots:
-  - 3a4cab81c52c29662db8794b05ccc7c7.png
-  - 77ac49b79ae920f0f253ce8c694ffd65.png
-  - 1ef9e15ac36d4af5bef34941000ba3af.png
-  - 7ea8ef758865ecf6edb712d3534d2974.png
-  - 0ffe164ebe4aa2eb43f8d87f87683f7f.png
+  - checkout-payment-form.png
+  - customer-billing-dashboard.png
+  - subscription-details-view.png
+  - admin-payment-integrations.png
+  - payment-transactions-list.png
 components:
   - name: image-bin
     source:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.21.2",
+  "version": "1.21.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,9 +56,9 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@blocklet/payment-broker-client": "1.21.2",
-    "@blocklet/payment-react": "1.21.2",
-    "@blocklet/payment-vendor": "1.21.2",
+    "@blocklet/payment-broker-client": "1.21.4",
+    "@blocklet/payment-react": "1.21.4",
+    "@blocklet/payment-vendor": "1.21.4",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.43",
     "@blocklet/uploader": "^0.2.12",
@@ -128,7 +128,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.21.2",
+    "@blocklet/payment-types": "1.21.4",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "abd74e83a89ea2fdc1261aef68355b1ce299fa4b"
+  "gitHead": "d650fbb4c391c1d58bc7ebbd9dedf11901db9f89"
 }

package/screenshots/SCREENSHOTS.md

@@ -0,0 +1,33 @@
+# Payment Kit Screenshots
+
+This document provides a visual overview of the Payment Kit application, a decentralized Stripe-like payment solution for blocklets. Below are screenshots showcasing the key features and interfaces of the application.
+
+## Checkout Payment Form
+
+![Checkout Payment Form](./checkout-payment-form.png)
+
+This screenshot displays the checkout payment interface where customers complete their purchases. The form shows an order summary for "DID Names Service" priced at 5 USD, alongside payment details where users can select their preferred payment method (PLAY3, TBA, ABT, or USD). The interface includes fields for customer information such as name, email, and postal code, with a prominent "Pay" button to complete the transaction.
+
+## Customer Billing Dashboard
+
+![Customer Billing Dashboard](./customer-billing-dashboard.png)
+
+The customer billing dashboard provides users with a comprehensive overview of their account status and subscriptions. It displays wallet balances across multiple cryptocurrencies (TBA and PLAY3), showing balance, spent, and stake amounts. The credits section tracks token usage and transactions. Below that, users can view and manage their active subscriptions including "Usage Payment Service," "Test Service A," "Notification Service," and "Test Service B," each with renewal dates and management options.
+
+## Subscription Details View
+
+![Subscription Details View](./subscription-details-view.png)
+
+This detailed subscription management screen shows comprehensive information about "Test Service A." It displays the subscription status (Active), next invoice date, amount, current balance, and subdcard information. The interface includes customer details, billing information, payment method (ArcBlock Beta), and state transaction data. The Products section shows the subscription item (0.01 TBA/month), and the Invoice History table provides a complete record of past payments with amounts, payment methods, invoice numbers, and statuses.
+
+## Admin Payment Integrations
+
+![Admin Payment Integrations](./admin-payment-integrations.png)
+
+The admin integrations screen shows the configuration interface for payment methods and services. This view displays the vault settings page where administrators can configure app bundles and buffer thresholds for managing payment-related vault transfers. The right panel shows the available payment methods including ArcBlock (with ArcBlock Beta for testing), ETHng (with Ether payments via Alchemy Network), and BASE (with Base Mainnet and Sepolia options), each with toggle switches to enable or disable the payment method.
+
+## Payment Transactions List
+
+![Payment Transactions List](./payment-transactions-list.png)
+
+The payment transactions overview displays a comprehensive table of all payment activities in the system. The list shows transaction amounts (ranging from 0.1 TBA to 1 TBA), payment methods (ArcBlock Beta), customer information (primarily showing "Xiao Fang"), descriptions (subscription cycles, creation, and purchase confirmations), creation and update timestamps, and transaction statuses (marked as "Succeeded"). This view provides administrators with complete visibility into all payment processing activities within the platform.

package/src/components/vendor/actions.tsx

@@ -4,6 +4,7 @@ import { ConfirmDialog, api, formatError } from '@blocklet/payment-react';
 import { useSetState } from 'ahooks';
 import type { LiteralUnion } from 'type-fest';
 
+import { useEffect, useRef } from 'react';
 import Actions from '../actions';
 import ClickBoundary from '../click-boundary';
 
@@ -62,6 +63,33 @@ export default function VendorActions({ data, variant = 'compact', onChange }: V
     }
   };
 
+  const onTestConnectionRef = useRef(async () => {
+    try {
+      setState({ loading: true });
+      const result = await api.post(`/api/vendors/${data.id}/test-connection`).then((res: any) => res.data);
+      if (result.error) {
+        Toast.error(result.error);
+      } else {
+        Toast.success(t('admin.vendor.testConnectionSuccess'));
+      }
+    } catch (err) {
+      console.error(err);
+      if (err.response?.data?.code === 'VENDOR_CONNECT_TEST_FAILED') {
+        Toast.error(err.response?.data?.error);
+      } else {
+        Toast.error(formatError(err));
+      }
+    } finally {
+      setState({ loading: false, action: '' });
+    }
+  });
+
+  useEffect(() => {
+    if (state.action === 'testConnection') {
+      onTestConnectionRef.current();
+    }
+  }, [state.action]);
+
   return (
     <ClickBoundary>
       <Actions
@@ -84,6 +112,11 @@ export default function VendorActions({ data, variant = 'compact', onChange }: V
             color: 'error',
             divider: true,
           },
+          {
+            label: t('admin.vendor.testConnection'),
+            handler: () => setState({ action: 'testConnection' }),
+            color: 'primary',
+          },
         ].filter(Boolean)}
       />
       {state.action === 'toggle_status' && (

package/src/locales/en.tsx

@@ -463,7 +463,7 @@ export default flat({
         commissionType: 'Commission Type',
         commissionRate: 'Commission Rate',
         commissionRateRequired: 'Commission rate is required',
-        commissionRateMin: 'Commission rate must be greater than or equal to 0',
+        commissionRateMin: 'Commission rate must be at least 0',
         commissionRateMax: 'Commission rate cannot exceed 100%',
         amount: 'Fixed Amount',
         noVendor: 'No vendor available',
@@ -501,7 +501,7 @@ export default flat({
       unit_amount: {
         required: 'Price is required',
         positive: 'Price must be positive',
-        stripeTip: 'Stripe requires the price to be greater than or equal to 0.5',
+        stripeTip: 'Stripe requires the price to be at least 0.5',
       },
       nickname: {
         label: 'Price description',
@@ -518,8 +518,8 @@ export default flat({
         meteredTip:
           'Metered billing lets you charge customers based on reported usage at the end of each billing period.',
         aggregate: 'Charge for metered usage by',
-        intervalCountTip: 'Billing interval must be a positive integer',
-        stripeTip: 'Stripe requires the billing period to be greater than or equal to 1 day',
+        intervalCountTip: 'Billing interval must be a positive number',
+        stripeTip: 'Stripe requires the billing period to be at least 1 day',
       },
       currency: {
         add: 'Add more currencies',
@@ -566,7 +566,7 @@ export default flat({
       choosePricingModel: 'Choose your pricing model',
       usage: 'Usage',
       usageDesc:
-        'Price by number of users, units, or seats. Needs a record for Stripe to track customer service usage.',
+        'Price by number of users, units, or seats. Requires a record for Stripe to track customer service usage.',
       meter: 'Meter',
       billingPeriod: 'Billing period',
       aggregate: {
@@ -581,14 +581,14 @@ export default flat({
         tip: '',
       },
       quantity: {
-        tip: 'Quantity must be equal to or greater than 0',
+        tip: 'Quantity must be at least 0',
       },
       quantityAvailable: {
         label: 'Available quantity',
         placeholder: '0 means unlimited',
         format: 'Available {num} pieces',
         noLimit: 'No limit on available quantity',
-        valid: 'Available quantity must be greater than or equal to sold quantity',
+        valid: 'Available quantity must be at least the sold quantity',
         description: 'Enter the number of units that can be sold, 0 means unlimited',
       },
       quantitySold: {
@@ -644,7 +644,7 @@ export default flat({
       promotionCodes: 'Promotion Codes',
       promotionCodesHelp: 'Promotion codes will be created after the coupon is saved.',
       addPromotionCode: 'Add promotion code',
-      eligibleFirstTime: 'Eligible for first-time order only（each user can only enjoy one coupon discount）',
+      eligibleFirstTime: 'Eligible for first-time order only (each user can only use one coupon discount)',
       limitNumberRedemptions: 'Limit the number of times this code can be redeemed',
       addExpirationDate: 'Add an expiration date',
       requireMinimumOrder: 'Require minimum order value',
@@ -1112,6 +1112,9 @@ export default flat({
       saved: 'Vendor saved successfully',
       test: 'Test',
       testConnection: 'Test Connection',
+      testConnectionTip: 'Are you sure you want to test the connection for vendor "{name}"?',
+      testConnectionSuccess: 'Connection test successful',
+      testConnectionFailed: 'Connection test failed',
       testSuccess: 'Connection test successful',
       testAfterSave: 'Vendor saved successfully. You can test the connection to verify the configuration.',
       testToEnable: 'Vendor saved successfully. Test the connection to enable the vendor.',
@@ -1158,7 +1161,7 @@ export default flat({
       commission: 'Commission',
       commissionRate: 'Commission Rate',
       commissionRateRequired: 'Commission rate is required',
-      commissionRateMin: 'Commission rate must be greater than or equal to 0',
+      commissionRateMin: 'Commission rate must be at least 0',
       commissionRateMax: 'Commission rate is too high',
       commissionType: 'Commission Type',
       commissionRateHelp: 'Commission rate as percentage',
@@ -1472,7 +1475,7 @@ export default flat({
       bufferThreshold: 'Buffer Threshold',
       bufferThresholdHelp:
         'Only when the amount exceeding the deposit threshold reaches the buffer threshold will the collection operation be triggered.',
-      bufferThresholdInvalid: 'Buffer threshold must be greater than or equal to 0',
+      bufferThresholdInvalid: 'Buffer threshold must be at least 0',
       edit: 'Configure',
       enable: 'Enable',
       editTitle: 'Configure {currency} Vault Settings',
@@ -1488,7 +1491,7 @@ export default flat({
       noLimit: 'No limit',
       withdrawThresholdNoLimit: '0 means no withdrawal limit',
       depositThresholdRequired: 'Deposit threshold must be greater than 0',
-      withdrawThresholdInvalid: 'Withdrawal threshold must be greater or equal to 0',
+      withdrawThresholdInvalid: 'Withdrawal threshold must be at least 0',
       enableSuccess: 'Successfully enabled vault wallet for {currency}',
       disableSuccess: 'Successfully disabled vault wallet for {currency}',
       updateSuccess: 'Successfully updated vault wallet settings for {currency}',

package/src/locales/zh.tsx

@@ -1084,6 +1084,9 @@ export default flat({
       saved: '供应商保存成功',
       test: '测试',
       testConnection: '测试连接',
+      testConnectionTip: '确定要测试供应商 "{name}" 的连接吗？',
+      testConnectionSuccess: '连接测试成功',
+      testConnectionFailed: '连接测试失败',
       testSuccess: '连接测试成功',
       testAfterSave: '供应商保存成功。您可以测试连接以验证配置是否正确。',
       testToEnable: '供应商保存成功。请测试连接以启用供应商。',

package/src/pages/integrations/overview.tsx

@@ -261,7 +261,7 @@ export default function Overview() {
         actions={
           <Box sx={{ display: 'flex', gap: 2 }}>
             <Button onClick={() => setOpenMeterDialog(false)}>{t('common.cancel')}</Button>
-            <Button onClick={() => navigate('/admin/meters')} variant="contained">
+            <Button onClick={() => navigate('/admin/billing/meters')} variant="contained">
               {t('common.goToConfigure')}
             </Button>
           </Box>

package/src/libs/meter-utils.ts

@@ -1,196 +0,0 @@
-import { api } from '@blocklet/payment-react';
-import type { TMeter, TCustomer, TPaymentCurrency, TSubscription } from '@blocklet/payment-types';
-
-export interface MeterInfo {
-  meter?: TMeter & { paymentCurrency?: TPaymentCurrency };
-  customer?: TCustomer;
-  paymentCurrency?: TPaymentCurrency;
-  subscription?: TSubscription;
-}
-
-export interface GetMeterInfoOptions {
-  meterId?: string;
-  customerId?: string;
-  eventName?: string;
-  includeCustomer?: boolean;
-  includePaymentCurrency?: boolean;
-  includeSubscription?: boolean;
-  subscriptionId?: string;
-}
-
-/**
- * 获取meter相关信息的通用方法
- * @param options 配置选项
- * @returns Promise<MeterInfo>
- */
-export async function getMeterInfo(options: GetMeterInfoOptions = {}): Promise<MeterInfo> {
-  const {
-    meterId,
-    customerId,
-    eventName,
-    includeCustomer = false,
-    includePaymentCurrency = false,
-    includeSubscription = false,
-    subscriptionId,
-  } = options;
-
-  const result: MeterInfo = {};
-
-  try {
-    // 获取meter信息
-    if (meterId) {
-      const { data: meter } = await api.get(`/api/meters/${meterId}`);
-      result.meter = meter;
-
-      // 如果meter包含paymentCurrency且需要包含
-      if (includePaymentCurrency && meter.paymentCurrency) {
-        result.paymentCurrency = meter.paymentCurrency;
-      }
-    } else if (eventName) {
-      // 通过event_name查找meter
-      const { data: meters } = await api.get(`/api/meters?event_name=${encodeURIComponent(eventName)}`);
-      if (meters.list && meters.list.length > 0) {
-        const [firstMeter] = meters.list;
-        result.meter = firstMeter;
-
-        if (includePaymentCurrency && firstMeter.paymentCurrency) {
-          result.paymentCurrency = firstMeter.paymentCurrency;
-        }
-      }
-    }
-
-    // 获取customer信息
-    if (includeCustomer && customerId) {
-      const { data: customer } = await api.get(`/api/customers/${customerId}`);
-      result.customer = customer;
-    }
-
-    // 获取subscription信息
-    if (includeSubscription && subscriptionId) {
-      const { data: subscription } = await api.get(`/api/subscriptions/${subscriptionId}`);
-      result.subscription = subscription;
-    }
-
-    // 如果需要paymentCurrency但还没有获取到，尝试从meter的currency_id获取
-    if (includePaymentCurrency && !result.paymentCurrency && result.meter?.currency_id) {
-      try {
-        const { data: paymentCurrency } = await api.get(`/api/payment-currencies/${result.meter.currency_id}`);
-        result.paymentCurrency = paymentCurrency;
-      } catch (err) {
-        console.warn('Failed to fetch payment currency:', err);
-      }
-    }
-
-    return result;
-  } catch (error) {
-    console.error('Error fetching meter info:', error);
-    throw error;
-  }
-}
-
-/**
- * 获取meter的完整信息（包含所有关联数据）
- * @param meterId meter ID
- * @returns Promise<MeterInfo>
- */
-export function getMeterFullInfo(meterId: string): Promise<MeterInfo> {
-  return getMeterInfo({
-    meterId,
-    includePaymentCurrency: true,
-  });
-}
-
-/**
- * 根据事件名称获取meter信息
- * @param eventName 事件名称
- * @param includePaymentCurrency 是否包含支付货币信息
- * @returns Promise<MeterInfo>
- */
-export function getMeterByEventName(eventName: string, includePaymentCurrency = true): Promise<MeterInfo> {
-  return getMeterInfo({
-    eventName,
-    includePaymentCurrency,
-  });
-}
-
-/**
- * 获取meter事件的完整上下文信息
- * @param options 配置选项
- * @returns Promise<MeterInfo>
- */
-export function getMeterEventContext(options: {
-  meterId?: string;
-  eventName?: string;
-  customerId?: string;
-  subscriptionId?: string;
-}): Promise<MeterInfo> {
-  const { meterId, eventName, customerId, subscriptionId } = options;
-
-  return getMeterInfo({
-    meterId,
-    eventName,
-    customerId,
-    subscriptionId,
-    includeCustomer: !!customerId,
-    includePaymentCurrency: true,
-    includeSubscription: !!subscriptionId,
-  });
-}
-
-/**
- * 批量获取多个meter的信息
- * @param meterIds meter ID数组
- * @param includePaymentCurrency 是否包含支付货币信息
- * @returns Promise<MeterInfo[]>
- */
-export function getBatchMeterInfo(meterIds: string[], includePaymentCurrency = true): Promise<MeterInfo[]> {
-  const promises = meterIds.map((meterId) =>
-    getMeterInfo({
-      meterId,
-      includePaymentCurrency,
-    }).catch((error) => {
-      console.warn(`Failed to fetch meter ${meterId}:`, error);
-      return { meter: undefined };
-    })
-  );
-
-  return Promise.all(promises);
-}
-
-/**
- * 获取客户的meter使用情况
- * @param customerId 客户ID
- * @param meterId 可选的meter ID，如果不提供则获取所有meter
- * @returns Promise<MeterInfo[]>
- */
-export async function getCustomerMeterUsage(customerId: string, meterId?: string): Promise<MeterInfo[]> {
-  try {
-    // 获取客户的credit transactions来找到相关的meters
-    const params = new URLSearchParams();
-    params.append('customer_id', customerId);
-    if (meterId) {
-      params.append('meter_id', meterId);
-    }
-
-    const { data: transactions } = await api.get(`/api/credit-transactions?${params.toString()}`);
-
-    // 提取唯一的meter IDs
-    const uniqueMeterIds = [
-      ...new Set(
-        transactions.list
-          ?.map((t: any) => t.meter?.id)
-          .filter((id: any): id is string => Boolean(id) && typeof id === 'string')
-      ),
-    ] as string[];
-
-    if (uniqueMeterIds.length === 0) {
-      return [];
-    }
-
-    // 批量获取meter信息
-    return await getBatchMeterInfo(uniqueMeterIds);
-  } catch (error) {
-    console.error('Error fetching customer meter usage:', error);
-    return [];
-  }
-}