From 430a0ee2578917bd7524515c3273e487c3f83171 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 17:04:44 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 10 ++++++++--
LifePayment/LifePayment.Domain/LifePay/LifePayConsumption.cs | 7 ++++++-
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 9 +++++++--
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 15 +++++++++++----
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 10 ++++++++++
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 6 +++---
6 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index d509f50..3ef7c0e 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/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>
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index fca55d3..af8d6e1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/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.鍏呭�间腑:
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index 4b9a3c5..6ebfa27 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/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
};
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayConsumption.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayConsumption.cs
index 2ae50e7..406255a 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayConsumption.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayConsumption.cs
@@ -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; }
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 84805de..e047d10 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/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>
璁拌处鏃堕棿
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index 3bfe783..12081d0 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/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)
--
Gitblit v1.9.1