From b4288a88cb00793368c8e9244a7b3181daeadb96 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 28 三月 2025 16:11:11 +0800
Subject: [PATCH] fix：条件编译更新
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 2a8e236..8403c87 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -848,9 +848,19 @@
/// </summary>
/// <param name="outTradeNo"></param>
/// <returns></returns>
- public async Task WxPayDomesticRefundsQuery(string outTradeNo)
+ public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
{
- await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+ return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ public async Task WxPayTradeQuery(string outTradeNo)
+ {
+ await _wxPayApi.WxPayTradeQuery(outTradeNo);
}
#endregion
@@ -1042,8 +1052,8 @@
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
#else
- //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
- var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount??0, ip, input.H5Type);
+ //var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, 0.01m, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
#endif
return payUrl;
@@ -1408,7 +1418,7 @@
break;
case LifePayTypeEnum.AliPay:
- var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = input.RefundPrice.ToString() });
+ var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });
if (aliRefundResult.Code != AlipayResultCode.Success)
{
throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
@@ -2156,6 +2166,7 @@
return channel.ChannlesRate;
}
}
+
public async Task<SetPayTypeReturn> SetPayType(string orderNo, LifePayTypeEnum lifePayType, string ip)
{
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
--
Gitblit v1.9.1