LifePaymentApi.git

			@@ -246,8 +246,8 @@
			{
			var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
			var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
			.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
			.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
			.WhereIf(input.BeginRefundTime.HasValue, x => x.FinishTime >= input.BeginRefundTime)
			.WhereIf(input.EndRefundTime.HasValue, x => x.FinishTime <= input.EndRefundTime)
			.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
			.WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
			.WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
			@@ -356,8 +356,6 @@
			/// <returns></returns>
			public async Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)
			{


			var result = await (await GetLifePayRefundOrderListFilter(input)).Select(x => new LifePayRefundOrderListTemplate
			{
			FinishTime = x.FinishTime,
			@@ -367,7 +365,13 @@
			PayAmount = x.PayAmount,
			PhoneNumber = x.PhoneNumber,
			RefundOrderNo = x.RefundOrderNo,
			ChannelName = x.ChannelName
			ChannelName = x.ChannelName,
			CreationTime = x.CreationTime,
			ACOOLYStatus = x.ACOOLYStatus,
			RechargeAmount = x.RechargeAmount,
			ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"),
			LifePayRefundStatus = x.LifePayRefundStatus,

			}).OrderByDescending(r => r.CreationTime).ToListAsync();
			var i = 0;
			result.ForEach(s =>
			@@ -378,7 +382,7 @@
			s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
			s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
			s.ActualReceivedAmount = s.ActualReceivedAmount;
			s.LifePayRefundStatus = s.LifePayRefundStatus.GetDescription();
			s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();
			s.PayAmountStr = s.PayAmount.ToString("F2");
			s.LifePayTypeStr = s.LifePayType.GetDescription();
			s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
			@@ -717,11 +721,12 @@
			{
			DiscountAmount = x.DiscountAmount,
			FinishTime = x.FinishTime,
			LifePayOrderStatus = x.LifePayOrderStatus,
			//LifePayOrderStatus = x.LifePayOrderStatus,
			LifePayOrderType = x.LifePayOrderType,
			LifePayType = x.LifePayType,
			OrderNo = x.OrderNo,
			PayAmount = x.PayAmount,
			ActualRechargeAmount = x.ActualRechargeAmount.HasValue?x.ActualRechargeAmount.Value:0,
			PhoneNumber = x.PhoneNumber,
			RechargeAmount = x.RechargeAmount,
			OutOrderNo = x.OutOrderNo,
			@@ -729,8 +734,11 @@
			PayTime = x.PayTime,
			ACOOLYOrderNo = x.ACOOLYOrderNo,
			CreationTime = x.CreationTime,
			RefundApplyRemark = x.RefundApplyRemark,
			ChannelName = x.ChannelName
			LifePayRefundStatus = x.LifePayRefundStatus,
			ACOOLYStatus = x.ACOOLYStatus,
			//RefundApplyRemark = x.RefundApplyRemark,
			ChannelName = x.ChannelName,
			PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0
			}).OrderByDescending(r => r.CreationTime).ToListAsync();
			var i = 0;
			result.ForEach(s =>
			@@ -743,7 +751,10 @@
			s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
			s.LifePayTypeStr = s.LifePayType.GetDescription();
			s.PayStatusStr = s.PayStatus.GetDescription();
			s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
			s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
			s.LifePayRefundStatusStr = s.LifePayRefundStatusStr.GetDescription();
			s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
			//s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
			s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
			});
			return result;
			@@ -839,8 +850,10 @@
			RechargeAmount = amount.RechargeAmount,
			ChannelId = channle.ChannlesNum,
			PlatformRate = platformRate.Rate,
			PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,
			ChannleRate = channle.ChannlesRate,
			ChannlesRakeRate = channle.ChannlesRakeRate,
			//ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
			};

			await CreateLifePayOrder(orderInput);
			@@ -1253,6 +1266,24 @@
			await _lifePayOrderRepository.UpdateAsync(order);
			}

			public async Task WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
			{
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");
			order.LifePayRefundStatus = refundStatus;
			switch (refundStatus)
			{
			case LifePayRefundStatusEnum.已退款:
			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			order.ACOOLYStatus = ACOOLYStatusEnum.已退款;
			break;
			case LifePayRefundStatusEnum.退款中:
			order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;
			break;
			default:break;
			}
			}

			/// <summary>
			/// ACOOLYO订单通知处理
			/// </summary>
			@@ -1342,6 +1373,7 @@
			order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
			}

			break;
			case LifePayTypeEnum.AliPay:
			var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice * 100).ToString() });
			@@ -1349,7 +1381,9 @@
			{
			throw new UserFriendlyException("退款失败");
			}

			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;
			break;
			default: throw new UserFriendlyException("退款失败");
			}
			@@ -1394,9 +1428,9 @@
			&& order.LifePayOrderStatus != LifePayOrderStatusEnum.待退款 && order.LifePayOrderStatus != LifePayOrderStatusEnum.已退款)
			{
			order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
			order.RefundApplyRemark = input.RefundApplyRemark;
			order.RefundApplyTime = DateTime.Now;

			await _lifePayOrderRepository.UpdateAsync(order);
			}
			else if (order.LifePayOrderStatus == LifePayOrderStatusEnum.待退款 \|\| order.LifePayRefundStatus == LifePayRefundStatusEnum.待退款 \|\|
			@@ -2015,6 +2049,7 @@
			PlatformDeductionAmount = a.PlatformDeductionAmount,
			ACOOLYStatus = a.ACOOLYStatus,
			LifePayRefundStatus = a.LifePayRefundStatus,
			ActualReceivedAmount = a.ActualReceivedAmount.HasValue? a.ActualReceivedAmount.Value : 0
			});
			return result;
			}