LifePaymentApi.git

			@@ -29,6 +29,7 @@
			using StackExchange.Redis;
			using static Volo.Abp.Identity.Settings.IdentitySettingNames;
			using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
			using LifePayment.Application.LifePay;

			namespace LifePayment.Application;

			@@ -47,6 +48,7 @@
			private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
			private readonly IRepository<OperateHistory, Guid> _operateHistory;
			private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
			private readonly ILifePayOrderService _lifePayOrderService;
			private readonly IDataFilter dataFilter;
			private readonly IChannelFilter _channelFilter;
			private readonly IAliPayApi _aliPayApi;
			@@ -67,6 +69,7 @@
			IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
			IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
			IRepository<OperateHistory, Guid> operateHistory,
			ILifePayOrderService lifePayOrderService,
			IAliPayApi aliPayApi,
			IAlipayInterfaceManager aliPayInterfaceManager,
			IWxPayApi wxPayApi,
			@@ -86,6 +89,7 @@
			_lifePayPremiumRepository = lifePayPremiumRepository;
			_lifePayIntroInfoRepository = lifePayIntroInfoRepository;
			_aliPayApi = aliPayApi;
			_lifePayOrderService = lifePayOrderService;
			_alipayInterfaceManager = aliPayInterfaceManager;
			_wxPayApi = wxPayApi;
			_wxPayOptions = wxPayOptions.Value;
			@@ -844,12 +848,22 @@
			/// <returns></returns>
			public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
			{
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo \|\| x.RefundOrderNo == input.OutRefundNo).FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "未找到订单信息");
			input.OutTradeNo = order.OrderNo;
			input.OutRefundNo = order.RefundOrderNo;
			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.已退款;
			await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
			{
			OrderNo = order.RefundOrderNo,
			OutOrderNo = result.TradeNo,
			LifePayType = LifePayTypeEnum.AliPay,
			ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
			});
			}

			return result;
			@@ -1351,7 +1365,7 @@
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");

			if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成 \|\| order.LifePayOrderStatus == LifePayOrderStatusEnum.已退款)
			if (order.LifePayOrderStatus >= LifePayOrderStatusEnum.已完成)
			{
			return;
			}
			@@ -1431,7 +1445,6 @@
			}

			var outRefundNo = order.ChannelId + CreateRefundOrderNo();
			order.RefundOrderNo = outRefundNo;
			switch (order.LifePayType)
			{
			case LifePayTypeEnum.WxPay:
			@@ -1460,12 +1473,13 @@
			throw new UserFriendlyException("退款失败:" + aliRefundResult.SubMsg);
			}

			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;
			order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;
			break;
			default: throw new UserFriendlyException("退款失败");
			}

			order.RefundOrderNo = outRefundNo;
			order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
			order.RefundCheckRemark = input.RefundCheckRemark;
			order.RefundTime = DateTime.Now;