Merge pull request #113 from EasyAbp/make-methods-virtual

Make methods virtual
EasyAbp · Apr 14, 2024 · 49b05e9 · 49b05e9
2 parents 4c5ceb1 + 0f6d1ca
commit 49b05e9
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
  <LangVersion>latest</LangVersion>
- <Version>3.1.0-preview.2</Version>
+ <Version>3.1.0-preview.3</Version>
  <NoWarn>$(NoWarn);CS1591</NoWarn>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Authors>EasyAbp Team</Authors>

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/AppPayment/AppPaymentService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/AppPayment/AppPaymentService.cs
@@ -16,7 +16,7 @@ public AppPaymentService(AbpWeChatPayOptions options,
  {
  }
 
- public Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
+ public virtual Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
  {
  return ApiRequester.RequestAsync<CreateOrderResponse>(HttpMethod.Post, CreateOrderUrl, request);
  }

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/BasicPaymentService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/BasicPaymentService.cs
@@ -11,11 +11,20 @@ namespace EasyAbp.Abp.WeChat.Pay.Services.BasicPayment;
 
 public class BasicPaymentService : WeChatPayServiceBase
 {
- public const string QueryOrderByWechatNumberUrl = "https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id}";
- public const string QueryOrderByOutTradeNumberUrl = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}";
- public const string CloseOrderUrl = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}/close";
+ public const string QueryOrderByWechatNumberUrl =
+ "https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id}";
+
+ public const string QueryOrderByOutTradeNumberUrl =
+ "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}";
+
+ public const string CloseOrderUrl =
+ "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}/close";
+
  public const string RefundUrl = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds";
- public const string QueryRefundOrderUrl = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds/{out_refund_no}";
+
+ public const string QueryRefundOrderUrl =
+ "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds/{out_refund_no}";
+
  public const string GetTransactionBillUrl = "https://api.mch.weixin.qq.com/v3/bill/tradebill";
  public const string GetFundFlowBillUrl = "https://api.mch.weixin.qq.com/v3/bill/fundflowbill";
 
@@ -25,46 +34,46 @@ public BasicPaymentService(AbpWeChatPayOptions options,
  {
  }
 
- public Task<QueryOrderResponse> QueryOrderByWechatNumberAsync(QueryOrderByWechatNumberRequest request)
+ public virtual Task<QueryOrderResponse> QueryOrderByWechatNumberAsync(QueryOrderByWechatNumberRequest request)
  {
  var requestUrl = QueryOrderByWechatNumberUrl.Replace("{transaction_id}", request.TransactionId);
  return ApiRequester.RequestAsync<QueryOrderResponse>(HttpMethod.Get, requestUrl, request);
  }
 
- public Task<QueryOrderResponse> QueryOrderByOutTradeNumberAsync(QueryOrderByOutTradeNumberRequest request)
+ public virtual Task<QueryOrderResponse> QueryOrderByOutTradeNumberAsync(QueryOrderByOutTradeNumberRequest request)
  {
  var requestUrl = QueryOrderByOutTradeNumberUrl.Replace("{out_trade_no}", request.OutTradeNo);
  return ApiRequester.RequestAsync<QueryOrderResponse>(HttpMethod.Get, requestUrl, request);
  }
 
- public Task<WeChatPayCommonErrorResponse> CloseOrderAsync(CloseOrderRequest request)
+ public virtual Task<WeChatPayCommonErrorResponse> CloseOrderAsync(CloseOrderRequest request)
  {
  var requestUrl = CloseOrderUrl.Replace("{out_trade_no}", request.OutTradeNo);
  return ApiRequester.RequestAsync<WeChatPayCommonErrorResponse>(HttpMethod.Post, requestUrl, request);
  }
 
- public Task<RefundOrderResponse> RefundAsync(RefundOrderRequest orderRequest)
+ public virtual Task<RefundOrderResponse> RefundAsync(RefundOrderRequest orderRequest)
  {
  return ApiRequester.RequestAsync<RefundOrderResponse>(HttpMethod.Post, RefundUrl, orderRequest);
  }
 
- public Task<RefundOrderResponse> QueryRefundOrderAsync(QueryRefundOrderRequest request)
+ public virtual Task<RefundOrderResponse> QueryRefundOrderAsync(QueryRefundOrderRequest request)
  {
  var requestUrl = QueryRefundOrderUrl.Replace("{out_refund_no}", request.OutRefundNo);
  return ApiRequester.RequestAsync<RefundOrderResponse>(HttpMethod.Get, requestUrl);
  }
 
- public Task<GetBillResponse> GetTransactionBillAsync(GetTransactionBillRequest request)
+ public virtual Task<GetBillResponse> GetTransactionBillAsync(GetTransactionBillRequest request)
  {
  return ApiRequester.RequestAsync<GetBillResponse>(HttpMethod.Get, GetTransactionBillUrl, request);
  }
 
- public Task<GetBillResponse> GetFundFlowBillAsync(GetFundFlowBillRequest request)
+ public virtual Task<GetBillResponse> GetFundFlowBillAsync(GetFundFlowBillRequest request)
  {
  return ApiRequester.RequestAsync<GetBillResponse>(HttpMethod.Get, GetFundFlowBillUrl, request);
  }
 
- public async Task<Stream> DownloadBillFileAsync(string billDownloadUrl)
+ public virtual async Task<Stream> DownloadBillFileAsync(string billDownloadUrl)
  {
  return await (await ApiRequester.RequestRawAsync(HttpMethod.Get, billDownloadUrl)).Content.ReadAsStreamAsync();
  }

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/H5Payment/H5PaymentService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/H5Payment/H5PaymentService.cs
@@ -16,7 +16,7 @@ public H5PaymentService(AbpWeChatPayOptions options,
  {
  }
 
- public Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
+ public virtual Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
  {
  return ApiRequester.RequestAsync<CreateOrderResponse>(HttpMethod.Post, CreateOrderUrl, request);
  }

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/JSPayment/JsPaymentService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/JSPayment/JsPaymentService.cs
@@ -17,7 +17,7 @@ public JsPaymentService(AbpWeChatPayOptions options,
  {
  }
 
- public Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
+ public virtual Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
  {
  return ApiRequester.RequestAsync<CreateOrderResponse>(HttpMethod.Post, CreateOrderUrl, request);
  }

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/NativePayment/NativePaymentService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/BasicPayment/NativePayment/NativePaymentService.cs
@@ -17,7 +17,7 @@ public NativePaymentService(AbpWeChatPayOptions options,
  {
  }
 
- public Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
+ public virtual Task<CreateOrderResponse> CreateOrderAsync(CreateOrderRequest request)
  {
  return ApiRequester.RequestAsync<CreateOrderResponse>(HttpMethod.Post, CreateOrderUrl, request);
  }

diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/MarketingTools/VoucherService/VoucherWeService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/MarketingTools/VoucherService/VoucherWeService.cs
@@ -19,8 +19,9 @@ public VoucherWeService(AbpWeChatPayOptions options,
  {
  }
 
- public Task<CreateCouponBatchResponse> CreateCouponBatchAsync(CreateCouponBatchRequest request)
+ public virtual Task<CreateCouponBatchResponse> CreateCouponBatchAsync(CreateCouponBatchRequest request)
  {
- return ApiRequester.RequestAsync<CreateCouponBatchResponse>(HttpMethod.Post, CreateCouponBatchUrl, request, MchId);
+ return ApiRequester.RequestAsync<CreateCouponBatchResponse>(
+ HttpMethod.Post, CreateCouponBatchUrl, request, MchId);
  }
 }
diff --git a/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/OtherServices/WeChatPayCertificatesWeService.cs b/src/Pay/EasyAbp.Abp.WeChat.Pay/Services/OtherServices/WeChatPayCertificatesWeService.cs
@@ -23,7 +23,7 @@ public WeChatPayCertificatesWeService(AbpWeChatPayOptions options,
  /// <summary>
  /// 获取商户当前可用的平台证书列表。
  /// </summary>
- public Task<GetPlatformCertificatesResponse> GetPlatformCertificatesAsync()
+ public virtual Task<GetPlatformCertificatesResponse> GetPlatformCertificatesAsync()
  {
  return ApiRequester.RequestAsync<GetPlatformCertificatesResponse>(HttpMethod.Get, CertificatesUrl);
  }