|
|
@@ -195,7 +195,7 @@ export class PaymentTestFactory {
|
|
|
/**
|
|
|
* 创建完整的测试环境数据
|
|
|
*/
|
|
|
- async createCompleteTestData(tenantId: number = 1): Promise<{
|
|
|
+ async createCompleteTestData(tenantId: number = 1, userOptions: Partial<UserEntityMt> = {}): Promise<{
|
|
|
user: UserEntityMt;
|
|
|
merchant: MerchantMt;
|
|
|
supplier: SupplierMt;
|
|
|
@@ -203,7 +203,7 @@ export class PaymentTestFactory {
|
|
|
order: OrderMt;
|
|
|
payment: PaymentMtEntity;
|
|
|
}> {
|
|
|
- const user = await this.createTestUser(tenantId);
|
|
|
+ const user = await this.createTestUser(tenantId, userOptions);
|
|
|
const merchant = await this.createTestMerchant(tenantId, user.id);
|
|
|
const supplier = await this.createTestSupplier(tenantId, user.id);
|
|
|
const address = await this.createTestDeliveryAddress(tenantId, user.id);
|
|
|
@@ -241,8 +241,15 @@ export class PaymentTestFactory {
|
|
|
payment: PaymentMtEntity;
|
|
|
};
|
|
|
}> {
|
|
|
- const tenant1 = await this.createCompleteTestData(1);
|
|
|
- const tenant2 = await this.createCompleteTestData(2);
|
|
|
+ const timestamp = Date.now();
|
|
|
+ const tenant1 = await this.createCompleteTestData(1, {
|
|
|
+ username: `tenant1_user_${timestamp}`,
|
|
|
+ openid: `tenant1_openid_${timestamp}`
|
|
|
+ });
|
|
|
+ const tenant2 = await this.createCompleteTestData(2, {
|
|
|
+ username: `tenant2_user_${timestamp}`,
|
|
|
+ openid: `tenant2_openid_${timestamp}`
|
|
|
+ });
|
|
|
|
|
|
return {
|
|
|
tenant1,
|