From f4a07605ede31f0525aa592ce2202e44bff46cbe Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 31 三月 2025 14:37:07 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 52 ++++++++++++-
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 30 +++++++
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 100 +++++++++++++-----------
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs | 2
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 1
5 files changed, 133 insertions(+), 52 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs
index 7225a46..cc012f9 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs
@@ -15,10 +15,10 @@
Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input);
Task<PageOutput<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakePage(LifePayChannlesRakePageInput input);
+
Task<List<LifePayChannlesRakeListTemplate>> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input);
Task AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input);
-
Task AddLifePayExpensesReceipts(AddLifePayExpensesReceiptsInput input);
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index a595100..1d624a9 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1304,7 +1304,7 @@
/// <summary>
/// 涓嬪崟鏃堕棿
/// </summary>
- public DateTime CreationTime { set; get; }
+ public DateTime CreationTime { get; set; }
/// <summary>
/// 鎷撳睍灞炴��
@@ -1321,6 +1321,50 @@
[Name("搴忓彿")]
public int SerialNumber { get; set; }
- [Name("鎵嬫満鍙�")]
- public string PhoneNumber { get; set; }
-}
\ No newline at end of file
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ [Name("涓嬪崟鏃堕棿")]
+ public string CreationTimeStr { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ [Name("骞冲彴璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鎴愪氦閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+ [Name("鎴愪氦閲戦(鍏�)")]
+ public string PayAmountStr { get; set; }
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾姣斾緥
+ /// </summary>
+ public decimal ChannlesRakeRate { get; set; }
+
+ [Name("浣ｉ噾姣斾緥")]
+ public string ChannlesRakeRateStr { get; set; }
+
+ /// <summary>
+ /// 浣ｉ噾
+ /// </summary>
+ public decimal ChannlesRakePrice { get; set; }
+
+ [Name("鍒嗕剑(鍏�)")]
+ public string ChannlesRakePriceStr { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏃堕棿
+ /// </summary>
+ public DateTime FinishTime { get; set; }
+
+ [Name("缁撶畻鏃堕棿")]
+ public string FinishTimeStr { get; set; }
+}
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index f640885..6e9e7e5 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -14,6 +14,8 @@
using LifePayment.Domain;
using static LifePayment.Domain.Shared.LifePaymentConstant;
using Newtonsoft.Json;
+using LifePayment.Domain.Common;
+using Spire.Pdf.Exporting.XPS.Schema;
namespace LifePayment.Application.LifePay
{
@@ -146,54 +148,31 @@
public async Task<List<LifePayChannlesRakeListTemplate>> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input)
{
- //var result = await (await GetLifePayOrderListFilter(input)).Select(x => new LifePayOrderListTemplate
- //{
- // DiscountAmount = x.DiscountAmount,
- // FinishTime = x.FinishTime,
- // LifePayOrderStatus = x.LifePayOrderStatus,
- // LifePayOrderType = x.LifePayOrderType,
- // LifePayType = x.LifePayType,
- // OrderNo = x.OrderNo,
- // PayAmount = x.PayAmount,
- // ActualRechargeAmount = x.RechargeAmount,
- // PhoneNumber = x.PhoneNumber,
- // RechargeAmount = x.RechargeAmount,
- // OutOrderNo = x.OutOrderNo,
- // PayStatus = x.PayStatus,
- // PayTime = x.PayTime,
- // ACOOLYOrderNo = x.ACOOLYOrderNo,
- // CreationTime = x.CreationTime,
- // LifePayRefundStatus = x.LifePayRefundStatus,
- // ACOOLYStatus = x.ACOOLYStatus,
- // //RefundApplyRemark = x.RefundApplyRemark,
- // ChannelName = x.ChannelName,
- // PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
- //}).OrderByDescending(r => r.CreationTime).ToListAsync();
- //var i = 0;
- //result.ForEach(s =>
- //{
- // s.SerialNumber = ++i;
- // s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
- // s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
- // s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
- // s.PayAmountStr = s.PayAmount.ToString("F2");
- // s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
- // s.LifePayTypeStr = s.LifePayType.GetDescription();
- // s.PayStatusStr = s.PayStatus.GetDescription();
- // s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
- // s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
- // s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
- // s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
- // s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
- //});
- return null;
+ var result = await (await GetLifePayChannlesRakeListFilter(input)).Select(x => new LifePayChannlesRakeListTemplate
+ {
+ CreationTime = x.CreationTime,
+ FinishTime = x.FinishTime,
+ OrderNo = x.OrderNo,
+ PayAmount = x.PayAmount,
+ ChannlesRakeRate = x.ChannlesRakeRate,
+ ChannlesRakePrice = x.ChannlesRakePrice
+ }).OrderByDescending(r => r.CreationTime).ToListAsync();
+ var i = 0;
+ result.ForEach(s =>
+ {
+ s.SerialNumber = ++i;
+ s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ s.PayAmountStr = s.PayAmount.ToString("F2");
+ s.ChannlesRakeRateStr = s.ChannlesRakeRate.ToString("F2");
+ s.ChannlesRakePriceStr = s.ChannlesRakePrice.ToString("F2");
+ s.FinishTimeStr = s.FinishTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ });
+ return result;
}
#endregion
-
-
-
+ #region 鎿嶄綔
/// <summary>
/// 缂栬緫鍏呭�兼祦姘�
@@ -229,7 +208,7 @@
}
}
-
+
/// <summary>
/// 鎻掑叆鏀舵敮娴佹按
/// </summary>
@@ -344,7 +323,7 @@
input.ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts;
await AddLifePayExpensesReceipts(input);
}
-
+
}
}
}
@@ -377,5 +356,34 @@
}
}
}
+ #endregion
+
+ #region 绉佹湁
+ private async Task<IQueryable<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakeListFilter(LifePayChannlesRakePageInput input)
+ {
+ var list = _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
+ .WhereIf(input.ChannelId.IsNotNullOrEmpty(), x => x.ChannelId == input.ChannelId)
+ .WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
+ .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
+ .WhereIf(input.FinishTimeBegin.HasValue, x => x.FinishTime >= input.FinishTimeBegin)
+ .WhereIf(input.FinishTimeEnd.HasValue, x => x.FinishTime <= input.FinishTimeEnd)
+
+ .Select(x => new LifePayChannlesRakeListOutput()
+ {
+ Id = x.Id,
+ OrderNo = x.OrderNo,
+ PayAmount = x.PayAmount,
+ ChannlesRakeRate = x.ChannlesRakeRate,
+ ChannlesRakePrice = x.ChannlesRakePrice,
+ ChannelId = x.ChannelId,
+ FinishTime = x.FinishTime,
+ CreationTime = x.CreationTime,
+ });
+
+
+ return list;
+ }
+ #endregion
+
}
}
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 10a0cd7..41fde74 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -2040,7 +2040,6 @@
return message;
}
-
private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)
{
var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 1b61f78..666f3db 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -1876,6 +1876,36 @@
涓嬪崟娓犻亾
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayChannlesRakeListTemplate.CreationTime">
+ <summary>
+ 涓嬪崟鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayChannlesRakeListTemplate.OrderNo">
+ <summary>
+ 骞冲彴璁㈠崟鍙�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayChannlesRakeListTemplate.PayAmount">
+ <summary>
+ 鎴愪氦閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayChannlesRakeListTemplate.ChannlesRakeRate">
+ <summary>
+ 娓犻亾浣ｉ噾姣斾緥
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayChannlesRakeListTemplate.ChannlesRakePrice">
+ <summary>
+ 浣ｉ噾
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayChannlesRakeListTemplate.FinishTime">
+ <summary>
+ 缁撶畻鏃堕棿
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.RecordOperateHistoryEto.RelationId">
<summary>
鍏宠仈鍏崇郴ID
--
Gitblit v1.9.1