From 4e54aab4960fb97a549d9d715428b5374ecad6b5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 10 六月 2025 18:25:38 +0800
Subject: [PATCH] fix:运营端--订单管理--退款管理--列表数据导出文件不正确 运营端--订单管理--列表数据导出文件不正确

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  365 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 358 insertions(+), 7 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index a87c39d..7529438 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -286,7 +286,7 @@
     /// <summary>
     /// 瀹為檯鍒拌处閲戦
     /// </summary>
-    public decimal ActualReceivedAmount { get; set; }
+    public decimal? ActualReceivedAmount { get; set; }
 
     public LifePayStatusEnum? ActualReceivedStatus { get; set; }
 }
@@ -381,7 +381,6 @@
     /// <summary>
     /// 璁㈠崟鐘舵��
     /// </summary>
-    [Name("骞冲彴璁㈠崟鐘舵��")]
     public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
 
 
@@ -404,6 +403,137 @@
 
     [Name("鏀粯娓犻亾娴佹按鍙�")]
     public string OutOrderNo { get; set; }
+
+    //[Name("閫�娆剧敵璇�")]
+    //public string RefundApplyRemark { get; set; }
+
+    ///// <summary>
+    ///// 璁㈠崟鐘舵��
+    ///// </summary>
+    //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+    [Name("骞冲彴璁㈠崟鐘舵��")]
+    public string LifePayOrderStatusStr { get; set; }
+
+    /// <summary>
+    /// 瀹屾垚鏃堕棿
+    /// </summary>
+    public DateTime? FinishTime { get; set; }
+
+    [Name("瀹屾垚鏃堕棿")]
+    public string FinishTimeStr { get; set; }
+
+
+
+}
+
+public class LifePayOrderListTemplateForChannle
+{
+
+    [Name("搴忓彿")]
+    public int SerialNumber { get; set; }
+
+    [Name("鎵嬫満鍙�")]
+    public string PhoneNumber { get; set; }
+
+    public LifePayTypeEnum? LifePayType { get; set; }
+
+    public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+    [Name("鍏呭�肩被鍨�")]
+    public string LifePayOrderTypeStr { get; set; }
+
+    public string ChannelName { get; set; }
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    [Name("涓嬪崟鏃堕棿")]
+    public string CreationTimeStr { get; set; }
+
+    [Name("骞冲彴璁㈠崟鍙�")]
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    [Name("鍏呭�奸噾棰�")]
+    public string RechargeAmountStr { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍏呭�奸噾棰�
+    /// </summary>
+    public decimal ActualRechargeAmount { get; set; }
+
+    [Name("瀹為檯鍏呭�奸噾棰�")]
+    public string ActualRechargeAmountStr { get; set; }
+
+    /// <summary>
+    /// 浼樻儬閲戦
+    /// </summary>
+    public decimal DiscountAmount { get; set; }
+
+    /// <summary>
+    /// 瀹炰粯閲戦
+    /// </summary>
+    public decimal PayAmount { get; set; }
+
+    [Name("鐢ㄦ埛瀹炰粯閲戦")]
+    public string PayAmountStr { get; set; }
+
+    /// <summary>
+    /// 鏀粯鏃堕棿
+    /// </summary>
+    public DateTime? PayTime { get; set; }
+
+    [Name("鏀粯鏃堕棿")]
+    public string PayTimeStr { get; set; }
+
+    [Name("鏀粯娓犻亾")]
+    public string LifePayTypeStr { get; set; }
+
+    [Name("鏀粯娓犻亾娴佹按鍙�")]
+    public string OutOrderNo { get; set; }
+
+    [Name("鏀粯鐘舵��")]
+    public string PayStatusStr { get; set; }
+
+    public string ACOOLYOrderNo { get; set; }
+
+    /// <summary>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </summary>
+    public decimal PlatformPrice { get; set; }
+
+    /// <summary>
+    /// 骞冲彴閫�娆剧姸鎬�
+    /// </summary>
+    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+    public string? LifePayRefundStatusStr { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+
+
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    public string? ACOOLYStatusStr { get; set; }
+
+    /// <summary>
+    /// 鏀粯鐘舵��
+    /// </summary>
+    public LifePayStatusEnum PayStatus { get; set; }
 
     //[Name("閫�娆剧敵璇�")]
     //public string RefundApplyRemark { get; set; }
@@ -532,6 +662,8 @@
 
     [Name("瀹屾垚鏃堕棿")]
     public string? FinishTimeStr { get; set; }
+
+    public string OrderNo { get; set; }
 
 
 }
@@ -1096,6 +1228,10 @@
     /// </summary>
     public int YesterdayActiveUsers { get; set; }
 
+    /// <summary>
+    /// 绱浣ｉ噾
+    /// </summary>
+    public decimal AccumulatedChannlesRakePrice { get; set; }
 }
 
 public class ChannelRateOutput
@@ -1110,9 +1246,22 @@
     /// </summary>
     public string Link { get; set; }
 }
+
+public class LifePayConsumptionStatistics
+{
+    /// <summary>
+    /// 绱鎵ｆ
+    /// </summary>
+    public decimal TotalDeductionAmount { get; set; }
+
+    /// <summary>
+    /// 鍐荤粨涓�
+    /// </summary>
+    public decimal TotalFrozenAmount { get; set; }
+}
+
 public class LifePayRechargeReceiptsStatistics
 {
-
     /// <summary>
     /// 绱鍏呭��
     /// </summary>
@@ -1152,12 +1301,71 @@
     public DateTime CreationTime { get; set; }
 }
 
+public class LifePayConsumptionListOutput
+{
+    /// <summary>
+    /// 缂栧彿
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 骞冲彴璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 澶栭儴璁㈠崟鍙�
+    /// </summary>
+    public string AcoolyOrderNo { get; set; }
+
+    /// <summary>
+    /// 浜ゆ槗閲戦
+    /// </summary>
+    public decimal Amount { get; set; }
+
+
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 璁拌处鏃堕棿
+    /// </summary>
+    public DateTime FinishTime { get; set; }
+
+    /// <summary>
+    /// 鍐荤粨鐘舵��
+    /// </summary>
+    public ConsumptionFrozenStatusEnum FrozenStatus { get; set; }
+
+    /// <summary>
+    /// 璧勯噾娴佸悜
+    /// </summary>
+    public ConsumptionFlowEnum Flow { get; set; }
+
+    /// <summary>
+    /// 鎵ｆ閲戦
+    /// </summary>
+    public decimal DeductionAmount { get; set; }
+
+    /// <summary>
+    /// 鍐荤粨閲戦
+    /// </summary>
+    public decimal FrozenAmount { get; set; }
+}
+
 public class LifePayPhoneMesssageCodeLoginOutput
 {
     /// <summary>
     /// 鐢ㄦ埛Id
     /// </summary>
     public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 鎺ㄥ箍鍛業D
+    /// </summary>
+    public string PromoterIdNumber { get; set; }
 
     /// <summary>
     /// 鏄惁鏄悗鍙扮敤鎴�
@@ -1175,6 +1383,25 @@
     public string Name { get; set; }
 
     public string ChannlesNum { get; set; }
+
+    public Guid ChannlesId { get; set; }
+
+    public LifePaySwitchTypeEnum SwitchType { get; set; }
+}
+
+public class BackClientUserInfoOutput
+{
+    /// <summary>
+    /// 鏄惁鏄悗鍙扮敤鎴�
+    /// </summary>
+    public bool IsBackClientUser { get; set; }
+
+    public bool IsSystem { get; set; }
+
+    /// <summary>
+    /// 娓犻亾鍙�
+    /// </summary>
+    public List<ChannelOutput> ChannleList { get; set; }
 }
 
 public class LifePayExpensesReceiptsListOutput
@@ -1243,12 +1470,84 @@
 public class ReceiptsListOutPut
 {
     /// <summary>
+    /// 30澶╂敹娆�
+    /// </summary>
+    public List<ReceiptsDetail> ReceiveList { get; set; } = new List<ReceiptsDetail>();
+
+    /// <summary>
+    /// 30澶╂敹鍏�
+    /// </summary>
+    public List<ReceiptsDetail> IncomeList { get; set; } = new List<ReceiptsDetail>();
+}
+
+public class ReceiptsDetail
+{
+    /// <summary>
     /// 鍒涘缓鏃堕棿
     /// </summary>
-    public DateTime CreationTime { get; set; }
+    public string CreationTime { get; set; }
 
+    /// <summary>
+    /// 閲戦
+    /// </summary>
     public decimal Amount { get; set; }
 }
+
+public class ChannlesRakeListOutPut
+{
+    /// <summary>
+    /// 30澶╀剑閲�
+    /// </summary>
+    public List<ReceiptsDetail> ChannlesRakeList { get; set; } = new List<ReceiptsDetail> { };
+}
+
+public class ChannelDataListOutPut
+{
+    /// <summary>
+    /// Top5娓犻亾鏀舵
+    /// </summary>
+    public List<ChannelDataReceive> ReceiveList { get; set; } = new List<ChannelDataReceive>();
+
+    /// <summary>
+    /// Top5娓犻亾鐢ㄦ埛
+    /// </summary>
+    public List<ChannelDataUserNumber> UserNumberList { get; set; } = new List<ChannelDataUserNumber>();
+
+}
+
+public class ChannelDataReceive
+{
+    /// <summary>
+    /// 娓犻亾鍚嶇О
+    /// </summary>
+    public string ChannelName { get; set; }
+
+    /// <summary>
+    /// 鏀舵
+    /// </summary>
+    public decimal ReceivePrice { get; set; }
+
+    /// <summary>
+    /// 浣ｉ噾
+    /// </summary>
+    public decimal ChannlesRakePrice { get; set; }
+
+}
+
+public class ChannelDataUserNumber
+{
+    /// <summary>
+    /// 娓犻亾鍚嶇О
+    /// </summary>
+    public string ChannelName { get; set; }
+
+    /// <summary>
+    /// 鐢ㄦ埛鏁伴噺
+    /// </summary>
+    public int Number { get; set; }
+
+}
+
 
 public class LifePayChannlesRakeListOutput
 {
@@ -1282,12 +1581,12 @@
     /// <summary>
     /// 缁撶畻鏃堕棿
     /// </summary>
-    public DateTime FinishTime { get; set; }
+    public DateTime? FinishTime { get; set; }
 
     /// <summary>
     /// 涓嬪崟鏃堕棿
     /// </summary>
-    public DateTime CreationTime {  set; get; }
+    public DateTime CreationTime { get; set; }
 
     /// <summary>
     /// 鎷撳睍灞炴��
@@ -1298,4 +1597,56 @@
     /// 涓嬪崟娓犻亾
     /// </summary>
     public string ChannelId { get; set; }
-}
\ No newline at end of file
+}
+public class LifePayChannlesRakeListTemplate
+{
+    [Name("搴忓彿")]
+    public int SerialNumber { get; set; }
+
+
+    /// <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; }
+}

--
Gitblit v1.9.1