LifePaymentApi.git

			@@ -28,6 +28,7 @@
			using NPOI.SS.Formula.Functions;
			using StackExchange.Redis;
			using static Volo.Abp.Identity.Settings.IdentitySettingNames;
			using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

			namespace LifePayment.Application;

			@@ -829,6 +830,7 @@
			public async Task<AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)
			{
			var result = await _aliPayApi.OrderInQuiry(input);

			return result;
			}

			@@ -840,6 +842,13 @@
			public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
			{
			var result = await _aliPayApi.QueryAlipayTradeRefund(input);
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo).FirstOrDefaultAsync();
			if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)
			{
			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;
			}

			return result;
			}

			@@ -858,9 +867,9 @@
			/// </summary>
			/// <param name="outTradeNo"></param>
			/// <returns></returns>
			public async Task WxPayTradeQuery(string outTradeNo)
			public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
			{
			await _wxPayApi.WxPayTradeQuery(outTradeNo);
			return await _wxPayApi.WxPayTradeQuery(outTradeNo);
			}

			#endregion
			@@ -1052,8 +1061,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;
			@@ -1418,7 +1427,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);