diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.Generated.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.Generated.cs index 5295d312..fd8725af 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.Generated.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.Generated.cs @@ -9,16 +9,17 @@ using Volo.Abp.Http.Client.ClientProxying; using EShopOnAbp.PaymentService.PaymentRequests; // ReSharper disable once CheckNamespace -namespace EShopOnAbp.PaymentService.Controllers.ClientProxies +namespace EShopOnAbp.PaymentService.Controllers.ClientProxies; + +[Dependency(ReplaceServices = true)] +[ExposeServices(typeof(IPaymentRequestAppService), typeof(PaymentRequestClientProxy))] +public partial class PaymentRequestClientProxy : ClientProxyBase, IPaymentRequestAppService { - [Dependency(ReplaceServices = true)] - [ExposeServices(typeof(IPaymentRequestAppService), typeof(PaymentRequestClientProxy))] - public partial class PaymentRequestClientProxy : ClientProxyBase, IPaymentRequestAppService - { - public virtual async Task CompleteAsync(PaymentRequestCompleteInputDto input) + public virtual async Task CompleteAsync(string paymentType, PaymentRequestCompleteInputDto input) { return await RequestAsync(nameof(CompleteAsync), new ClientProxyRequestTypeValue { + { typeof(string), paymentType }, { typeof(PaymentRequestCompleteInputDto), input } }); } @@ -31,20 +32,21 @@ namespace EShopOnAbp.PaymentService.Controllers.ClientProxies }); } - public virtual async Task HandleWebhookAsync(string payload) + public virtual async Task HandleWebhookAsync(string paymentType, string payload) { return await RequestAsync(nameof(HandleWebhookAsync), new ClientProxyRequestTypeValue { + { typeof(string), paymentType }, { typeof(string), payload } }); } - public virtual async Task StartAsync(PaymentRequestStartDto input) + public virtual async Task StartAsync(string paymentType, PaymentRequestStartDto input) { return await RequestAsync(nameof(StartAsync), new ClientProxyRequestTypeValue { + { typeof(string), paymentType }, { typeof(PaymentRequestStartDto), input } }); } - } } diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.cs index 7e7c5f7d..dbe15ea1 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/PaymentRequestClientProxy.cs @@ -1,8 +1,7 @@ // This file is part of PaymentRequestClientProxy, you can customize it here // ReSharper disable once CheckNamespace -namespace EShopOnAbp.PaymentService.Controllers.ClientProxies +namespace EShopOnAbp.PaymentService.Controllers.ClientProxies; + +public partial class PaymentRequestClientProxy { - public partial class PaymentRequestClientProxy - { - } } diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/payment-generate-proxy.json b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/payment-generate-proxy.json index ad90fbc0..ce9c2eec 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/payment-generate-proxy.json +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/ClientProxies/payment-generate-proxy.json @@ -14,13 +14,21 @@ } ], "actions": { - "CompleteAsyncByInput": { - "uniqueName": "CompleteAsyncByInput", + "CompleteAsyncByPaymentTypeAndInput": { + "uniqueName": "CompleteAsyncByPaymentTypeAndInput", "name": "CompleteAsync", "httpMethod": "POST", "url": "api/payment/requests/complete", "supportedVersions": [], "parametersOnMethod": [ + { + "name": "paymentType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, { "name": "input", "typeAsString": "EShopOnAbp.PaymentService.PaymentRequests.PaymentRequestCompleteInputDto, EShopOnAbp.PaymentService.Application.Contracts", @@ -31,6 +39,18 @@ } ], "parameters": [ + { + "nameOnMethod": "paymentType", + "name": "paymentType", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, { "nameOnMethod": "input", "name": "input", @@ -88,13 +108,21 @@ "allowAnonymous": null, "implementFrom": "EShopOnAbp.PaymentService.PaymentRequests.IPaymentRequestAppService" }, - "HandleWebhookAsyncByPayload": { - "uniqueName": "HandleWebhookAsyncByPayload", + "HandleWebhookAsyncByPaymentTypeAndPayload": { + "uniqueName": "HandleWebhookAsyncByPaymentTypeAndPayload", "name": "HandleWebhookAsync", "httpMethod": "POST", - "url": "api/payment/requests/webhook", + "url": "api/payment/requests/{paymentType}/webhook", "supportedVersions": [], "parametersOnMethod": [ + { + "name": "paymentType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, { "name": "payload", "typeAsString": "System.String, System.Private.CoreLib", @@ -105,6 +133,18 @@ } ], "parameters": [ + { + "nameOnMethod": "paymentType", + "name": "paymentType", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + }, { "nameOnMethod": "payload", "name": "payload", @@ -125,13 +165,21 @@ "allowAnonymous": null, "implementFrom": "EShopOnAbp.PaymentService.PaymentRequests.IPaymentRequestAppService" }, - "StartAsyncByInput": { - "uniqueName": "StartAsyncByInput", + "StartAsyncByPaymentTypeAndInput": { + "uniqueName": "StartAsyncByPaymentTypeAndInput", "name": "StartAsync", "httpMethod": "POST", "url": "api/payment/requests/start", "supportedVersions": [], "parametersOnMethod": [ + { + "name": "paymentType", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, { "name": "input", "typeAsString": "EShopOnAbp.PaymentService.PaymentRequests.PaymentRequestStartDto, EShopOnAbp.PaymentService.Application.Contracts", @@ -142,6 +190,18 @@ } ], "parameters": [ + { + "nameOnMethod": "paymentType", + "name": "paymentType", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, { "nameOnMethod": "input", "name": "input",