From ec35e51418e1daaa129ba6bf72312cda19e4778a Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 17:27:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 40853ad..88dfae2 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -620,7 +620,7 @@
/// <summary>
/// 鎵嬬画璐规瘮渚�
/// </summary>
- public decimal PremiumRate { get; set; }
+ public decimal? PremiumRate { get; set; }
/// <summary>
/// 鎵嬬画璐�
@@ -763,6 +763,11 @@
public decimal? ActualRechargeAmount { get; set; }
/// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ /// <summary>
/// 閫�娆鹃噾棰�
/// </summary>
public decimal? RefundPrice { get; set; }
@@ -864,48 +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 string ReceiptsYesterda { get; set; }
+ public decimal ReceiptsYesterday { get; set; }
+
+
+ /// <summary>
+ /// 绱鏀跺叆
+ /// </summary>
+ public decimal AccumulatedIncome { get; set; }
/// <summary>
/// 绱涓嬪崟
/// </summary>
- public string AccumulatedOrders { get; set; }
+ public int AccumulatedOrders { get; set; }
/// <summary>
/// 鏄ㄦ棩涓嬪崟
/// </summary>
- public string OrdersNumYesterda { get; set; }
+ public int OrdersNumYesterday { get; set; }
/// <summary>
/// 鏄ㄦ棩鎴愬姛
/// </summary>
- public string YesterdaSuccess { get; set; }
+ public int YesterdaySuccess { get; set; }
/// <summary>
/// 鏄ㄦ棩澶辫触
/// </summary>
- public string YesterdaFail { get; set; }
+ public int YesterdayFail { get; set; }
/// <summary>
/// 绱鐢ㄦ埛
/// </summary>
- public string AccumulatedUsers { get; set; }
+ public int AccumulatedUsers { get; set; }
/// <summary>
/// 鏄ㄦ棩娲昏穬鐢ㄦ埛
/// </summary>
- public string YesterdayActiveUsers { get; set; }
+ public int YesterdayActiveUsers { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.1