|
|
@@ -67,7 +67,7 @@ namespace Admin.NET.Core.Service
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// 微信支付统一下单获取Id
|
|
|
+ /// 微信支付统一下单获取Id(商户直连)
|
|
|
/// </summary>
|
|
|
[HttpPost("/weChatPay/payTransaction")]
|
|
|
public async Task<dynamic> CreatePayTransaction([FromBody] WechatPayTransactionInput input)
|
|
|
@@ -108,6 +108,55 @@ namespace Admin.NET.Core.Service
|
|
|
};
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 微信支付统一下单获取Id(服务商模式)
|
|
|
+ /// </summary>
|
|
|
+ [HttpPost("/weChatPay/payPartnerTransaction")]
|
|
|
+ public async Task<dynamic> CreatePayPartnerTransaction([FromBody] WechatPayTransactionInput input)
|
|
|
+ {
|
|
|
+ var request = new CreatePayPartnerTransactionJsapiRequest()
|
|
|
+ {
|
|
|
+ OutTradeNumber = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000), // YitIdHelper.NextId(), // 订单号
|
|
|
+ AppId = _wechatPayOptions.AppId,
|
|
|
+ MerchantId = _wechatPayOptions.MerchantId,
|
|
|
+ SubAppId = _wechatPayOptions.AppId,
|
|
|
+ SubMerchantId = _wechatPayOptions.MerchantId,
|
|
|
+ Description = input.Description,
|
|
|
+ Attachment = input.Attachment,
|
|
|
+ GoodsTag = input.GoodsTag,
|
|
|
+ ExpireTime = DateTimeOffset.Now.AddMinutes(10),
|
|
|
+ NotifyUrl = _payCallBackOptions.WechatPayUrl,
|
|
|
+ Amount = new CreatePayPartnerTransactionJsapiRequest.Types.Amount() { Total = input.Total },
|
|
|
+ Payer = new CreatePayPartnerTransactionJsapiRequest.Types.Payer() { OpenId = input.OpenId }
|
|
|
+ };
|
|
|
+ var response = await _wechatTenpayClient.ExecuteCreatePayPartnerTransactionJsapiAsync(request);
|
|
|
+ if (!response.IsSuccessful())
|
|
|
+ throw Oops.Oh(response.ErrorMessage);
|
|
|
+
|
|
|
+ // 保存订单信息
|
|
|
+ var wechatPay = new WechatPay()
|
|
|
+ {
|
|
|
+ AppId = _wechatPayOptions.AppId,
|
|
|
+ MerchantId = _wechatPayOptions.MerchantId,
|
|
|
+ SubAppId = _wechatPayOptions.AppId,
|
|
|
+ SubMerchantId = _wechatPayOptions.MerchantId,
|
|
|
+ OutTradeNumber = request.OutTradeNumber,
|
|
|
+ Description = input.Description,
|
|
|
+ Attachment = input.Attachment,
|
|
|
+ GoodsTag = input.GoodsTag,
|
|
|
+ Total = input.Total,
|
|
|
+ OpenId = input.OpenId
|
|
|
+ };
|
|
|
+ await _wechatPayUserRep.InsertAsync(wechatPay);
|
|
|
+
|
|
|
+ return new
|
|
|
+ {
|
|
|
+ response.PrepayId,
|
|
|
+ request.OutTradeNumber
|
|
|
+ };
|
|
|
+ }
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 获取支付订单详情
|
|
|
/// </summary>
|
|
|
@@ -120,10 +169,10 @@ namespace Admin.NET.Core.Service
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// 微信支付成功回调(商户平台发来的通知内容)
|
|
|
+ /// 微信支付成功回调(商户直连)
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- [HttpPost("/notify/weChatPay/unifiedorder")]
|
|
|
+ [HttpPost("/notify/weChatPay/payCallBack")]
|
|
|
[AllowAnonymous]
|
|
|
public async Task WeChatPayCallBack()
|
|
|
{
|
|
|
@@ -156,5 +205,43 @@ namespace Admin.NET.Core.Service
|
|
|
await _wechatPayUserRep.AsUpdateable(wechatPay).IgnoreColumns(true).ExecuteCommandAsync();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 微信支付成功回调(服务商模式)
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpPost("/notify/weChatPay/payPartnerCallback")]
|
|
|
+ [AllowAnonymous]
|
|
|
+ public async Task WeChatPayPartnerCallBack()
|
|
|
+ {
|
|
|
+ using var ms = new MemoryStream();
|
|
|
+ await App.HttpContext.Request.Body.CopyToAsync(ms);
|
|
|
+ var b = ms.ToArray();
|
|
|
+ var callbackJson = Encoding.UTF8.GetString(b);
|
|
|
+
|
|
|
+ var callbackModel = _wechatTenpayClient.DeserializeEvent(callbackJson);
|
|
|
+ if ("TRANSACTION.SUCCESS".Equals(callbackModel.EventType))
|
|
|
+ {
|
|
|
+ var callbackResource = _wechatTenpayClient.DecryptEventResource<PartnerTransactionResource>(callbackModel);
|
|
|
+
|
|
|
+ // 修改订单支付状态
|
|
|
+ var wechatPay = await _wechatPayUserRep.GetFirstAsync(u => u.OutTradeNumber == callbackResource.OutTradeNumber
|
|
|
+ && u.MerchantId == callbackResource.MerchantId);
|
|
|
+ if (wechatPay == null) return;
|
|
|
+ //wechatPay.OpenId = callbackResource.Payer.OpenId; // 支付者标识
|
|
|
+ //wechatPay.MerchantId = callbackResource.MerchantId; // 微信商户号
|
|
|
+ //wechatPay.OutTradeNumber = callbackResource.OutTradeNumber; // 商户订单号
|
|
|
+ wechatPay.TransactionId = callbackResource.TransactionId; // 支付订单号
|
|
|
+ wechatPay.TradeType = callbackResource.TradeType; // 交易类型
|
|
|
+ wechatPay.TradeState = callbackResource.TradeState; // 交易状态
|
|
|
+ wechatPay.TradeStateDescription = callbackResource.TradeStateDescription; // 交易状态描述
|
|
|
+ wechatPay.BankType = callbackResource.BankType; // 付款银行类型
|
|
|
+ wechatPay.Total = callbackResource.Amount.Total; // 订单总金额
|
|
|
+ wechatPay.PayerTotal = callbackResource.Amount.PayerTotal; // 用户支付金额
|
|
|
+ wechatPay.SuccessTime = callbackResource.SuccessTime; // 支付完成时间
|
|
|
+
|
|
|
+ await _wechatPayUserRep.AsUpdateable(wechatPay).IgnoreColumns(true).ExecuteCommandAsync();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
zuohuaijun