From eb1da8e82cb3331f65144562479af1c9fab2d1fd Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 14:48:30 +0800
Subject: [PATCH] fix:bug修复

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  456 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 407 insertions(+), 49 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index b6de771..da36ea5 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -176,6 +176,11 @@
     public string OrderNo { get; set; }
 
     /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string RefundOrderNo { get; set; }
+
+    /// <summary>
     /// 鍏呭�奸噾棰�
     /// </summary>
     public decimal RechargeAmount { get; set; }
@@ -232,6 +237,11 @@
     public string RefundCredentialsImgUrl { get; set; }
 
     /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    public decimal? RefundPrice { get; set; }
+
+    /// <summary>
     /// 涓嬪崟鏃堕棿
     /// </summary>
     public DateTime CreationTime { get; set; }
@@ -245,6 +255,12 @@
     /// 鐢宠閫�娆惧師鍥�
     /// </summary>
     public string RefundApplyRemark { get; set; }
+
+
+    /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    public DateTime? RefundApplyTime { get; set; }
 
     /// <summary>
     /// 椹冲洖鍘熷洜
@@ -368,24 +384,47 @@
 
 }
 
-public class UserLifePayOrderOutput
-{
-    public Guid Id { get; set; }
 
-    /// <summary>
-    /// 鐢熸椿缂磋垂鏀粯绫诲瀷
-    /// </summary>
+public class LifePayRefundOrderListTemplate
+{
+
+    [Name("搴忓彿")]
+    public int SerialNumber { get; set; }
+
+    [Name("鎵嬫満鍙�")]
+    public string PhoneNumber { get; set; }
+
     public LifePayTypeEnum? LifePayType { get; set; }
 
-    /// <summary>
-    /// 璁㈠崟绫诲瀷
-    /// </summary>
     public LifePayOrderTypeEnum LifePayOrderType { get; set; }
 
+    [Name("鍏呭�肩被鍨�")]
+    public string LifePayOrderTypeStr { get; set; }
+
+    [Name("鍏呭�兼笭閬�")]
+    public string ChannelName { get; set; }
+
     /// <summary>
-    /// 璁㈠崟鍙�
+    /// 閫�娆剧敵璇锋椂闂�
     /// </summary>
-    public string OrderNo { get; set; }
+    [Name("鐢宠閫�娆炬椂闂�")]
+    public string RefundApplyTimeStr { get; set; }
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    [Name("涓嬪崟鏃堕棿")]
+    public string CreationTimeStr { get; set; }
+
+    [Name("閫�娆捐鍗曞彿")]
+    public string RefundOrderNo { get; set; }
+
+
+    [Name("鍏呭�奸噾棰�")]
+    public string RechargeAmountStr { get; set; }
+
 
     /// <summary>
     /// 鍏呭�奸噾棰�
@@ -393,66 +432,56 @@
     public decimal RechargeAmount { get; set; }
 
     /// <summary>
-    /// 浼樻儬閲戦
+    /// 瀹為檯鍒拌处閲戦
     /// </summary>
-    public decimal DiscountAmount { get; set; }
+    [Name("瀹為檯鍒拌处閲戦")]
+    public string ActualReceivedAmount { get; set; }
 
     /// <summary>
     /// 瀹炰粯閲戦
     /// </summary>
     public decimal PayAmount { get; set; }
 
-    /// <summary>
-    /// 鏀粯鏃堕棿
-    /// </summary>
-    public DateTime? PayTime { get; set; }
+    [Name("瀹炰粯閲戦")]
+    public string PayAmountStr { get; set; }
+
+    [Name("閫�娆炬笭閬�")]
+    public string LifePayTypeStr { get; set; }
 
     /// <summary>
-    /// 鏀粯鐘舵��
+    /// 閫�娆鹃噾棰�
     /// </summary>
-    public LifePayStatusEnum PayStatus { get; set; }
+    [Name("閫�娆鹃噾棰�")]
+    public decimal? RefundPrice { get; set; }
+
+
+    public ACOOLYStatusEnum ACOOLYStatus { get; set; }
 
     /// <summary>
-    /// 璁㈠崟鐘舵��
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
     /// </summary>
-    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+    [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+    public string ACOOLYStatusStr { get; set; }
+
 
     /// <summary>
     /// 瀹屾垚鏃堕棿
     /// </summary>
     public DateTime? FinishTime { get; set; }
 
-    /// <summary>
-    /// 璁㈠崟璇︾粏鏁版嵁
-    /// </summary>
-    public string OrderParamDetailJsonStr { get; set; }
 
     /// <summary>
-    /// 涓嬪崟鏃堕棿
+    /// 骞冲彴閫�娆剧姸鎬�
     /// </summary>
-    public DateTime? CreationTime { get; set; }
+    [Name("骞冲彴閫�娆剧姸鎬�")]
+    public string LifePayRefundStatus { get; set; }
 
-    /// <summary>
-    /// 閫�娆炬椂闂�
-    /// </summary>
-    public DateTime? RefundTime { get; set; }
-
-    /// <summary>
-    /// 閫�娆惧嚟璇�
-    /// </summary>
-    public string RefundCredentialsImgUrl { get; set; }
+    [Name("瀹屾垚鏃堕棿")]
+    public string FinishTimeStr { get; set; }
 
 
-    public string RefundApplyRemark { get; set; }
-
-    public string RefundCheckRemark { get; set; }
-    /// <summary>
-    /// 娓犻亾娴佹按鍙�
-    /// </summary>
-    public string ACOOLYOrderNo { get; set; }
 }
-
-public class LifePayOrderOutput
+public class UserLifePayOrderOutput
 {
     public Guid Id { get; set; }
 
@@ -541,11 +570,134 @@
     /// </summary>
     public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
 
+    /// <summary>
+    /// 骞冲彴鐘舵��
+    /// </summary>
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+}
+
+public class LifePayOrderOutput
+{
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 鐢ㄦ埛璐﹀彿
+    /// </summary>
+    public string UserPhoneNumber { get; set; }
+
+    public string UserName { get; set; }
+
+    public string LifePayChannle { get; set; }
+    /// <summary>
+    /// 鐢熸椿缂磋垂鏀粯绫诲瀷
+    /// </summary>
+    public LifePayTypeEnum? LifePayType { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+
+    /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string? RefundOrderNo { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    /// <summary>
+    /// 浼樻儬閲戦
+    /// </summary>
+    public decimal DiscountAmount { get; set; }
+
+    /// <summary>
+    /// 瀹炰粯閲戦
+    /// </summary>
+    public decimal PayAmount { get; set; }
+
+    /// <summary>
+    /// 鏀粯鏃堕棿
+    /// </summary>
+    public DateTime? PayTime { get; set; }
+
+    /// <summary>
+    /// 鏀粯鐘舵��
+    /// </summary>
+    public LifePayStatusEnum PayStatus { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayOrderStatusEnum Status { get; set; }
+
+    /// <summary>
+    /// 瀹屾垚鏃堕棿
+    /// </summary>
+    public DateTime? FinishTime { get; set; }
+
+    /// <summary>
+    /// 澶栭儴璁㈠崟鍙�
+    /// </summary>
+    public string OutOrderNo { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟璇︾粏鏁版嵁
+    /// </summary>
+    public string OrderParamDetailJsonStr { get; set; }
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime? CreationTime { get; set; }
+
+    /// <summary>
+    /// 閫�娆炬椂闂�
+    /// </summary>
+    public DateTime? RefundTime { get; set; }
+
+    /// <summary>
+    /// 閫�娆惧嚟璇�
+    /// </summary>
+    public string RefundCredentialsImgUrl { get; set; }
+
+    /// <summary>
+    /// 閫�娆惧師鍥�
+    /// </summary>
+    public string RefundApplyRemark { get; set; }
+
+    /// <summary>
+    /// 椹冲洖鍘熷洜
+    /// </summary>
+    public string RefundCheckRemark { get; set; }
+
+    /// <summary>
+    /// 娓犻亾娴佹按鍙�
+    /// </summary>
+    public string ACOOLYOrderNo { get; set; }
+
+    /// <summary>
+    /// 骞冲彴閫�娆剧姸鎬�
+    /// </summary>
+    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
 
     /// <summary>
     /// 瀹為檯鍏呭�奸噾棰�
     /// </summary>
     public decimal? ActualRechargeAmount { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal? ActualReceivedAmount { get; set; }
 
     /// <summary>
     /// 閫�娆鹃噾棰�
@@ -581,14 +733,169 @@
     /// <summary>
     /// 鎵嬬画璐规瘮渚�
     /// </summary>
-    public decimal PremiumRate { get; set; }
+    public decimal? PremiumRate { get; set; }
 
     /// <summary>
     /// 鎵嬬画璐�
     /// </summary>
     public decimal PremiumPrice { get; set; }
-}
 
+    /// <summary>
+    /// 骞冲彴鍒╂鼎
+    /// </summary>
+    public decimal? Profit { get; set; }
+
+    /// <summary>
+    /// 鍥炲崟鍦板潃
+    /// </summary>
+    public string? ElecBillUrl { get; set; }
+
+    /// <summary>
+    /// 閫�娆惧洖鍗曞湴鍧�
+    /// </summary>
+    public string? RefundElecBillUrl { get; set; }
+}
+public class LifePayRefundOrderOutput
+{
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 鐢ㄦ埛璐﹀彿
+    /// </summary>
+    public string UserPhoneNumber { get; set; }
+
+    public string UserName { get; set; }
+
+    public string LifePayChannle { get; set; }
+    /// <summary>
+    /// 鐢熸椿缂磋垂鏀粯绫诲瀷
+    /// </summary>
+    public LifePayTypeEnum? LifePayType { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    /// <summary>
+    /// 浼樻儬閲戦
+    /// </summary>
+    public decimal DiscountAmount { get; set; }
+
+    /// <summary>
+    /// 瀹炰粯閲戦
+    /// </summary>
+    public decimal PayAmount { get; set; }
+
+    /// <summary>
+    /// 鏀粯鏃堕棿
+    /// </summary>
+    public DateTime? PayTime { get; set; }
+
+    /// <summary>
+    /// 鏀粯鐘舵��
+    /// </summary>
+    public LifePayStatusEnum PayStatus { get; set; }
+
+
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayOrderStatusEnum Status { get; set; }
+
+    /// <summary>
+    /// 瀹屾垚鏃堕棿
+    /// </summary>
+    public DateTime? FinishTime { get; set; }
+
+    /// <summary>
+    /// 澶栭儴璁㈠崟鍙�
+    /// </summary>
+    public string OutOrderNo { get; set; }
+
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime? CreationTime { get; set; }
+
+    /// <summary>
+    /// 閫�娆炬椂闂�
+    /// </summary>
+    public DateTime? RefundTime { get; set; }
+
+    /// <summary>
+    /// 閫�娆惧嚟璇�
+    /// </summary>
+    public string RefundCredentialsImgUrl { get; set; }
+
+    /// <summary>
+    /// 閫�娆剧敵璇峰師鍥�
+    /// </summary>
+    public string RefundApplyRemark { get; set; }
+
+    /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    public DateTime? RefundApplyTime { get; set; }
+
+    /// <summary>
+    /// 閫�娆鹃┏鍥炲師鍥�
+    /// </summary>
+    public string RefundCheckRemark { get; set; }
+
+    /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string? RefundOrderNo { get; set; }
+
+    /// <summary>
+    /// 娓犻亾娴佹按鍙�
+    /// </summary>
+    public string ACOOLYOrderNo { get; set; }
+
+    /// <summary>
+    /// 骞冲彴閫�娆剧姸鎬�
+    /// </summary>
+    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍏呭�奸噾棰�
+    /// </summary>
+    public decimal? ActualRechargeAmount { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal? ActualReceivedAmount { get; set; }
+
+    /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    public decimal? RefundPrice { get; set; }
+
+
+    /// <summary>
+    /// 鍥炲崟鍦板潃
+    /// </summary>
+    public string? ElecBillUrl { get; set; }
+
+    /// <summary>
+    /// 閫�娆惧洖鍗曞湴鍧�
+    /// </summary>
+    public string? RefundElecBillUrl { get; set; }
+}
 public class CreateLifePayOrderOutput
 {
     public string OrderNo { get; set; }
@@ -610,6 +917,7 @@
     /// 閫�娆惧師鍥�
     /// </summary>
     public string RefundApplyRemark { get; set; }
+
 
     /// <summary>
     /// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
@@ -674,14 +982,64 @@
 public class TopStatisticsOutput
 {
     /// <summary>
+    /// 鍒涘缓鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    /// <summary>
     /// 璐︽埛浣欓
     /// </summary>
-    public string Amount { get; set; }
+    public decimal Amount { get; set; }
 
     /// <summary>
     /// 绱鏀舵
     /// </summary>
-    public string AccumulatedReceipts { get; set; }
+    public decimal AccumulatedReceipts { get; set; }
+
+    /// <summary>
+    /// 鏄ㄦ棩鏀舵
+    /// </summary>
+    public decimal ReceiptsYesterday { get; set; }
 
 
+    /// <summary>
+    /// 绱鏀跺叆
+    /// </summary>
+    public decimal AccumulatedIncome { get; set; }
+
+    /// <summary>
+    /// 绱涓嬪崟
+    /// </summary>
+    public int AccumulatedOrders { get; set; }
+
+    /// <summary>
+    /// 鏄ㄦ棩涓嬪崟
+    /// </summary>
+    public int OrdersNumYesterday { get; set; }
+
+    /// <summary>
+    /// 鏄ㄦ棩鎴愬姛
+    /// </summary>
+    public int YesterdaySuccess { get; set; }
+
+    /// <summary>
+    /// 鏄ㄦ棩澶辫触
+    /// </summary>
+    public int YesterdayFail { get; set; }
+
+    /// <summary>
+    /// 绱鐢ㄦ埛
+    /// </summary>
+    public int AccumulatedUsers { get; set; }
+
+    /// <summary>
+    /// 鏄ㄦ棩娲昏穬鐢ㄦ埛
+    /// </summary>
+    public int YesterdayActiveUsers { get; set; }
+
+}
+
+public class ChannelRateOutput
+{
+    public decimal ChannlesRate { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.1