payment-kit 1.20.9 → 1.20.10

package/api/src/integrations/stripe/handlers/index.ts

@@ -6,7 +6,7 @@ import { handlePaymentIntentEvent } from './payment-intent';
 import { handleSetupIntentEvent } from './setup-intent';
 import { handleSubscriptionEvent } from './subscription';
 
-export default function handleStripeEvent(event: any, client: Stripe) {
+export default async function handleStripeEvent(event: any, client: Stripe) {
   switch (event.type) {
     case 'payment_intent.canceled':
     case 'payment_intent.created':
@@ -14,8 +14,16 @@ export default function handleStripeEvent(event: any, client: Stripe) {
     case 'payment_intent.payment_failed':
     case 'payment_intent.processing':
     case 'payment_intent.requires_action':
-    case 'payment_intent.succeeded':
+    case 'payment_intent.succeeded': {
+      if (event.data?.object?.id) {
+        const record = await client.paymentIntents.retrieve(event.data.object.id);
+        event.data.object = {
+          ...event.data.object,
+          ...record,
+        };
+      }
       return handlePaymentIntentEvent(event, client);
+    }
 
     // case 'setup_intent.created':
     case 'setup_intent.canceled':

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

@@ -1,5 +1,6 @@
 import { VendorAuth } from '@blocklet/payment-vendor';
 
+import { joinURL } from 'ufo';
 import { ProductVendor } from '../../../store/models';
 import logger from '../../logger';
 import { api } from '../../util';
@@ -53,11 +54,14 @@ export class LauncherAdapter implements VendorAdapter {
       };
 
       const { headers, body } = VendorAuth.signRequestWithHeaders(orderData);
-      const response = await fetch(`${launcherApiUrl}/api/vendor/deliveries`, {
-        method: 'POST',
-        headers,
-        body,
-      });
+      const response = await fetch(
+        joinURL(launcherApiUrl, vendorConfig.metadata?.mountPoint || '', '/api/vendor/deliveries'),
+        {
+          method: 'POST',
+          headers,
+          body,
+        }
+      );
 
       if (!response.ok) {
         const errorBody = await response.text();
@@ -125,11 +129,14 @@ export class LauncherAdapter implements VendorAdapter {
     const launcherApiUrl = vendorConfig.app_url;
     const { headers, body } = VendorAuth.signRequestWithHeaders(params);
 
-    const response = await fetch(`${launcherApiUrl}/api/vendor/return`, {
-      method: 'POST',
-      headers,
-      body,
-    });
+    const response = await fetch(
+      joinURL(launcherApiUrl, vendorConfig.metadata?.mountPoint || '', '/api/vendor/return'),
+      {
+        method: 'POST',
+        headers,
+        body,
+      }
+    );
 
     if (!response.ok) {
       const errorBody = await response.text();

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

@@ -1,13 +1,12 @@
 import { BN } from '@ocap/util';
+import { Customer, PaymentMethod } from '../../store/models';
 import { CheckoutSession } from '../../store/models/checkout-session';
-import { Product } from '../../store/models/product';
-import { ProductVendor } from '../../store/models/product-vendor';
-import { Payout } from '../../store/models/payout';
 import { PaymentIntent } from '../../store/models/payment-intent';
-import { Price } from '../../store/models/price';
-import { calculateVendorCommission, VendorAdapterFactory } from './adapters/factory';
-import { Customer } from '../../store/models';
+import { Payout } from '../../store/models/payout';
+import { ProductVendor } from '../../store/models/product-vendor';
+import env from '../env';
 import logger from '../logger';
+import { calculateVendorCommission, VendorAdapterFactory } from './adapters/factory';
 
 const DEFAULT_COMMISSION_RATE = 20;
 
@@ -80,11 +79,11 @@ export class VendorFulfillmentService {
         amount: orderInfo.amount_total,
         currency: orderInfo.currency_id,
 
-        description: 'This is build a instance for Third Party',
+        description: `This is an app launched by ${env.appName || 'Third Party'}`,
         userInfo: {
           userDid: orderInfo.customer_did!,
           email: userEmail,
-          description: 'This is build a instance for Third Party',
+          description: `This is an app launched by ${env.appName || 'Third Party'}`,
         },
         deliveryParams: {
           blockletMetaUrl: vendor.metadata?.blockletMetaUrl,
@@ -125,117 +124,6 @@ export class VendorFulfillmentService {
     }
   }
 
-  // Calculate commission data (no fulfillment, only calculate commission)
-  private static async calculateCommissionData(checkoutSessionId: string): Promise<VendorFulfillmentResult[]> {
-    try {
-      logger.info('Calculating commission data for checkout session', { checkoutSessionId });
-
-      const checkoutSession = await CheckoutSession.findByPk(checkoutSessionId);
-      if (!checkoutSession) {
-        throw new Error(`CheckoutSession not found: ${checkoutSessionId}`);
-      }
-
-      const priceIds = checkoutSession.line_items.map((item: any) => item.price_id).filter(Boolean);
-
-      if (priceIds.length === 0) {
-        throw new Error(`No price IDs found in checkout session line items: ${checkoutSessionId}`);
-      }
-
-      // Find corresponding product_ids through price_ids
-      const prices = await Price.findAll({
-        where: { id: priceIds },
-        attributes: ['id', 'product_id'],
-      });
-
-      // Create a map of price_id to line_item for amount calculation
-      const priceToLineItemMap = new Map();
-      checkoutSession.line_items.forEach((item: any) => {
-        if (item.price_id) {
-          priceToLineItemMap.set(item.price_id, item);
-        }
-      });
-
-      const productIds = prices.map((price: any) => price.product_id).filter(Boolean);
-
-      if (productIds.length === 0) {
-        throw new Error(`No product IDs found from prices: ${checkoutSessionId}`);
-      }
-
-      // Get all products with vendor configurations
-      const products = await Product.findAll({
-        where: { id: productIds },
-        attributes: ['id', 'vendor_config'],
-      });
-
-      const commissionResults: VendorFulfillmentResult[] = [];
-
-      // Process each product separately
-      for (const product of products) {
-        if (!product.vendor_config || product.vendor_config.length === 0) {
-          logger.debug('No vendor configuration found for product', {
-            productId: product.id,
-            checkoutSessionId,
-          });
-          // eslint-disable-next-line no-continue
-          continue;
-        }
-
-        // Find all prices for this product
-        const productPrices = prices.filter((price: any) => price.product_id === product.id);
-
-        // Calculate total amount for this product across all line items
-        let productTotalAmount = '0';
-        for (const price of productPrices) {
-          const lineItem = priceToLineItemMap.get(price.id);
-          if (lineItem && lineItem.amount_total) {
-            productTotalAmount = new BN(productTotalAmount).add(new BN(lineItem.amount_total || '0')).toString();
-          }
-        }
-
-        // Calculate commission for each vendor of this product
-        for (const vendorConfig of product.vendor_config) {
-          const commissionAmount = calculateVendorCommission(
-            productTotalAmount, // Use product-specific amount instead of total order amount
-            vendorConfig.commission_rate || 0,
-            vendorConfig.commission_type || 'percentage',
-            vendorConfig.amount
-          );
-
-          commissionResults.push({
-            vendorId: vendorConfig.vendor_key,
-            vendorKey: vendorConfig.vendor_key,
-            orderId: `commission_${checkoutSessionId}_${product.id}_${vendorConfig.vendor_id}`,
-            status: 'completed',
-            commissionAmount,
-            commissionType: vendorConfig.commission_type || 'percentage',
-            commissionRate: vendorConfig.commission_rate || 0,
-            productId: product.id, // Add product ID for tracking
-          });
-        }
-      }
-
-      if (commissionResults.length === 0) {
-        logger.warn('No vendor configurations found for any products', {
-          productIds,
-          checkoutSessionId,
-        });
-      }
-
-      logger.info('Commission data calculated', {
-        checkoutSessionId,
-        commissionCount: commissionResults.length,
-      });
-
-      return commissionResults;
-    } catch (error: any) {
-      logger.error('Failed to calculate commission data', {
-        checkoutSessionId,
-        error: error.message,
-      });
-      throw error;
-    }
-  }
-
   static async createVendorPayouts(
     checkoutSessionId: string,
     fulfillmentResults?: VendorFulfillmentResult[]
@@ -257,13 +145,19 @@ export class VendorFulfillmentService {
       // If fulfillmentResults not provided, calculate commission info
       let commissionData = fulfillmentResults;
       if (!commissionData) {
-        commissionData = await this.calculateCommissionData(checkoutSessionId);
+        commissionData = checkoutSession.vendor_info?.map((vendorInfo: any) => ({
+          vendorId: vendorInfo.vendor_id,
+          orderId: vendorInfo.order_id,
+          status: vendorInfo.status,
+          commissionAmount: vendorInfo.commissionAmount,
+        })) as VendorFulfillmentResult[];
       }
 
       const payoutPromises = commissionData
         .filter((result) => result.status !== 'failed' && new BN(result.commissionAmount).gt(new BN('0')))
         .map(async (result) => {
           const vendor = await ProductVendor.findByPk(result.vendorId);
+          const paymentMethod = await PaymentMethod.findByPk(paymentMethodId);
 
           const appPid = vendor?.app_pid;
           const destination = appPid || vendor?.metadata?.wallet_address || vendor?.metadata?.destination || '';
@@ -278,7 +172,7 @@ export class VendorFulfillmentService {
             customer_id: checkoutSession.customer_id || '',
             payment_intent_id: checkoutSession.payment_intent_id || '',
             payment_method_id: paymentMethodId,
-            status: 'pending',
+            status: paymentMethod?.type === 'stripe' ? 'deferred' : 'pending',
             attempt_count: 0,
             attempted: false,
             vendor_info: {

package/api/src/queues/payment.ts

@@ -373,11 +373,7 @@ export const handlePaymentSucceed = async (
       );
   }
 
-  // Trigger vendor commission queue
-  events.emit('vendor.commission.queued', `vendor-commission-${paymentIntent.id}`, {
-    paymentIntentId: paymentIntent.id,
-    retryOnError: true,
-  });
+  // Trigger vendor commission queue by invoice.paid
 
   let invoice;
   if (paymentIntent.invoice_id) {

package/api/src/queues/vendors/commission.ts

@@ -167,25 +167,27 @@ export const startVendorCommissionQueue = async () => {
   });
 };
 
-events.on('vendor.commission.queued', async (id, job, args = {}) => {
+events.on('invoice.paid', async (invoice) => {
   try {
-    const { ...extraArgs } = args;
-    const exist = await vendorCommissionQueue.get(id);
+    const paymentIntent = await PaymentIntent.findOne({ where: { invoice_id: invoice.id } });
 
-    if (!exist) {
-      logger.info('Vendor commission job added successfully', { id });
-      vendorCommissionQueue.push({
-        id,
-        job,
-        ...extraArgs,
-      });
-    } else {
+    if (!paymentIntent) {
+      logger.warn('PaymentIntent not found', { id: invoice.id });
+      return;
+    }
+
+    const id = `vendor-commission-${paymentIntent.id}`;
+    const exist = await vendorCommissionQueue.get(id);
+    if (exist) {
       logger.info('Vendor commission job already exists, skipping', { id });
+      return;
     }
-  } catch (error: any) {
-    logger.error('Failed to handle vendor commission queue event', {
+
+    vendorCommissionQueue.push({
       id,
-      error,
+      job: { paymentIntentId: paymentIntent.id, retryOnError: true },
     });
+  } catch (error) {
+    logger.error('Failed to trigger vendor commission queue', { invoiceId: invoice.id, error });
   }
 });

package/api/src/queues/vendors/fulfillment-coordinator.ts

@@ -273,14 +273,14 @@ async function updateSingleVendorInfo(
           vendor_id: current[index]?.vendor_id || vendorId,
           order_id: update.order_id || current[index]?.order_id || '',
           status: update.status || current[index]?.status || 'pending',
-          amount: update.amount || current[index]?.amount || '0',
+          amount: update.commissionAmount || current[index]?.amount || '0',
         } as VendorInfo;
       } else {
         current.push({
           vendor_id: vendorId,
           order_id: update.order_id || '',
           status: update.status || 'pending',
-          amount: update.amount || '0',
+          amount: update.commissionAmount || '0',
           ...update,
         } as VendorInfo);
       }

package/api/src/queues/vendors/status-check.ts

@@ -1,6 +1,6 @@
 import { joinURL } from 'ufo';
+import { VendorAuth } from '@blocklet/payment-vendor';
 import createQueue from '../../libs/queue';
-import { getBlockletJson } from '../../libs/util';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { ProductVendor } from '../../store/models';
 import { fulfillmentCoordinatorQueue } from './fulfillment-coordinator';
@@ -99,12 +99,17 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
       logger.info('found vendor url', { url, productVendor });
 
       if (url) {
-        const vendorMeta = await getBlockletJson(url);
-        const mountPoint = vendorMeta.componentMountPoints?.find((x: any) => x.appId === vendorId)?.mountPoint;
-        const serverStatusUrl = joinURL(url, mountPoint, '/api/vendor/status', vendor.order_id);
-
-        const result = await fetch(serverStatusUrl);
+        const serverStatusUrl = joinURL(
+          url,
+          productVendor?.metadata?.mountPoint,
+          '/api/vendor/status',
+          vendor.order_id
+        );
+        const { headers } = VendorAuth.signRequestWithHeaders({});
+
+        const result = await fetch(serverStatusUrl, { headers });
         const data = await result.json();
+
         vendor.app_url = data?.appUrl || '';
       }
     }

package/api/src/routes/vendor.ts

@@ -22,6 +22,9 @@ const createVendorSchema = Joi.object({
   app_url: Joi.string().uri().max(512).required(),
   app_pid: Joi.string().max(255).allow('').optional(),
   app_logo: Joi.string().max(512).allow('').optional(),
+  vendor_did: Joi.string()
+    .pattern(/^(did:abt:)?[1-9A-HJ-NP-Za-km-z]{37}$/)
+    .required(),
   status: Joi.string().valid('active', 'inactive').default('active'),
   metadata: MetadataSchema,
 }).unknown(false);
@@ -33,6 +36,9 @@ const updateVendorSchema = Joi.object({
   app_url: Joi.string().uri().max(512).optional(),
   app_pid: Joi.string().max(255).allow('').optional(),
   app_logo: Joi.string().max(512).allow('').optional(),
+  vendor_did: Joi.string()
+    .pattern(/^(did:abt:)?[1-9A-HJ-NP-Za-km-z]{37}$/)
+    .required(),
   status: Joi.string().valid('active', 'inactive').optional(),
   metadata: MetadataSchema,
 }).unknown(true);
@@ -139,6 +145,7 @@ async function createVendor(req: any, res: any) {
       name,
       description,
       app_url: appUrl,
+      vendor_did: vendorDid,
       metadata,
       app_pid: appPid,
       app_logo: appLogo,
@@ -158,6 +165,7 @@ async function createVendor(req: any, res: any) {
       name,
       description,
       app_url: appUrl,
+      vendor_did: vendorDid?.replace('did:abt:', '').trim(),
       status: status || 'active',
       app_pid: appPid,
       app_logo: appLogo,
@@ -195,6 +203,7 @@ async function updateVendor(req: any, res: any) {
       name,
       description,
       app_url: appUrl,
+      vendor_did: vendorDid,
       status,
       metadata,
       app_pid: appPid,
@@ -214,6 +223,7 @@ async function updateVendor(req: any, res: any) {
       name,
       description,
       app_url: appUrl,
+      vendor_did: vendorDid,
       status,
       metadata,
       app_pid: appPid,
@@ -276,7 +286,15 @@ async function getVendorStatusByVendorId(vendorId: string, orderId: string, isDe
   }
 
   const vendor = await ProductVendor.findByPk(vendorId);
-  const url = vendor?.app_url ? joinURL(vendor.app_url, '/api/vendor/', isDetail ? 'orders' : 'status', orderId) : null;
+  const url = vendor?.app_url
+    ? joinURL(
+        vendor.app_url,
+        vendor.metadata?.mountPoint || '',
+        '/api/vendor/',
+        isDetail ? 'orders' : 'status',
+        orderId
+      )
+    : null;
 
   const { headers } = VendorAuth.signRequestWithHeaders({});
   const name = vendor?.name;
@@ -427,6 +445,7 @@ async function redirectToVendor(req: any, res: any) {
 
 const router = Router();
 
+// FIXME: Authentication not yet added, awaiting implementation @Pengfei
 router.get('/order/:sessionId/status', validateParams(sessionIdParamSchema), getVendorFulfillmentStatus);
 router.get('/order/:sessionId/detail', validateParams(sessionIdParamSchema), getVendorFulfillmentDetail);
 

package/api/src/store/migrations/20250916-add-vendor-did.ts

@@ -0,0 +1,20 @@
+import { safeApplyColumnChanges, type Migration } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  // Add vendor_did column to product_vendors table
+  await safeApplyColumnChanges(context, {
+    product_vendors: [
+      {
+        name: 'vendor_did',
+        field: {
+          type: 'STRING',
+          allowNull: true,
+        },
+      },
+    ],
+  });
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('product_vendors', 'vendor_did');
+};

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

@@ -38,7 +38,7 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
     commission_amount: string;
   };
 
-  declare status: LiteralUnion<'pending' | 'paid' | 'failed' | 'canceled' | 'in_transit', string>;
+  declare status: LiteralUnion<'pending' | 'paid' | 'failed' | 'canceled' | 'in_transit' | 'deferred', string>;
 
   // retry logic
   declare failure_message?: string;
@@ -118,7 +118,7 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
       allowNull: true,
     },
     status: {
-      type: DataTypes.ENUM('paid', 'pending', 'failed', 'canceled', 'in_transit'),
+      type: DataTypes.ENUM('paid', 'pending', 'failed', 'canceled', 'in_transit', 'deferred'),
       allowNull: false,
     },
     failure_message: {

package/api/src/store/models/product-vendor.ts

@@ -15,6 +15,7 @@ export class ProductVendor extends Model<InferAttributes<ProductVendor>, InferCr
   declare app_url: string;
   declare app_pid?: string;
   declare app_logo?: string;
+  declare vendor_did?: string;
 
   declare status: 'active' | 'inactive';
   declare metadata: Record<string, any>;
@@ -60,6 +61,10 @@ export class ProductVendor extends Model<InferAttributes<ProductVendor>, InferCr
       type: DataTypes.STRING(512),
       allowNull: true,
     },
+    vendor_did: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+    },
     status: {
       type: DataTypes.ENUM('active', 'inactive'),
       allowNull: false,

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

@@ -60,6 +60,7 @@ export class Product extends Model<InferAttributes<Product>, InferCreationAttrib
     commission_rate?: number;
     commission_type?: 'percentage' | 'fixed_amount';
     amount?: string;
+    commissionAmount?: string;
     custom_params?: Record<string, any>;
   }>;
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.9",
+  "version": "1.20.10",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,8 +56,8 @@
     "@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-react": "1.20.9",
-    "@blocklet/payment-vendor": "1.20.9",
+    "@blocklet/payment-react": "1.20.10",
+    "@blocklet/payment-vendor": "1.20.10",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.40",
     "@blocklet/uploader": "^0.2.10",
@@ -126,7 +126,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.9",
+    "@blocklet/payment-types": "1.20.10",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -173,5 +173,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "e89c0a9b6a3f3b7f7cb3cc0845b1775c1f587f6e"
+  "gitHead": "1659d63120ced92167ec8681e51db96801b910ec"
 }

package/src/locales/en.tsx

@@ -905,6 +905,9 @@ export default flat({
       appUrlRequired: 'App URL is required',
       appUrlInvalid: 'Please enter a valid URL starting with http:// or https://',
       appUrlHelp: 'The base URL of the vendor application',
+      vendorDid: 'Vendor DID',
+      vendorDidInvalid: 'Please enter a valid DID',
+      vendorDidHelp: 'Optional DID address for the vendor',
       webhookPath: 'Webhook Path',
       webhookPathInvalid: 'Please enter a valid path starting with /',
       webhookPathHelp: 'Optional webhook callback path (e.g., /webhooks/status)',

package/src/locales/zh.tsx

@@ -881,8 +881,11 @@ export default flat({
       displayNameHelp: '此数据会展示到付款成功后的安装界面',
       appUrl: '应用地址',
       appUrlRequired: '应用地址是必填项',
-      appUrlInvalid: '请输入以http://或https://开头的有效URL',
-      appUrlHelp: '供应商应用的基础URL',
+      appUrlInvalid: '请输入有效的 URL，以 http:// 或 https:// 开头',
+      appUrlHelp: '供应商应用的基础 URL 地址',
+      vendorDid: '供应商 DID',
+      vendorDidInvalid: '请输入有效的 DID',
+      vendorDidHelp: '供应商的可选 DID 地址',
       webhookPath: 'Webhook路径',
       webhookPathInvalid: '请输入以/开头的有效路径',
       webhookPathHelp: '可选的webhook回调路径（如：/webhooks/status）',

package/src/pages/admin/products/vendors/create.tsx

@@ -30,6 +30,7 @@ interface Vendor {
   name: string;
   description: string;
   app_url: string;
+  vendor_did?: string;
   status: 'active' | 'inactive';
   metadata: Record<string, any>;
   created_at: string;
@@ -49,6 +50,7 @@ interface VendorFormData {
   name: string;
   description: string;
   app_url: string;
+  vendor_did?: string;
   status: 'active' | 'inactive';
   metadata: Array<{ key: string; value: string }>;
   app_pid?: string;
@@ -82,6 +84,7 @@ export default function VendorCreate({
         name: '',
         description: '',
         app_url: '',
+        vendor_did: '',
         status: 'inactive' as const,
         metadata: [{ key: 'blockletMetaUrl', value: '' }],
         app_pid: '',
@@ -114,6 +117,16 @@ export default function VendorCreate({
     }
   };
 
+  const validateDid = (did: string | undefined) => {
+    if (!did) return true; // DID 是可选的
+    // DID 格式验证
+    const didPattern = /^(did:abt:)?[1-9A-HJ-NP-Za-km-z]{37}$/;
+    if (!didPattern.test(did.trim())) {
+      return t('admin.vendor.vendorDidInvalid');
+    }
+    return true;
+  };
+
   const onSubmit = async (data: VendorFormData) => {
     try {
       setLoading(true);
@@ -144,6 +157,7 @@ export default function VendorCreate({
 
       const submitData = {
         ...restData,
+        vendor_did: restData.vendor_did?.replace('did:abt:', '').trim(),
         metadata: metadataObj,
       };
 
@@ -167,6 +181,10 @@ export default function VendorCreate({
           // 从响应中获取appPid和appLogo
           const blockletInfo = await response.json();
           if (blockletInfo) {
+            const component = blockletInfo.componentMountPoints?.find((x: any) => x.did === submitData.vendor_did);
+            if (component && !['', '/'].includes(component.mountPoint) && submitData.metadata) {
+              submitData.metadata.mountPoint = component.mountPoint;
+            }
             submitData.app_pid = blockletInfo.pid || blockletInfo.appPid;
             submitData.app_logo = blockletInfo.logo || blockletInfo.appLogo;
           }
@@ -307,6 +325,24 @@ export default function VendorCreate({
             )}
           />
 
+          <Controller
+            name="vendor_did"
+            control={control}
+            rules={{
+              required: t('admin.vendor.vendorDidRequired'),
+              validate: validateDid,
+            }}
+            render={({ field }) => (
+              <TextField
+                {...field}
+                label={t('admin.vendor.vendorDid')}
+                fullWidth
+                error={!!errors.vendor_did}
+                helperText={errors.vendor_did?.message || t('admin.vendor.vendorDidHelp')}
+              />
+            )}
+          />
+
           <MetadataForm title={t('common.metadata.label')} />
 
           <Controller