LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1179,15 +1179,21 @@ public string OrderNo { get; set; } /// <summary> /// 渠道流水号 /// 外部订单号 /// </summary> public string OutOrderNo { get; set; } public string AcoolyOrderNo { get; set; } /// <summary> /// 交易金额 /// </summary> public decimal Amount { get; set; } /// <summary> /// 供应商订单状态 /// </summary> public ACOOLYStatusEnum ACOOLYStatus { get; set; } /// <summary> /// 记账时间 /// </summary> LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -24,6 +24,7 @@ private readonly IRepository<LifePayRechargeReceipts, Guid> _lifePayRechargeReceiptsRepository; private readonly IRepository<LifePayExpensesReceipts, Guid> _lifePayExpensesReceiptsRepository; private readonly IRepository<LifePayConsumption, Guid> _lifePayConsumption; private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep; private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository; private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository; private readonly IAliPayApi _aliPayApi; @@ -34,6 +35,7 @@ IRepository<LifePayExpensesReceipts, Guid> lifePayExpensesReceiptsRepository, IRepository<LifePayConsumption, Guid> lifePayConsumptionRepository, IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository, IRepository<LifePayChannles, Guid> lifePayChannlesRep, IRepository<LifePayOrder, Guid> lifePayOrderRepository, IAliPayApi aliPayApi, IWxPayApi wxPayApi) @@ -42,6 +44,7 @@ _lifePayExpensesReceiptsRepository = lifePayExpensesReceiptsRepository; _lifePayConsumption = lifePayConsumptionRepository; _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository; _lifePayChannlesRep = lifePayChannlesRep; _lifePayOrderRepository = lifePayOrderRepository; _aliPayApi = aliPayApi; _wxPayApi = wxPayApi; @@ -56,8 +59,9 @@ /// <returns></returns> public async Task<PageOutput<LifePayConsumptionListOutput>> GetLifePayConsumptionPage(LifePayConsumptionPageInput input) { var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWord)).Select(x => x.ChannlesNum).ToListAsync(); 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.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) || x.AcoolyOrderNo.Contains(input.KeyWord) || channles.Contains(x.ChannelId)) .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) @@ -65,8 +69,9 @@ { Id = x.Id, OrderNo = x.OrderNo, OutOrderNo = x.OutOrderNo, AcoolyOrderNo = x.AcoolyOrderNo, Amount = x.Amount, ACOOLYStatus = x.ACOOLYStatus, FinishTime = x.FinishTime, FrozenStatus = x.FrozenStatus, Flow = x.Flow, @@ -337,10 +342,12 @@ LifePayConsumption lifePayConsumption = new LifePayConsumption() { OrderNo = item.OrderNo, OutOrderNo = item.OutOrderNo, //Amount = item.PayAmount, AcoolyOrderNo = item.ACOOLYOrderNo, Amount = item.PlatformDeductionAmount.Value, //ACOOLYStatus = }; //switch (item.ACOOLYStatus) //{ // case ACOOLYStatusEnum.充值中: LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -125,12 +125,12 @@ { ReceiptsDetail receive = new ReceiptsDetail() { CreationTime = item.CreationTime.ToString("yyyy-MM-dd"), CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"), Amount = item.TotalReceiptsYesterday }; ReceiptsDetail income = new ReceiptsDetail() { CreationTime = item.CreationTime.ToString("yyyy-MM-dd"), CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"), Amount = item.TotalIncomeYesterday }; receiptsListOutPut.ReceiveList.Add(receive); @@ -162,7 +162,7 @@ { ReceiptsDetail receive = new ReceiptsDetail() { CreationTime = item.CreationTime.ToString("yyyy-MM-dd"), CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"), Amount = item.ChannlesRakePrice };
@@ -26,7 +26,7 @@ /// <summary> /// 渠道流水号 /// </summary> public string OutOrderNo { get; set; } public string AcoolyOrderNo { get; set; } /// <summary> /// 交易金额 @@ -34,6 +34,11 @@ public decimal Amount { get; set; } /// <summary> /// 供应商订单状态 /// </summary> public ACOOLYStatusEnum ACOOLYStatus { get; set; } /// <summary> /// 记账时间 /// </summary> public DateTime FinishTime { get; set; } LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -1799,9 +1799,9 @@ 平台订单号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayConsumptionListOutput.OutOrderNo"> <member name="P:LifePayment.Application.Contracts.LifePayConsumptionListOutput.AcoolyOrderNo"> <summary> 渠道流水号 外部订单号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayConsumptionListOutput.Amount"> @@ -1809,6 +1809,11 @@ 交易金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayConsumptionListOutput.ACOOLYStatus"> <summary> 供应商订单状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayConsumptionListOutput.FinishTime"> <summary> 记账时间 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -72,6 +72,11 @@ return await _statisticsService.GetReceiptsList(input.ChannleList); } /// <summary> /// 渠道数据 /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [AllowAnonymous] public async Task<ChannelDataListOutPut> GetChannelDataList(TopStatisticsInput input) @@ -79,6 +84,11 @@ return await _statisticsService.GetChannelDataList(input.ChannleList); } /// <summary> /// 30日佣金列表 /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [AllowAnonymous] public async Task<ChannlesRakeListOutPut> GetChannlesRakeList(TopStatisticsInput input)
