LifePaymentApi.git

			@@ -23,6 +23,7 @@
			{
			private readonly IRepository<LifePayRechargeReceipts, Guid> _lifePayRechargeReceiptsRepository;
			private readonly IRepository<LifePayExpensesReceipts, Guid> _lifePayExpensesReceiptsRepository;
			private readonly IRepository<LifePayConsumption, Guid> _lifePayConsumption;
			private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
			private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
			private readonly IAliPayApi _aliPayApi;
			@@ -31,6 +32,7 @@
			public LifePayOrderService(
			IRepository<LifePayRechargeReceipts, Guid> lifePayRechargeReceiptsRepository,
			IRepository<LifePayExpensesReceipts, Guid> lifePayExpensesReceiptsRepository,
			IRepository<LifePayConsumption, Guid> lifePayConsumptionRepository,
			IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
			IRepository<LifePayOrder, Guid> lifePayOrderRepository,
			IAliPayApi aliPayApi,
			@@ -38,6 +40,7 @@
			{
			_lifePayRechargeReceiptsRepository = lifePayRechargeReceiptsRepository;
			_lifePayExpensesReceiptsRepository = lifePayExpensesReceiptsRepository;
			_lifePayConsumption = lifePayConsumptionRepository;
			_lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
			_lifePayOrderRepository = lifePayOrderRepository;
			_aliPayApi = aliPayApi;
			@@ -45,6 +48,39 @@
			}

			#region 查询

			/// <summary>
			/// 获取消费流水
			/// </summary>
			/// <param name="input"></param>
			/// <returns></returns>
			public async Task<PageOutput<LifePayConsumptionListOutput>> GetLifePayConsumptionPage(LifePayConsumptionPageInput input)
			{
			var list = await _lifePayConsumption.Where(x => x.IsDeleted == false)
			.WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) \|\| x.OutOrderNo.Contains(input.KeyWord) \|\| x.ChannelId.Contains(input.KeyWord))
			.WhereIf(input.Flow.HasValue,x => x.Flow == input.Flow)
			.WhereIf(input.TimeBegin.HasValue, x => x.FinishTime >= input.TimeBegin)
			.WhereIf(input.TimeEnd.HasValue, x => x.FinishTime <= input.TimeEnd)
			.Select(x => new LifePayConsumptionListOutput()
			{
			Id = x.Id,
			OrderNo = x.OrderNo,
			OutOrderNo = x.OutOrderNo,
			Amount = x.Amount,
			FinishTime = x.FinishTime,
			FrozenStatus = x.FrozenStatus,
			Flow = x.Flow,
			DeductionAmount = x.DeductionAmount,
			})
			.GetPageResult(input.PageModel);

			var total = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.RechargeAmount);
			LifePayRechargeReceiptsStatistics objectData = new LifePayRechargeReceiptsStatistics();
			objectData.TotalRechargeAmount = total;
			list.ObjectData = objectData;
			return list;
			}

			/// <summary>
			/// 获取充值流水
			/// </summary>
			@@ -163,7 +199,7 @@
			s.SerialNumber = ++i;
			s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
			s.PayAmountStr = s.PayAmount.ToString("F2");
			s.ChannlesRakeRateStr = s.ChannlesRakeRate.ToString("F2");
			s.ChannlesRakeRateStr = s.ChannlesRakeRate.ToString("F0") + "%";
			s.ChannlesRakePriceStr = s.ChannlesRakePrice.ToString("F2");
			s.FinishTimeStr = s.FinishTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
			});
			@@ -223,11 +259,9 @@
			var data = new LifePayExpensesReceipts()
			{
			Id = Guid.NewGuid(),
			OrderNo = input.OrderNo,
			OutOrderNo = input.OutOrderNo,
			LifePayType = input.LifePayType,
			ExpensesReceiptsType = input.ExpensesReceiptsType,
			Amount = input.Amount,
			};

			switch (input.LifePayType)
			@@ -239,18 +273,22 @@
			if (query.Code == AlipayResultCode.Success && (query.TradeStatus == AlipayStatus.TRADESUCCESS
			\|\| query.TradeStatus == AlipayStatus.TRADECLOSED))
			{
			data.OrderNo = input.OrderNo;
			data.ExtraProperties = JsonConvert.SerializeObject(query);
			data.FinishTime = Convert.ToDateTime(query.SendPayDate);
			data.Amount = Convert.ToDecimal(query.TotalAmount);
			await _lifePayExpensesReceiptsRepository.InsertAsync(data);
			}
			}
			else
			{
			var query = await _aliPayApi.QueryAlipayTradeRefund(new OrderInQuiryInput() { OutTradeNo = input.OrderNo });
			var query = await _aliPayApi.QueryAlipayTradeRefund(new OrderInQuiryInput() { OutTradeNo = input.OrderNo, OutRefundNo = input.OutRefundNo });
			if (query.Code == AlipayResultCode.Success && query.RefundStatus == AlipayRefundStatus.Success)
			{
			data.OrderNo = input.OutRefundNo;
			data.ExtraProperties = JsonConvert.SerializeObject(query);
			data.FinishTime = Convert.ToDateTime(query.GmtRefundPay);
			data.Amount = Convert.ToDecimal(query.RefundAmount);
			await _lifePayExpensesReceiptsRepository.InsertAsync(data);
			}
			}
			@@ -261,6 +299,7 @@
			var query = await _wxPayApi.WxPayTradeQuery(input.OrderNo);
			if (query.TradeState == WxPayStatus.支付成功 \|\| query.TradeState == WxPayStatus.转入退款)
			{
			data.OrderNo = input.OrderNo;
			data.ExtraProperties = JsonConvert.SerializeObject(query);
			data.FinishTime = Convert.ToDateTime(query.SuccessTime);
			await _lifePayExpensesReceiptsRepository.InsertAsync(data);
			@@ -268,9 +307,10 @@
			}
			else
			{
			var query = await _wxPayApi.WxPayDomesticRefundsQuery(input.OrderNo);
			var query = await _wxPayApi.WxPayDomesticRefundsQuery(input.OutRefundNo);
			if (query.Status == WxPayRefundStatus.退款成功)
			{
			data.OrderNo = input.OutRefundNo;
			data.ExtraProperties = JsonConvert.SerializeObject(query);
			data.FinishTime = Convert.ToDateTime(query.SuccessTime);
			await _lifePayExpensesReceiptsRepository.InsertAsync(data);
			@@ -315,15 +355,14 @@
			/// 出账
			if (item.RefundOrderNo.IsNotNullOrEmpty())
			{
			if (input.LifePayType == LifePayTypeEnum.WxPay)
			{
			input.OrderNo = item.RefundOrderNo;
			}
			input.OutRefundNo = item.OrderNo;
			input.ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts;
			await AddLifePayExpensesReceipts(input);

			input.OutRefundNo = item.RefundOrderNo;
			input.ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts;
			await AddLifePayExpensesReceipts(input);
			}

			}
			}
			}