payment-kit 1.19.0 → 1.19.2

package/src/hooks/subscription.ts

@@ -3,6 +3,7 @@ import Toast from '@arcblock/ux/lib/Toast';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { useRequest } from 'ahooks';
 import { api } from '@blocklet/payment-react';
+import type { TPaymentCurrency } from '@blocklet/payment-types';
 
 export function useUnpaidInvoicesCheckForSubscription(subscriptionId: string, manualCheck: boolean = false) {
   const { t } = useLocaleContext();
@@ -28,3 +29,36 @@ export function useUnpaidInvoicesCheckForSubscription(subscriptionId: string, ma
     hasUnpaid: data?.count > 0,
   };
 }
+
+export function usePendingAmountForSubscription(subscriptionId: string, paymentCurrency?: TPaymentCurrency) {
+  const { data: pendingAmountSummary, run: checkPendingAmount } = useRequest(
+    async () => {
+      if (!subscriptionId || !paymentCurrency?.id) return null;
+
+      const response = await api.get('/api/meter-events/pending-amount', {
+        params: {
+          subscription_id: subscriptionId,
+          currency_id: paymentCurrency.id,
+        },
+      });
+
+      return response.data;
+    },
+    {
+      ready: !!subscriptionId && !!paymentCurrency?.id,
+      refreshDeps: [subscriptionId, paymentCurrency?.id],
+      pollingInterval: 30000, // 每30秒检查一次
+    }
+  );
+
+  // pendingAmountSummary 是 GroupedBN 格式: { [currencyId: string]: string }
+  const pendingAmount = pendingAmountSummary && paymentCurrency?.id ? pendingAmountSummary[paymentCurrency.id] : null;
+
+  const hasPendingAmount = pendingAmount && pendingAmount !== '0';
+
+  return {
+    pendingAmount,
+    hasPendingAmount,
+    checkPendingAmount,
+  };
+}

package/src/libs/meter-utils.ts

@@ -0,0 +1,196 @@
+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 [];
+  }
+}

package/src/libs/util.ts

@@ -50,6 +50,10 @@ export function getPricingModel(price: TPrice) {
     return 'package';
   }
 
+  if (price.type === 'recurring' && price.recurring?.usage_type === 'metered' && price.recurring?.meter_id) {
+    return 'credit_metered';
+  }
+
   return 'standard';
 }