From bda2679db0d10a0328a71ff4f55f000d26ef10dc Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期五, 21 三月 2025 14:51:32 +0800 Subject: [PATCH] fix:bug修复 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 126 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 118 insertions(+), 8 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs index ed35d68..54f3991 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs @@ -232,6 +232,11 @@ public string RefundCredentialsImgUrl { get; set; } /// <summary> + /// 閫�娆鹃噾棰� + /// </summary> + public decimal? RefundPrice { get; set; } + + /// <summary> /// 涓嬪崟鏃堕棿 /// </summary> public DateTime CreationTime { get; set; } @@ -245,6 +250,12 @@ /// 鐢宠閫�娆惧師鍥� /// </summary> public string RefundApplyRemark { get; set; } + + + /// <summary> + /// 閫�娆剧敵璇锋椂闂� + /// </summary> + public DateTime? RefundApplyTime { get; set; } /// <summary> /// 椹冲洖鍘熷洜 @@ -474,6 +485,12 @@ /// </summary> public LifePayOrderTypeEnum LifePayOrderType { get; set; } + + /// <summary> + /// 閫�娆捐鍗曞彿 + /// </summary> + public string? RefundOrderNo { get; set; } + /// <summary> /// 璁㈠崟鍙� /// </summary> @@ -507,7 +524,7 @@ /// <summary> /// 璁㈠崟鐘舵�� /// </summary> - public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + public LifePayOrderStatusEnum Status { get; set; } /// <summary> /// 瀹屾垚鏃堕棿 @@ -539,9 +556,14 @@ /// </summary> public string RefundCredentialsImgUrl { get; set; } - + /// <summary> + /// 閫�娆惧師鍥� + /// </summary> public string RefundApplyRemark { get; set; } + /// <summary> + /// 椹冲洖鍘熷洜 + /// </summary> public string RefundCheckRemark { get; set; } /// <summary> @@ -554,11 +576,15 @@ /// </summary> public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } - /// <summary> /// 瀹為檯鍏呭�奸噾棰� /// </summary> public decimal? ActualRechargeAmount { get; set; } + + /// <summary> + /// 瀹為檯鍒拌处閲戦 + /// </summary> + public decimal? ActualReceivedAmount { get; set; } /// <summary> /// 閫�娆鹃噾棰� @@ -600,10 +626,21 @@ /// 鎵嬬画璐� /// </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 { @@ -657,10 +694,12 @@ /// </summary> public LifePayStatusEnum PayStatus { get; set; } + + /// <summary> /// 璁㈠崟鐘舵�� /// </summary> - public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + public LifePayOrderStatusEnum Status { get; set; } /// <summary> /// 瀹屾垚鏃堕棿 @@ -688,10 +727,25 @@ /// </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> /// 娓犻亾娴佹按鍙� @@ -703,16 +757,31 @@ /// </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 { @@ -735,6 +804,7 @@ /// 閫�娆惧師鍥� /// </summary> public string RefundApplyRemark { get; set; } + /// <summary> /// 鍚庡彴濉啓鐨勯┏鍥炲師鍥� @@ -801,12 +871,52 @@ /// <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 ReceiptsYesterda { get; set; } + + + /// <summary> + /// 绱鏀跺叆 + /// </summary> + public decimal AccumulatedIncome { get; set; } + + /// <summary> + /// 绱涓嬪崟 + /// </summary> + public int AccumulatedOrders { get; set; } + + /// <summary> + /// 鏄ㄦ棩涓嬪崟 + /// </summary> + public int OrdersNumYesterda { get; set; } + + /// <summary> + /// 鏄ㄦ棩鎴愬姛 + /// </summary> + public int YesterdaSuccess { get; set; } + + /// <summary> + /// 鏄ㄦ棩澶辫触 + /// </summary> + public int YesterdaFail { get; set; } + + /// <summary> + /// 绱鐢ㄦ埛 + /// </summary> + public int AccumulatedUsers { get; set; } + + /// <summary> + /// 鏄ㄦ棩娲昏穬鐢ㄦ埛 + /// </summary> + public int YesterdayActiveUsers { get; set; } } \ No newline at end of file -- Gitblit v1.9.1