From 0eeebd371df03fe1f25f7389ab1fec66efcee2ef Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 14:23:44 +0800
Subject: [PATCH] fix:充值流水

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  383 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 363 insertions(+), 20 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index ed35d68..be0014f 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using ZeroD.Base.Web.Models;
+using ZeroD.Util;
 
 namespace LifePayment.Application.Contracts;
 
@@ -153,7 +154,7 @@
     /// <summary>
     /// 鐢ㄦ埛鎵嬫満鍙�
     /// </summary>
-    public string PhoneNumber { get; set; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -163,7 +164,7 @@
     /// <summary>
     /// 娓犻亾鍚嶇О
     /// </summary>
-    public string ChannelName { get; set; }
+    public string? ChannelName { get; set; }
 
     /// <summary>
     /// 璁㈠崟绫诲瀷
@@ -174,6 +175,11 @@
     /// 璁㈠崟鍙�
     /// </summary>
     public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string? RefundOrderNo { get; set; }
 
     /// <summary>
     /// 鍏呭�奸噾棰�
@@ -232,6 +238,11 @@
     public string RefundCredentialsImgUrl { get; set; }
 
     /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    public decimal? RefundPrice { get; set; }
+
+    /// <summary>
     /// 涓嬪崟鏃堕棿
     /// </summary>
     public DateTime CreationTime { get; set; }
@@ -245,6 +256,12 @@
     /// 鐢宠閫�娆惧師鍥�
     /// </summary>
     public string RefundApplyRemark { get; set; }
+
+
+    /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    public DateTime? RefundApplyTime { get; set; }
 
     /// <summary>
     /// 椹冲洖鍘熷洜
@@ -265,6 +282,13 @@
     /// 骞冲彴閫�娆剧姸鎬�
     /// </summary>
     public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal ActualReceivedAmount { get; set; }
+
+    public LifePayStatusEnum? ActualReceivedStatus { get; set; }
 }
 
 public class LifePayOrderListTemplate
@@ -306,6 +330,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; }
@@ -333,6 +365,36 @@
     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; }
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    [Name("骞冲彴璁㈠崟鐘舵��")]
+    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+
+
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+    public string? ACOOLYStatusStr { get; set; }
+
+    /// <summary>
     /// 鏀粯鐘舵��
     /// </summary>
     public LifePayStatusEnum PayStatus { get; set; }
@@ -343,15 +405,15 @@
     [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("璁㈠崟鐘舵��")]
+    [Name("骞冲彴璁㈠崟鐘舵��")]
     public string LifePayOrderStatusStr { get; set; }
 
     /// <summary>
@@ -364,10 +426,115 @@
 
 
 
-    
-
 }
 
+
+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; }
@@ -438,6 +605,11 @@
     public DateTime? RefundTime { get; set; }
 
     /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    public DateTime? RefundApplyTime { get; set; }
+
+    /// <summary>
     /// 閫�娆惧嚟璇�
     /// </summary>
     public string RefundCredentialsImgUrl { get; set; }
@@ -446,10 +618,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
@@ -473,6 +656,12 @@
     /// 璁㈠崟绫诲瀷
     /// </summary>
     public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+
+    /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string? RefundOrderNo { get; set; }
 
     /// <summary>
     /// 璁㈠崟鍙�
@@ -507,7 +696,7 @@
     /// <summary>
     /// 璁㈠崟鐘舵��
     /// </summary>
-    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+    public LifePayOrderStatusEnum Status { get; set; }
 
     /// <summary>
     /// 瀹屾垚鏃堕棿
@@ -539,9 +728,14 @@
     /// </summary>
     public string RefundCredentialsImgUrl { get; set; }
 
-
+    /// <summary>
+    /// 閫�娆惧師鍥�
+    /// </summary>
     public string RefundApplyRemark { get; set; }
 
+    /// <summary>
+    /// 椹冲洖鍘熷洜
+    /// </summary>
     public string RefundCheckRemark { get; set; }
 
     /// <summary>
@@ -554,11 +748,15 @@
     /// </summary>
     public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
 
-
     /// <summary>
     /// 瀹為檯鍏呭�奸噾棰�
     /// </summary>
     public decimal? ActualRechargeAmount { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal? ActualReceivedAmount { get; set; }
 
     /// <summary>
     /// 閫�娆鹃噾棰�
@@ -594,16 +792,27 @@
     /// <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
 {
@@ -657,10 +866,12 @@
     /// </summary>
     public LifePayStatusEnum PayStatus { get; set; }
 
+
+
     /// <summary>
     /// 璁㈠崟鐘舵��
     /// </summary>
-    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+    public LifePayOrderStatusEnum Status { get; set; }
 
     /// <summary>
     /// 瀹屾垚鏃堕棿
@@ -688,10 +899,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 +929,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 +976,7 @@
     /// 閫�娆惧師鍥�
     /// </summary>
     public string RefundApplyRemark { get; set; }
+
 
     /// <summary>
     /// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
@@ -799,14 +1041,115 @@
 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; }
+}
+
+public class OnlineServiceInput
+{
+    /// <summary>
+    /// 鍦ㄧ嚎瀹㈡湇閾炬帴
+    /// </summary>
+    public string Link { get; set; }
+}
+public class LifePayRechargeReceiptsPageOutput<T> : PageOutputBase
+{
+
+    public List<T> Data { get; set; } = new List<T>();
+
+    /// <summary>
+    /// 绱鍏呭��
+    /// </summary>
+    public decimal TotalRechargeAmount { get; set; }
+}
+
+public class LifePayRechargeReceiptsListOutput
+{
+    /// <summary>
+    /// 缂栧彿
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 涓氬姟璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    /// <summary>
+    /// 澶囨敞
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 鍑瘉
+    /// </summary>
+    public string Voucher { get; set; }
+
+    /// <summary>
+    /// 璁拌处鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.1