payment-kit 1.22.23 → 1.22.25

package/api/src/libs/currency.ts

@@ -1,6 +1,9 @@
 import { fromTokenToUnit, fromUnitToToken } from '@ocap/util';
-import { PaymentCurrency } from '../store/models';
+import { getUrl } from '@blocklet/sdk';
+import { PaymentCurrency, Price, Product, RechargeConfig } from '../store/models';
 import { trimDecimals } from './math-utils';
+import { createPaymentLink } from '../routes/payment-links';
+import logger from './logger';
 
 export async function formatCurrencyToken(amount: string, currencyId: string) {
   if (!amount) {
@@ -29,3 +32,71 @@ export async function formatCurrencyUnit(amount: string, currencyId: string) {
   }
   return fromTokenToUnit(amount || '0', currency.decimal).toString();
 }
+
+export async function getRechargePaymentUrl(
+  currency: PaymentCurrency & { recharge_config?: RechargeConfig }
+): Promise<string | null> {
+  try {
+    if (!currency || !currency.recharge_config) {
+      return null;
+    }
+
+    const rechargeConfig = currency.recharge_config;
+    const checkoutUrl = rechargeConfig.checkout_url;
+
+    if (checkoutUrl) {
+      return checkoutUrl;
+    }
+
+    if (rechargeConfig.payment_link_id) {
+      return getUrl(`/checkout/pay/${rechargeConfig.payment_link_id}`);
+    }
+
+    if (rechargeConfig.base_price_id) {
+      const basePrice = (await Price.findByPk(rechargeConfig.base_price_id, {
+        include: [{ model: Product, as: 'product' }],
+      })) as (Price & { product: Product }) | null;
+
+      if (!basePrice) {
+        logger.warn('Base price not found for recharge config', {
+          currencyId: currency.id,
+          basePriceId: rechargeConfig.base_price_id,
+        });
+        return null;
+      }
+
+      const paymentLink = await createPaymentLink({
+        livemode: currency.livemode,
+        currency_id: basePrice.currency_id,
+        name: basePrice.product?.name || `${currency.name} Recharge`,
+        submit_type: 'pay',
+        allow_promotion_codes: true,
+        line_items: [
+          {
+            price_id: rechargeConfig.base_price_id,
+            quantity: 1,
+            adjustable_quantity: {
+              enabled: true,
+              minimum: 1,
+              maximum: 100000000,
+            },
+          },
+        ],
+      });
+
+      await currency.update({
+        recharge_config: { ...rechargeConfig, payment_link_id: paymentLink.id },
+      });
+
+      return getUrl(`/checkout/pay/${paymentLink.id}`);
+    }
+
+    return null;
+  } catch (error: any) {
+    logger.error('Failed to get recharge payment URL', {
+      currencyId: currency.id,
+      error: error.message,
+    });
+    return null;
+  }
+}

package/api/src/libs/notification/template/customer-credit-insufficient.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
 import { BN, fromUnitToToken } from '@ocap/util';
+import { withQuery } from 'ufo';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
 import { Customer, PaymentCurrency, Subscription } from '../../../store/models';
@@ -8,7 +9,8 @@ import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime } from '../../time';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
-import { formatNumber, getCustomerIndexUrl } from '../../util';
+import { formatNumber, getConnectQueryParam, getCustomerIndexUrl } from '../../util';
+import { getRechargePaymentUrl } from '../../currency';
 
 export interface CustomerCreditInsufficientEmailTemplateOptions {
   customerId: string;
@@ -32,6 +34,7 @@ interface CustomerCreditInsufficientEmailTemplateContext {
   isExhausted: boolean;
   productName?: string;
   viewSubscriptionLink?: string;
+  rechargeUrl: string | null;
   at: string;
 }
 
@@ -50,7 +53,7 @@ export class CustomerCreditInsufficientEmailTemplate
       throw new Error(`Customer not found: ${this.options.customerId}`);
     }
 
-    const paymentCurrency = await PaymentCurrency.findByPk(this.options.currencyId);
+    const paymentCurrency = await PaymentCurrency.scope('withRechargeConfig').findByPk(this.options.currencyId);
     if (!paymentCurrency) {
       throw new Error(`PaymentCurrency not found: ${this.options.currencyId}`);
     }
@@ -79,6 +82,11 @@ export class CustomerCreditInsufficientEmailTemplate
       }
     }
 
+    let rechargeUrl: string | null = await getRechargePaymentUrl(paymentCurrency);
+    if (rechargeUrl) {
+      rechargeUrl = withQuery(rechargeUrl, { ...getConnectQueryParam({ userDid }) });
+    }
+
     return {
       locale,
       userDid,
@@ -90,6 +98,7 @@ export class CustomerCreditInsufficientEmailTemplate
       isExhausted,
       productName,
       viewSubscriptionLink,
+      rechargeUrl,
       at,
     };
   }
@@ -105,6 +114,7 @@ export class CustomerCreditInsufficientEmailTemplate
       isExhausted,
       productName,
       viewSubscriptionLink,
+      rechargeUrl,
     } = context;
 
     // 构建基础字段
@@ -204,19 +214,26 @@ export class CustomerCreditInsufficientEmailTemplate
       : [];
 
     // 构建操作按钮
+    const customerIndexUrl = getCustomerIndexUrl({
+      locale,
+      userDid,
+    });
+
     const actions = [
+      rechargeUrl && {
+        name: translate('notification.common.reloadCredits', locale),
+        title: translate('notification.common.reloadCredits', locale),
+        link: rechargeUrl,
+      },
       viewSubscriptionLink && {
         name: translate('notification.common.viewSubscription', locale),
         title: translate('notification.common.viewSubscription', locale),
         link: viewSubscriptionLink,
       },
       {
-        name: translate('notification.common.viewCreditGrant', locale),
-        title: translate('notification.common.viewCreditGrant', locale),
-        link: getCustomerIndexUrl({
-          locale,
-          userDid,
-        }),
+        name: translate('notification.common.manageCredit', locale),
+        title: translate('notification.common.manageCredit', locale),
+        link: customerIndexUrl,
       },
     ].filter(Boolean);
 

package/api/src/libs/notification/template/customer-credit-low-balance.ts

@@ -1,11 +1,13 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
 import { fromUnitToToken } from '@ocap/util';
+import { withQuery } from 'ufo';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
 import { Customer, PaymentCurrency } from '../../../store/models';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
-import { formatNumber, getCustomerIndexUrl } from '../../util';
+import { formatNumber, getConnectQueryParam, getCustomerIndexUrl } from '../../util';
+import { getRechargePaymentUrl } from '../../currency';
 
 export interface CustomerCreditLowBalanceEmailTemplateOptions {
   customerId: string;
@@ -20,9 +22,10 @@ interface CustomerCreditLowBalanceEmailTemplateContext {
   userDid: string;
   currencySymbol: string;
   availableAmount: string; // formatted with symbol
-  totalAmount: string; // formatted with symbol
-  lowBalancePercentage: string; // with %
+  lowBalancePercentage: string; // with % or "less than 1%"
   currencyName: string;
+  isCritical: boolean; // true if percentage < 1%
+  rechargeUrl: string | null;
 }
 export class CustomerCreditLowBalanceEmailTemplate
   implements BaseEmailTemplate<CustomerCreditLowBalanceEmailTemplateContext>
@@ -34,14 +37,14 @@ export class CustomerCreditLowBalanceEmailTemplate
   }
 
   async getContext(): Promise<CustomerCreditLowBalanceEmailTemplateContext> {
-    const { customerId, currencyId, availableAmount, totalAmount, percentage } = this.options;
+    const { customerId, currencyId, availableAmount, percentage } = this.options;
 
     const customer = await Customer.findByPk(customerId);
     if (!customer) {
       throw new Error(`Customer not found: ${customerId}`);
     }
 
-    const paymentCurrency = await PaymentCurrency.findByPk(currencyId);
+    const paymentCurrency = await PaymentCurrency.scope('withRechargeConfig').findByPk(currencyId);
     if (!paymentCurrency) {
       throw new Error(`PaymentCurrency not found: ${currencyId}`);
     }
@@ -51,23 +54,41 @@ export class CustomerCreditLowBalanceEmailTemplate
     const currencySymbol = paymentCurrency.symbol;
 
     const available = formatNumber(fromUnitToToken(availableAmount, paymentCurrency.decimal));
-    const total = formatNumber(fromUnitToToken(totalAmount, paymentCurrency.decimal));
+    const percentageNum = parseFloat(percentage);
+    const isCritical = percentageNum < 1;
+    const lowBalancePercentage = isCritical
+      ? translate('notification.creditLowBalance.lessThanOnePercent', locale)
+      : `${percentage}%`;
+
+    let rechargeUrl: string | null = await getRechargePaymentUrl(paymentCurrency);
+    if (rechargeUrl) {
+      rechargeUrl = withQuery(rechargeUrl, { ...getConnectQueryParam({ userDid }) });
+    }
 
     return {
       locale,
       userDid,
       currencySymbol,
       availableAmount: `${available}`,
-      totalAmount: `${total}`,
-      lowBalancePercentage: `${percentage}%`,
+      lowBalancePercentage,
       currencyName: paymentCurrency.name,
+      isCritical,
+      rechargeUrl,
     };
   }
 
   async getTemplate(): Promise<BaseEmailTemplateType> {
     const context = await this.getContext();
-    const { locale, userDid, availableAmount, totalAmount, lowBalancePercentage, currencyName, currencySymbol } =
-      context;
+    const {
+      locale,
+      userDid,
+      availableAmount,
+      lowBalancePercentage,
+      currencyName,
+      currencySymbol,
+      isCritical,
+      rechargeUrl,
+    } = context;
 
     const fields = [
       {
@@ -90,15 +111,15 @@ export class CustomerCreditLowBalanceEmailTemplate
         data: {
           type: 'plain',
           color: '#9397A1',
-          text: translate('notification.creditInsufficient.availableCredit', locale),
+          text: translate('notification.creditLowBalance.remainingBalance', locale),
         },
       },
       {
         type: 'text',
         data: {
           type: 'plain',
-          color: '#FF6600',
-          text: `${availableAmount} ${currencySymbol} (${lowBalancePercentage})`,
+          color: isCritical ? '#FF0000' : '#FF6600',
+          text: `${availableAmount} ${currencySymbol}`,
         },
       },
       {
@@ -106,38 +127,42 @@ export class CustomerCreditLowBalanceEmailTemplate
         data: {
           type: 'plain',
           color: '#9397A1',
-          text: translate('notification.creditLowBalance.totalAmount', locale),
+          text: translate('notification.creditLowBalance.status', locale),
         },
       },
       {
         type: 'text',
         data: {
           type: 'plain',
-          text: `${totalAmount} ${currencySymbol}`,
+          color: isCritical ? '#FF0000' : '#FF6600',
+          text: lowBalancePercentage,
         },
       },
     ];
 
+    const customerIndexUrl = getCustomerIndexUrl({
+      locale,
+      userDid,
+    });
+
     const actions = [
+      rechargeUrl && {
+        name: translate('notification.common.reloadCredits', locale),
+        title: translate('notification.common.reloadCredits', locale),
+        link: rechargeUrl,
+      },
       {
-        name: translate('notification.common.viewCreditGrant', locale),
-        title: translate('notification.common.viewCreditGrant', locale),
-        link: getCustomerIndexUrl({
-          locale,
-          userDid,
-        }),
+        name: translate('notification.common.manageCredit', locale),
+        title: translate('notification.common.manageCredit', locale),
+        link: customerIndexUrl,
       },
-    ];
+    ].filter(Boolean);
 
     const template: BaseEmailTemplateType = {
-      title: translate('notification.creditLowBalance.title', locale, {
-        lowBalancePercentage,
-        currency: currencyName,
-      }),
+      title: translate('notification.creditLowBalance.title', locale),
       body: translate('notification.creditLowBalance.body', locale, {
         currency: currencyName,
         availableAmount,
-        totalAmount,
         lowBalancePercentage,
       }),
       attachments: [

package/api/src/locales/en.ts

@@ -49,6 +49,8 @@ export default flat({
       shouldPayAmount: 'Should pay amount',
       billedAmount: 'Billed amount',
       viewCreditGrant: 'View Credit Balance',
+      manageCredit: 'Manage Credits',
+      reloadCredits: 'Reload Credits',
       invoiceNumber: 'Invoice Number',
       payer: 'Payer',
     },
@@ -253,18 +255,17 @@ export default flat({
     creditInsufficient: {
       title: 'Insufficient Credit',
       bodyWithSubscription:
-        'Your available credit is only {availableAmount}, which is not enough to cover your subscription to {subscriptionName}. Please top up to avoid service interruption.',
+        'Your available credit ({availableAmount}) is not enough to cover your subscription to {subscriptionName}. To ensure uninterrupted service, please reload your account.',
       bodyWithoutSubscription:
-        'Your available credit is only {availableAmount}, which is not enough to continue using the service. Please top up to avoid restrictions.',
-      exhaustedTitle: 'Credit Exhausted – Please Top Up',
+        'Your available credit ({availableAmount}) is not enough to continue using the service. To ensure uninterrupted service, please reload your account.',
+      exhaustedTitle: 'Credit Exhausted – Please Reload',
       exhaustedBodyWithSubscription:
-        'Your credit is fully exhausted and can no longer cover your subscription to {subscriptionName}. Please top up to avoid service interruption.',
+        'Your credit is fully exhausted and can no longer cover your subscription to {subscriptionName}. To ensure uninterrupted service, please reload your account.',
       exhaustedBodyWithoutSubscription:
-        'Your credit is fully exhausted (remaining balance: 0). Please top up to ensure uninterrupted service.',
+        'Your credit is fully exhausted. To ensure uninterrupted service, please reload your account.',
       meterEventName: 'Service',
       availableCredit: 'Available Credit Amount',
       requiredCredit: 'Required Credit Amount',
-      topUpNow: 'Top Up Now',
     },
 
     creditGrantGranted: {
@@ -277,9 +278,11 @@ export default flat({
     },
 
     creditLowBalance: {
-      title: 'Your {currency} is below {lowBalancePercentage}',
-      body: 'Your {currency} available balance is below {lowBalancePercentage} of the total. Please top up to avoid service interruption.',
-      totalAmount: 'Total Credit Amount',
+      title: 'Your credit balance is low',
+      body: 'Your {currency} balance has dropped to critical levels ({lowBalancePercentage}). To ensure uninterrupted service, please reload your account.',
+      remainingBalance: 'Remaining Balance',
+      status: 'Status',
+      lessThanOnePercent: 'less than 1%',
     },
   },
 });

package/api/src/locales/zh.ts

@@ -49,6 +49,8 @@ export default flat({
       shouldPayAmount: '应收金额',
       billedAmount: '实缴金额',
       viewCreditGrant: '查看额度',
+      reloadCredits: '立即充值',
+      manageCredit: '管理额度',
       invoiceNumber: '账单编号',
       payer: '付款方',
     },
@@ -243,16 +245,15 @@ export default flat({
     creditInsufficient: {
       title: '额度不足，服务可能受限',
       bodyWithSubscription:
-        '您的信用额度仅剩 {availableAmount}，不足以支付您订阅的 {subscriptionName}。请及时充值以避免服务中断。',
-      bodyWithoutSubscription: '您的信用额度仅剩 {availableAmount}，不足以继续使用服务。请及时充值以避免服务受限。',
+        '您的信用额度仅剩 {availableAmount}，不足以支付您订阅的 {subscriptionName}。为避免服务中断，请及时充值。',
+      bodyWithoutSubscription: '您的信用额度仅剩 {availableAmount}，不足以继续使用服务。为避免服务受限，请及时充值。',
       exhaustedTitle: '额度已用尽，请尽快充值',
       exhaustedBodyWithSubscription:
-        '您的信用额度已用尽，无法继续支付您订阅的 {subscriptionName}。为确保服务不中断，请及时充值。',
-      exhaustedBodyWithoutSubscription: '您的信用额度已用尽（剩余额度为 0）。为确保服务正常使用，请及时充值。',
+        '您的信用额度已用尽，无法继续支付您订阅的 {subscriptionName}。为避免服务中断，请及时充值。',
+      exhaustedBodyWithoutSubscription: '您的信用额度已用尽。为确保服务正常使用，请及时充值。',
       meterEventName: '服务项目',
       availableCredit: '剩余额度',
       requiredCredit: '所需额度',
-      topUpNow: '立即充值',
     },
 
     creditGrantGranted: {
@@ -265,9 +266,11 @@ export default flat({
     },
 
     creditLowBalance: {
-      title: '您的{currency} 已低于 {lowBalancePercentage}',
-      body: '您的 {currency} 总可用额度已低于 {lowBalancePercentage}，请及时充值以避免服务受限。',
-      totalAmount: '总额度',
+      title: '您的信用余额偏低',
+      body: '您的 {currency} 余额已降至临界水平（{lowBalancePercentage}）。为避免服务中断，请及时充值。',
+      remainingBalance: '剩余余额',
+      status: '状态',
+      lessThanOnePercent: '低于 1%',
     },
   },
 });

package/api/src/routes/credit-grants.ts

@@ -1,17 +1,29 @@
 import { Router } from 'express';
 import Joi from 'joi';
-import { fromTokenToUnit } from '@ocap/util';
+import { BN, fromTokenToUnit } from '@ocap/util';
 
 import { literal, OrderItem } from 'sequelize';
 import pick from 'lodash/pick';
 import { createListParamSchema, getOrder, getWhereFromKvQuery, MetadataSchema } from '../libs/api';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
-import { CreditGrant, Customer, PaymentCurrency, Price, Subscription } from '../store/models';
+import {
+  AutoRechargeConfig,
+  CreditGrant,
+  Customer,
+  MeterEvent,
+  PaymentCurrency,
+  PaymentMethod,
+  Price,
+  Product,
+  Subscription,
+} from '../store/models';
 import { createCreditGrant } from '../libs/credit-grant';
 import { getMeterPriceIdsFromSubscription } from '../libs/subscription';
 import { blocklet } from '../libs/auth';
 import { formatMetadata } from '../libs/util';
+import { getPriceUintAmountByCurrency } from '../libs/price';
+import { checkTokenBalance } from '../libs/payment';
 
 const router = Router();
 const auth = authenticate<CreditGrant>({ component: true, roles: ['owner', 'admin'] });
@@ -150,6 +162,197 @@ router.get('/summary', authMine, async (req, res) => {
   }
 });
 
+const checkAutoRechargeSchema = Joi.object({
+  customer_id: Joi.string().required(),
+  currency_id: Joi.string().required(),
+  pending_amount: Joi.string().optional(),
+});
+
+router.get('/verify-availability', authMine, async (req, res) => {
+  try {
+    const { error, value } = checkAutoRechargeSchema.validate(req.query, { stripUnknown: true });
+    if (error) {
+      return res.status(400).json({ error: error.message });
+    }
+
+    const { customer_id: customerId, currency_id: currencyId } = value;
+    let pendingAmount = value.pending_amount;
+
+    const customer = await Customer.findByPkOrDid(customerId);
+    if (!customer) {
+      return res.status(404).json({ error: `Customer ${customerId} not found` });
+    }
+
+    const currency = await PaymentCurrency.findByPk(currencyId);
+    if (!currency) {
+      return res.status(404).json({ error: `PaymentCurrency ${currencyId} not found` });
+    }
+
+    const config = (await AutoRechargeConfig.findOne({
+      where: {
+        customer_id: customer.id,
+        currency_id: currencyId,
+        enabled: true,
+      },
+      include: [
+        { model: PaymentCurrency, as: 'rechargeCurrency', required: false },
+        { model: Price, as: 'price', include: [{ model: Product, as: 'product' }] },
+        { model: PaymentMethod, as: 'paymentMethod', required: false },
+      ],
+    })) as
+      | (AutoRechargeConfig & {
+          rechargeCurrency?: PaymentCurrency;
+          price?: Price & { product?: Product };
+          paymentMethod?: PaymentMethod;
+        })
+      | null;
+
+    if (!config) {
+      return res.json({
+        can_continue: false,
+        has_auto_recharge: false,
+        reason: 'auto_recharge_config_not_found',
+      });
+    }
+
+    // 1. Check config completeness
+    if (!config.rechargeCurrency) {
+      return res.json({
+        can_continue: false,
+        reason: 'recharge_currency_not_found',
+      });
+    }
+
+    if (!config.price) {
+      return res.json({
+        can_continue: false,
+        reason: 'price_not_found',
+      });
+    }
+
+    if (!config.paymentMethod) {
+      return res.json({
+        can_continue: false,
+        reason: 'payment_method_not_found',
+      });
+    }
+
+    // 2. Check if stripe (balance check not supported)
+    if (config.paymentMethod.type === 'stripe') {
+      return res.json({
+        can_continue: false,
+        reason: 'balance_check_not_supported',
+      });
+    }
+
+    // 3. Check price amount
+    const priceAmount = await getPriceUintAmountByCurrency(config.price, config.rechargeCurrency.id);
+    if (!priceAmount) {
+      return res.json({
+        can_continue: false,
+        reason: 'invalid_price_amount',
+      });
+    }
+
+    const totalAmount = new BN(priceAmount).mul(new BN(config.quantity ?? 1));
+
+    // 4. Get pending amount if not provided
+    if (!pendingAmount) {
+      const [pendingSummary] = await MeterEvent.getPendingAmounts({
+        customerId: customer.id,
+        currencyId,
+        livemode: req.livemode,
+      });
+      pendingAmount = pendingSummary?.[currencyId] || '0';
+    }
+
+    // 5. Check daily limit
+    const pendingAmountBN = new BN(pendingAmount);
+    const today = new Date().toISOString().split('T')[0];
+    const isNewDay = config.last_recharge_date !== today;
+
+    // Calculate required recharge times: if pendingAmount > 0, calculate needed times; otherwise check if at least one recharge is possible
+    const requiredRechargeTimes = pendingAmountBN.gt(new BN(0))
+      ? pendingAmountBN.add(totalAmount).sub(new BN(1)).div(totalAmount).toNumber()
+      : 1;
+
+    if (!isNewDay && config.daily_stats && config.daily_limits) {
+      // Check attempt limit
+      const maxAttempts = Number(config.daily_limits.max_attempts);
+      if (maxAttempts > 0) {
+        const remainingAttempts = maxAttempts - Number(config.daily_stats.attempt_count);
+        if (requiredRechargeTimes > remainingAttempts) {
+          return res.json({
+            can_continue: false,
+            reason: 'daily_limit_reached',
+            detail: 'attempt_limit_exceeded',
+          });
+        }
+      }
+
+      // Check amount limit
+      const maxAmount = new BN(config.daily_limits.max_amount || '0');
+      if (maxAmount.gt(new BN(0))) {
+        const requiredTotalAmount = totalAmount.mul(new BN(requiredRechargeTimes));
+        const remainingAmount = maxAmount.sub(new BN(config.daily_stats.total_amount || '0'));
+        if (requiredTotalAmount.gt(remainingAmount)) {
+          return res.json({
+            can_continue: false,
+            reason: 'daily_limit_reached',
+            detail: 'amount_limit_exceeded',
+          });
+        }
+      }
+    }
+
+    // 6. Check payment account balance
+    const payer =
+      config.payment_settings?.payment_method_options?.[
+        config.paymentMethod.type as keyof typeof config.payment_settings.payment_method_options
+      ]?.payer || customer.did;
+
+    if (!payer) {
+      return res.json({
+        can_continue: false,
+        reason: 'payer_not_found',
+      });
+    }
+
+    // Check token balance: if pendingAmount > 0, check if balance can cover pending; otherwise check if balance can cover at least one recharge
+    const amountToCheck = pendingAmountBN.gt(new BN(0)) ? pendingAmount : totalAmount.toString();
+    const balanceResult = await checkTokenBalance({
+      paymentMethod: config.paymentMethod,
+      paymentCurrency: config.rechargeCurrency,
+      userDid: payer,
+      amount: amountToCheck,
+      skipUserCheck: true,
+    });
+
+    if (!balanceResult.sufficient) {
+      return res.json({
+        can_continue: false,
+        reason: 'insufficient_balance',
+        payment_account_balance: balanceResult.token?.balance || '0',
+        pending_amount: pendingAmount,
+      });
+    }
+
+    return res.json({
+      can_continue: true,
+      payment_account_sufficient: true,
+      payment_account_balance: balanceResult.token?.balance || '0',
+      pending_amount: pendingAmount,
+    });
+  } catch (err: any) {
+    logger.error('check auto recharge failed', {
+      error: err.message,
+      customerId: req.query.customer_id,
+      currencyId: req.query.currency_id,
+    });
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 router.get('/:id', authPortal, async (req, res) => {
   const creditGrant = await CreditGrant.findByPk(req.params.id, {
     include: [

package/api/src/routes/payment-currencies.ts

@@ -4,7 +4,6 @@ import { InferAttributes, Op, WhereOptions } from 'sequelize';
 
 import Joi from 'joi';
 import pick from 'lodash/pick';
-import { getUrl } from '@blocklet/sdk';
 import { sessionMiddleware } from '@blocklet/sdk/lib/middlewares/session';
 import { fetchErc20Meta } from '../integrations/ethereum/token';
 import logger from '../libs/logger';
@@ -18,8 +17,8 @@ import { resolveAddressChainTypes } from '../libs/util';
 import { depositVaultQueue } from '../queues/payment';
 import { checkDepositVaultAmount } from '../libs/payment';
 import { getTokenSummaryByDid } from '../integrations/arcblock/stake';
-import { createPaymentLink } from './payment-links';
 import { MetadataSchema } from '../libs/api';
+import { getRechargePaymentUrl } from '../libs/currency';
 
 const router = Router();
 
@@ -394,6 +393,8 @@ router.get('/:id/recharge-config', user, async (req, res) => {
       });
     }
 
+    const paymentUrl = await getRechargePaymentUrl(currency);
+
     let basePrice: (Price & { product: Product }) | null = null;
     if (currency.recharge_config.base_price_id) {
       basePrice = (await Price.findByPk(currency.recharge_config.base_price_id, {
@@ -401,34 +402,6 @@ router.get('/:id/recharge-config', user, async (req, res) => {
       })) as Price & { product: Product };
     }
 
-    const rechargeConfig = currency.recharge_config;
-    let paymentUrl = rechargeConfig.checkout_url;
-    if (!paymentUrl && rechargeConfig.payment_link_id) {
-      paymentUrl = getUrl(`/checkout/pay/${rechargeConfig.payment_link_id}`);
-    }
-    if (!paymentUrl && rechargeConfig.base_price_id) {
-      const paymentLink = await createPaymentLink({
-        livemode: currency.livemode,
-        currency_id: basePrice?.currency_id,
-        name: basePrice?.product?.name || `${currency.name} Recharge`,
-        submit_type: 'pay',
-        allow_promotion_codes: true,
-        line_items: [
-          {
-            price_id: rechargeConfig.base_price_id,
-            quantity: 1,
-            adjustable_quantity: {
-              enabled: true,
-              minimum: 1,
-              maximum: 100000000,
-            },
-          },
-        ],
-      });
-      await currency.update({ recharge_config: { ...rechargeConfig, payment_link_id: paymentLink.id } });
-      paymentUrl = getUrl(`/checkout/pay/${paymentLink.id}`);
-    }
-
     return res.json({
       currency_id: id,
       currency_info: pick(currency, ['id', 'name', 'symbol', 'decimal', 'type']),

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.22.23
+version: 1.22.25
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.23",
+  "version": "1.22.25",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -44,35 +44,35 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.17.3-beta-20251119-102907-28b69b76",
-    "@arcblock/did": "^1.27.11",
-    "@arcblock/did-connect-react": "^3.2.7",
+    "@abtnode/cron": "^1.17.3",
+    "@arcblock/did": "^1.27.12",
+    "@arcblock/did-connect-react": "^3.2.11",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/did-util": "^1.27.11",
-    "@arcblock/jwt": "^1.27.11",
-    "@arcblock/react-hooks": "^3.2.7",
-    "@arcblock/ux": "^3.2.7",
-    "@arcblock/validator": "^1.27.11",
-    "@blocklet/did-space-js": "^1.2.4",
+    "@arcblock/did-util": "^1.27.12",
+    "@arcblock/jwt": "^1.27.12",
+    "@arcblock/react-hooks": "^3.2.11",
+    "@arcblock/ux": "^3.2.11",
+    "@arcblock/validator": "^1.27.12",
+    "@blocklet/did-space-js": "^1.2.6",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/js-sdk": "^1.17.3-beta-20251119-102907-28b69b76",
-    "@blocklet/logger": "^1.17.3-beta-20251119-102907-28b69b76",
-    "@blocklet/payment-broker-client": "1.22.23",
-    "@blocklet/payment-react": "1.22.23",
-    "@blocklet/payment-vendor": "1.22.23",
-    "@blocklet/sdk": "^1.17.3-beta-20251119-102907-28b69b76",
-    "@blocklet/ui-react": "^3.2.7",
-    "@blocklet/uploader": "^0.3.11",
-    "@blocklet/xss": "^0.3.9",
+    "@blocklet/js-sdk": "^1.17.3",
+    "@blocklet/logger": "^1.17.3",
+    "@blocklet/payment-broker-client": "1.22.25",
+    "@blocklet/payment-react": "1.22.25",
+    "@blocklet/payment-vendor": "1.22.25",
+    "@blocklet/sdk": "^1.17.3",
+    "@blocklet/ui-react": "^3.2.11",
+    "@blocklet/uploader": "^0.3.13",
+    "@blocklet/xss": "^0.3.11",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
-    "@ocap/asset": "^1.27.11",
-    "@ocap/client": "^1.27.11",
-    "@ocap/mcrypto": "^1.27.11",
-    "@ocap/util": "^1.27.11",
-    "@ocap/wallet": "^1.27.11",
+    "@ocap/asset": "^1.27.12",
+    "@ocap/client": "^1.27.12",
+    "@ocap/mcrypto": "^1.27.12",
+    "@ocap/util": "^1.27.12",
+    "@ocap/wallet": "^1.27.12",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -127,9 +127,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.17.3-beta-20251119-102907-28b69b76",
+    "@abtnode/types": "^1.17.3",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.23",
+    "@blocklet/payment-types": "1.22.25",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -176,5 +176,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "e00ac48d6a560d32ff437314cf62f0b865c7a837"
+  "gitHead": "59a2dd22163f544db386b492276c8a1da6e3ebe2"
 }