From e452d5b2384236c1ccc9031dec6cadcddbbb585a Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 15:54:11 +0800
Subject: [PATCH] fix:提交
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 252 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 246 insertions(+), 6 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index b6de771..cb59958 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>
/// 椹冲洖鍘熷洜
@@ -457,6 +468,14 @@
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; }
@@ -465,6 +484,12 @@
/// 璁㈠崟绫诲瀷
/// </summary>
public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
/// <summary>
/// 璁㈠崟鍙�
@@ -499,12 +524,17 @@
/// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ public LifePayOrderStatusEnum Status { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
/// </summary>
public DateTime? FinishTime { get; set; }
+
+ /// <summary>
+ /// 澶栭儴璁㈠崟鍙�
+ /// </summary>
+ public string OutOrderNo { get; set; }
/// <summary>
/// 璁㈠崟璇︾粏鏁版嵁
@@ -526,9 +556,14 @@
/// </summary>
public string RefundCredentialsImgUrl { get; set; }
-
+ /// <summary>
+ /// 閫�娆惧師鍥�
+ /// </summary>
public string RefundApplyRemark { get; set; }
+ /// <summary>
+ /// 椹冲洖鍘熷洜
+ /// </summary>
public string RefundCheckRemark { get; set; }
/// <summary>
@@ -541,11 +576,15 @@
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
-
/// <summary>
/// 瀹為檯鍏呭�奸噾棰�
/// </summary>
public decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
/// <summary>
/// 閫�娆鹃噾棰�
@@ -587,8 +626,163 @@
/// 鎵嬬画璐�
/// </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 +804,7 @@
/// 閫�娆惧師鍥�
/// </summary>
public string RefundApplyRemark { get; set; }
+
/// <summary>
/// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
@@ -674,14 +869,59 @@
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; }
}
\ No newline at end of file
--
Gitblit v1.9.1