From a099df38e66edc9e7f43212fc385db0f1169b12a Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 25 三月 2025 14:36:48 +0800
Subject: [PATCH] fix:退款导出bug
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 207 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 192 insertions(+), 15 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 54f3991..f944c9a 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -153,7 +153,7 @@
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙�
/// </summary>
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
/// <summary>
/// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -163,7 +163,7 @@
/// <summary>
/// 娓犻亾鍚嶇О
/// </summary>
- public string ChannelName { get; set; }
+ public string? ChannelName { get; set; }
/// <summary>
/// 璁㈠崟绫诲瀷
@@ -174,6 +174,11 @@
/// 璁㈠崟鍙�
/// </summary>
public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
/// <summary>
/// 鍏呭�奸噾棰�
@@ -276,6 +281,13 @@
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal ActualReceivedAmount { get; set; }
+
+ public LifePayStatusEnum? ActualReceivedStatus { get; set; }
}
public class LifePayOrderListTemplate
@@ -317,6 +329,14 @@
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; }
@@ -344,6 +364,30 @@
public string ACOOLYOrderNo { get; set; }
/// <summary>
+ /// 骞冲彴鎵ｆ閲戦
+ /// </summary>
+ [Name("骞冲彴鎵ｆ閲戦")]
+ public decimal PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ [Name("骞冲彴閫�娆剧姸鎬�")]
+ public string? LifePayRefundStatusStr { get; set; }
+
+
+
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+ public string? ACOOLYStatusStr { get; set; }
+
+ /// <summary>
/// 鏀粯鐘舵��
/// </summary>
public LifePayStatusEnum PayStatus { get; set; }
@@ -354,16 +398,16 @@
[Name("鏀粯娓犻亾娴佹按鍙�")]
public string OutOrderNo { get; set; }
- [Name("閫�娆剧敵璇�")]
- public string RefundApplyRemark { get; set; }
+ //[Name("閫�娆剧敵璇�")]
+ //public string RefundApplyRemark { get; set; }
- /// <summary>
- /// 璁㈠崟鐘舵��
- /// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ ///// <summary>
+ ///// 璁㈠崟鐘舵��
+ ///// </summary>
+ //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
- [Name("璁㈠崟鐘舵��")]
- public string LifePayOrderStatusStr { get; set; }
+ //[Name("璁㈠崟鐘舵��")]
+ //public string LifePayOrderStatusStr { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -379,6 +423,113 @@
}
+
+public class LifePayRefundOrderListTemplate
+{
+
+ [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; }
+
+ [Name("鍏呭�兼笭閬�")]
+ public string? ChannelName { get; set; }
+
+
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ [Name("鐢宠閫�娆炬椂闂�")]
+ public string? RefundApplyTimeStr { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+
+ [Name("閫�娆捐鍗曞彿")]
+ public string? RefundOrderNo { get; set; }
+
+
+ [Name("閫�娆剧敵璇�")]
+ public string? RefundApplyRemark { get; set; }
+
+ [Name("鍏呭�奸噾棰�")]
+ public string? RechargeAmountStr { get; set; }
+
+
+ /// <summary>
+ /// 鍏呭�奸噾棰�
+ /// </summary>
+ public decimal RechargeAmount { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ [Name("瀹為檯鍒拌处閲戦")]
+ public string? ActualReceivedAmount { get; set; }
+
+ /// <summary>
+ /// 瀹炰粯閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+ [Name("瀹炰粯閲戦")]
+ public string? PayAmountStr { get; set; }
+
+ [Name("閫�娆炬笭閬�")]
+ public string LifePayTypeStr { get; set; }
+
+ /// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ [Name("閫�娆鹃噾棰�")]
+ public decimal? RefundPrice { get; set; }
+
+
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+ public string? ACOOLYStatusStr { get; set; }
+
+
+ /// <summary>
+ /// 瀹屾垚鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ [Name("骞冲彴閫�娆剧姸鎬�")]
+ public string? LifePayRefundStatusStr { get; set; }
+
+ [Name("瀹屾垚鏃堕棿")]
+ public string? FinishTimeStr { get; set; }
+
+
+}
public class UserLifePayOrderOutput
{
public Guid Id { get; set; }
@@ -449,6 +600,11 @@
public DateTime? RefundTime { get; set; }
/// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
+
+ /// <summary>
/// 閫�娆惧嚟璇�
/// </summary>
public string RefundCredentialsImgUrl { get; set; }
@@ -457,10 +613,21 @@
public string RefundApplyRemark { get; set; }
public string RefundCheckRemark { get; set; }
+
/// <summary>
/// 娓犻亾娴佹按鍙�
/// </summary>
public string ACOOLYOrderNo { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鐘舵��
+ /// </summary>
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
}
public class LifePayOrderOutput
@@ -620,7 +787,7 @@
/// <summary>
/// 鎵嬬画璐规瘮渚�
/// </summary>
- public decimal PremiumRate { get; set; }
+ public decimal? PremiumRate { get; set; }
/// <summary>
/// 鎵嬬画璐�
@@ -869,6 +1036,11 @@
public class TopStatisticsOutput
{
/// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
/// 璐︽埛浣欓
/// </summary>
public decimal Amount { get; set; }
@@ -881,7 +1053,7 @@
/// <summary>
/// 鏄ㄦ棩鏀舵
/// </summary>
- public decimal ReceiptsYesterda { get; set; }
+ public decimal ReceiptsYesterday { get; set; }
/// <summary>
@@ -897,17 +1069,17 @@
/// <summary>
/// 鏄ㄦ棩涓嬪崟
/// </summary>
- public int OrdersNumYesterda { get; set; }
+ public int OrdersNumYesterday { get; set; }
/// <summary>
/// 鏄ㄦ棩鎴愬姛
/// </summary>
- public int YesterdaSuccess { get; set; }
+ public int YesterdaySuccess { get; set; }
/// <summary>
/// 鏄ㄦ棩澶辫触
/// </summary>
- public int YesterdaFail { get; set; }
+ public int YesterdayFail { get; set; }
/// <summary>
/// 绱鐢ㄦ埛
@@ -919,4 +1091,9 @@
/// </summary>
public int YesterdayActiveUsers { get; set; }
+}
+
+public class ChannelRateOutput
+{
+ public decimal ChannlesRate { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.1