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 | 195 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 182 insertions(+), 13 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 4c1531b..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,7 +1228,10 @@
/// </summary>
public int YesterdayActiveUsers { get; set; }
-
+ /// <summary>
+ /// 绱浣ｉ噾
+ /// </summary>
+ public decimal AccumulatedChannlesRakePrice { get; set; }
}
public class ChannelRateOutput
@@ -1111,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>
@@ -1160,20 +1308,26 @@
/// </summary>
public Guid Id { get; set; }
- // <summary>
+ /// <summary>
/// 骞冲彴璁㈠崟鍙�
/// </summary>
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>
/// 璁拌处鏃堕棿
@@ -1209,6 +1363,11 @@
public Guid UserId { get; set; }
/// <summary>
+ /// 鎺ㄥ箍鍛業D
+ /// </summary>
+ public string PromoterIdNumber { get; set; }
+
+ /// <summary>
/// 鏄惁鏄悗鍙扮敤鎴�
/// </summary>
public bool IsBackClientUser { get; set; }
@@ -1226,6 +1385,8 @@
public string ChannlesNum { get; set; }
public Guid ChannlesId { get; set; }
+
+ public LifePaySwitchTypeEnum SwitchType { get; set; }
}
public class BackClientUserInfoOutput
@@ -1332,6 +1493,14 @@
public decimal Amount { get; set; }
}
+public class ChannlesRakeListOutPut
+{
+ /// <summary>
+ /// 30澶╀剑閲�
+ /// </summary>
+ public List<ReceiptsDetail> ChannlesRakeList { get; set; } = new List<ReceiptsDetail> { };
+}
+
public class ChannelDataListOutPut
{
/// <summary>
@@ -1349,9 +1518,9 @@
public class ChannelDataReceive
{
/// <summary>
- /// 娓犻亾缂栧彿
+ /// 娓犻亾鍚嶇О
/// </summary>
- public string ChannelId { get; set; }
+ public string ChannelName { get; set; }
/// <summary>
/// 鏀舵
@@ -1368,9 +1537,9 @@
public class ChannelDataUserNumber
{
/// <summary>
- /// 娓犻亾缂栧彿
+ /// 娓犻亾鍚嶇О
/// </summary>
- public string ChannelId { get; set; }
+ public string ChannelName { get; set; }
/// <summary>
/// 鐢ㄦ埛鏁伴噺
@@ -1412,7 +1581,7 @@
/// <summary>
/// 缁撶畻鏃堕棿
/// </summary>
- public DateTime FinishTime { get; set; }
+ public DateTime? FinishTime { get; set; }
/// <summary>
/// 涓嬪崟鏃堕棿
@@ -1476,7 +1645,7 @@
/// <summary>
/// 缁撶畻鏃堕棿
/// </summary>
- public DateTime FinishTime { get; set; }
+ public DateTime? FinishTime { get; set; }
[Name("缁撶畻鏃堕棿")]
public string FinishTimeStr { get; set; }
--
Gitblit v1.9.1