LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -763,6 +763,11 @@ public decimal? ActualRechargeAmount { get; set; } /// <summary> /// 实际到账金额 /// </summary> public decimal? ActualReceivedAmount { get; set; } /// <summary> /// 退款金额 /// </summary> public decimal? RefundPrice { get; set; } @@ -866,46 +871,52 @@ /// <summary> /// 账户余额 /// </summary> public string Amount { get; set; } public decimal Amount { get; set; } /// <summary> /// 累计收款 /// </summary> public string AccumulatedReceipts { get; set; } public decimal AccumulatedReceipts { get; set; } /// <summary> /// 昨日收款 /// </summary> public string ReceiptsYesterda { get; set; } public decimal ReceiptsYesterda { get; set; } /// <summary> /// 累计收入 /// </summary> public decimal AccumulatedIncome { get; set; } /// <summary> /// 累计下单 /// </summary> public string AccumulatedOrders { get; set; } public int AccumulatedOrders { get; set; } /// <summary> /// 昨日下单 /// </summary> public string OrdersNumYesterda { get; set; } public int OrdersNumYesterda { get; set; } /// <summary> /// 昨日成功 /// </summary> public string YesterdaSuccess { get; set; } public int YesterdaSuccess { get; set; } /// <summary> /// 昨日失败 /// </summary> public string YesterdaFail { get; set; } public int YesterdaFail { get; set; } /// <summary> /// 累计用户 /// </summary> public string AccumulatedUsers { get; set; } public int AccumulatedUsers { get; set; } /// <summary> /// 昨日活跃用户 /// </summary> public string YesterdayActiveUsers { get; set; } public int YesterdayActiveUsers { get; set; } } LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -102,6 +102,7 @@ var accumulatedReceipts = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.PayAmount); var receiptsYesterday = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today).SumAsync(x => x.PayAmount); var accumulatedOrders = await _lifePayOrderRepository.Where(x => x.CreationTime < today).CountAsync(); var accumulatedIncome = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.ActualRechargeAmount); var ordersNumYesterday = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today).CountAsync(); var yesterdaySuccess = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.已完成).CountAsync(); var yesterdayFail = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.已失败).CountAsync(); @@ -111,18 +112,18 @@ { Id = GuidGenerator.Create(), CreationTime = DateTime.Now, Amount = "0", AccumulatedReceipts = accumulatedReceipts.ToString(), ReceiptsYesterday = receiptsYesterday.ToString(), AccumulatedOrders = accumulatedOrders.ToString(), OrdersNumYesterday = ordersNumYesterday.ToString(), YesterdaySuccess = yesterdaySuccess.ToString(), YesterdayFail = yesterdayFail.ToString(), AccumulatedUsers = accumulatedUsers.ToString(), Amount = 0, AccumulatedReceipts = accumulatedReceipts, ReceiptsYesterday = receiptsYesterday, AccumulatedOrders = accumulatedOrders, OrdersNumYesterday = ordersNumYesterday, YesterdaySuccess = yesterdaySuccess, YesterdayFail = yesterdayFail, AccumulatedUsers = accumulatedUsers, }; await _dallyStatisticsRepository.InsertAsync(entity); var result = ObjectMapper.Map<DallyStatistics, TopStatisticsOutput>(entity); return result; //var result = ObjectMapper.Map<DallyStatistics, TopStatisticsOutput>(entity); return new TopStatisticsOutput(); } else { @@ -466,6 +467,7 @@ ACOOLYOrderNo = order.ACOOLYOrderNo, LifePayRefundStatus = order.LifePayRefundStatus, ActualRechargeAmount = order.ActualRechargeAmount, ActualReceivedAmount = order.ActualReceivedAmount, RefundPrice = order.RefundPrice, ElecBillUrl = order.ElecBillUrl.GetOssPath(), RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(), LifePayment/LifePayment.Domain/LifePay/DallyStatistics.cs
@@ -9,53 +9,57 @@ public class DallyStatistics : Entity<Guid> { /// <summary> /// 统计时间 /// </summary> public DateTime CreationTime { get; set; } /// <summary> /// 账户余额 /// </summary> public string Amount { get; set; } public decimal Amount { get; set; } /// <summary> /// 累计收款 /// </summary> public string AccumulatedReceipts { get; set; } public decimal AccumulatedReceipts { get; set; } /// <summary> /// 昨日收款 /// </summary> public string ReceiptsYesterday { get; set; } public decimal ReceiptsYesterday { get; set; } /// <summary> /// 累计收入 /// </summary> public decimal AccumulatedIncome { get; set; } /// <summary> /// 累计下单 /// </summary> public string AccumulatedOrders { get; set; } public int AccumulatedOrders { get; set; } /// <summary> /// 昨日下单 /// </summary> public string OrdersNumYesterday { get; set; } public int OrdersNumYesterday { get; set; } /// <summary> /// 昨日成功 /// </summary> public string YesterdaySuccess { get; set; } public int YesterdaySuccess { get; set; } /// <summary> /// 昨日失败 /// </summary> public string YesterdayFail { get; set; } public int YesterdayFail { get; set; } /// <summary> /// 累计用户 /// </summary> public string AccumulatedUsers { get; set; } public int AccumulatedUsers { get; set; } /// <summary> /// 昨日活跃用户 /// </summary> public string YesterdayActiveUsers { get; set; } public int YesterdayActiveUsers { get; set; } } LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -740,6 +740,11 @@ 退款凭证 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.RefundPrice"> <summary> 退款金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.CreationTime"> <summary> 下单时间 @@ -1060,6 +1065,11 @@ 回单地址 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundElecBillUrl"> <summary> 退款回单地址 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.UserPhoneNumber"> <summary> 用户账号 @@ -1170,6 +1180,11 @@ 实际充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ActualReceivedAmount"> <summary> 实际到账金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundPrice"> <summary> 退款金额 @@ -1178,6 +1193,11 @@ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ElecBillUrl"> <summary> 回单地址 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundElecBillUrl"> <summary> 退款回单地址 </summary> </member> <member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id"> @@ -1260,6 +1280,11 @@ 昨日收款 </summary> </member> <member name="P:LifePayment.Application.Contracts.TopStatisticsOutput.AccumulatedIncome"> <summary> 累计收入 </summary> </member> <member name="P:LifePayment.Application.Contracts.TopStatisticsOutput.AccumulatedOrders"> <summary> 累计下单
