demo(tenpayv3): clean code

This commit is contained in:
Fu Diwei
2021-12-04 16:11:49 +08:00
parent c00ce7be84
commit df656663c7
8 changed files with 54 additions and 56 deletions

View File

@@ -8,18 +8,17 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
{
[ApiController]
[Route("notify")]
public class WxpayNotifyController : ControllerBase
public class TenpayNotifyController : ControllerBase
{
private readonly ILogger _logger;
private readonly Services.HttpClients.IWechatTenpayHttpClientFactory _tenpayHttpClientFactory;
private readonly Services.HttpClients.IWechatTenpayHttpClientFactory _wechatTenpayHttpClientFactory;
public WxpayNotifyController(
public TenpayNotifyController(
ILoggerFactory loggerFactory,
Services.HttpClients.IWechatTenpayHttpClientFactory wechatTenpayHttpClientFactory)
Services.HttpClients.IWechatTenpayHttpClientFactory tenpayHttpClientFactory)
{
_logger = loggerFactory.CreateLogger(GetType());
_wechatTenpayHttpClientFactory = wechatTenpayHttpClientFactory;
_tenpayHttpClientFactory = tenpayHttpClientFactory;
}
@@ -39,7 +38,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
string content = await reader.ReadToEndAsync();
_logger.LogInformation("接收到微信支付推送的数据:{0}", content);
var client = _wechatTenpayHttpClientFactory.Create(merchantId);
var client = _tenpayHttpClientFactory.Create(merchantId);
bool valid = client.VerifyEventSignature(
callbackTimestamp: timestamp,
callbackNonce: nonce,

View File

@@ -14,22 +14,20 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
{
[ApiController]
[Route("order")]
public class WxpayOrderController : ControllerBase
public class TenpayOrderController : ControllerBase
{
private readonly ILogger _logger;
private readonly Options.TenpayOptions _tenpayOptions;
private readonly Services.HttpClients.IWechatTenpayHttpClientFactory _tenpayHttpClientFactory;
private readonly Options.WxpayOptions _wxpayOptions;
private readonly Services.HttpClients.IWechatTenpayHttpClientFactory _wechatTenpayHttpClientFactory;
public WxpayOrderController(
public TenpayOrderController(
ILoggerFactory loggerFactory,
IOptions<Options.WxpayOptions> wxpayOptions,
Services.HttpClients.IWechatTenpayHttpClientFactory wechatTenpayHttpClientFactory)
IOptions<Options.TenpayOptions> tenpayOptions,
Services.HttpClients.IWechatTenpayHttpClientFactory tenpayHttpClientFactory)
{
_logger = loggerFactory.CreateLogger(GetType());
_wxpayOptions = wxpayOptions.Value;
_wechatTenpayHttpClientFactory = wechatTenpayHttpClientFactory;
_tenpayOptions = tenpayOptions.Value;
_tenpayHttpClientFactory = tenpayHttpClientFactory;
}
[HttpPost]
@@ -39,13 +37,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
// JSAPI 下单
// 文档https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_1.shtml
var client = _wechatTenpayHttpClientFactory.Create(requestModel.MerchantId);
var client = _tenpayHttpClientFactory.Create(requestModel.MerchantId);
var request = new CreatePayTransactionJsapiRequest()
{
OutTradeNumber = "SAMPLE_OTN_" + DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff"),
AppId = requestModel.AppId,
Description = "演示订单",
NotifyUrl = _wxpayOptions.CallbackUrl,
NotifyUrl = _tenpayOptions.NotifyUrl,
Amount = new CreatePayTransactionJsapiRequest.Types.Amount() { Total = requestModel.Amount },
Payer = new CreatePayTransactionJsapiRequest.Types.Payer() { OpenId = requestModel.OpenId }
};

View File

@@ -14,22 +14,20 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
{
[ApiController]
[Route("refund")]
public class WxpayRefundController : ControllerBase
public class TenpayRefundController : ControllerBase
{
private readonly ILogger _logger;
private readonly Options.TenpayOptions _tenpayOptions;
private readonly Services.HttpClients.IWechatTenpayHttpClientFactory _tenpayHttpClientFactory;
private readonly Options.WxpayOptions _wxpayOptions;
private readonly Services.HttpClients.IWechatTenpayHttpClientFactory _wechatTenpayHttpClientFactory;
public WxpayRefundController(
public TenpayRefundController(
ILoggerFactory loggerFactory,
IOptions<Options.WxpayOptions> wxpayOptions,
Services.HttpClients.IWechatTenpayHttpClientFactory wechatTenpayHttpClientFactory)
IOptions<Options.TenpayOptions> tenpayOptions,
Services.HttpClients.IWechatTenpayHttpClientFactory tenpayHttpClientFactory)
{
_logger = loggerFactory.CreateLogger(GetType());
_wxpayOptions = wxpayOptions.Value;
_wechatTenpayHttpClientFactory = wechatTenpayHttpClientFactory;
_tenpayOptions = tenpayOptions.Value;
_tenpayHttpClientFactory = tenpayHttpClientFactory;
}
[HttpPost]
@@ -39,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
// 申请退款
// 文档https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_9.shtml
var client = _wechatTenpayHttpClientFactory.Create(requestModel.MerchantId);
var client = _tenpayHttpClientFactory.Create(requestModel.MerchantId);
var request = new CreateRefundDomesticRefundRequest()
{
TransactionId = requestModel.TransactionId,
@@ -50,7 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Controllers
Refund = requestModel.RefundAmount
},
Reason = "示例退款",
NotifyUrl = _wxpayOptions.CallbackUrl
NotifyUrl = _tenpayOptions.NotifyUrl
};
var response = await client.ExecuteCreateRefundDomesticRefundAsync(request, cancellationToken: HttpContext.RequestAborted);
if (!response.IsSuccessful())