From 41d5a89660d5d276c06c31670ce483285a7018cc Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 17:14:32 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 313 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 38e0d09..a56a2db 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -125,14 +125,19 @@
public string PhoneNumber { get; set; }
/// <summary>
- /// 鏈�鍚庣櫥褰曟笭閬�
+ /// 濮撳悕
/// </summary>
- public string CreationChannle { get; set; }
+ public string Name { get; set; }
/// <summary>
/// 鏈�鍚庣櫥褰曟笭閬�
/// </summary>
- public string LastLoginChannle { get; set; }
+ public string? CreationChannle { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庣櫥褰曟笭閬�
+ /// </summary>
+ public string? LastLoginChannle { get; set; }
public DateTime? LastLoginTime { get; set; }
@@ -176,6 +181,11 @@
public decimal RechargeAmount { get; set; }
/// <summary>
+ /// 瀹為檯鍏呭�奸噾棰�
+ /// </summary>
+ public decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
/// 浼樻儬閲戦
/// </summary>
public decimal DiscountAmount { get; set; }
@@ -189,6 +199,12 @@
/// 鏀粯鏃堕棿
/// </summary>
public DateTime? PayTime { get; set; }
+
+
+ /// <summary>
+ /// 骞冲彴鎵f閲戦
+ /// </summary>
+ public decimal? PlatformDeductionAmount { get; set; }
/// <summary>
/// 鏀粯鐘舵��
@@ -225,13 +241,30 @@
/// </summary>
public DateTime? RefundTime { 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 ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
}
public class LifePayOrderListTemplate
@@ -419,6 +452,267 @@
public string ACOOLYOrderNo { 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 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 LifePayOrderStatus { 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; }
+
+
+ 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 decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎶樻墸姣斾緥
+ /// </summary>
+ public decimal? PlatformRate { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵f閲戦
+ /// </summary>
+ public decimal? PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鎶樻墸
+ /// </summary>
+ public decimal? ChannleRate { get; set; }
+
+
+ /// <summary>
+ /// 娓犻亾浣i噾姣斾緥
+ /// </summary>
+ public decimal? ChannlesRakeRate { get; set; }
+
+ /// <summary>
+ /// 娓犻亾浣i噾
+ /// </summary>
+ public decimal? ChannlesRakePrice { get; set; }
+
+ /// <summary>
+ /// 鎵嬬画璐规瘮渚�
+ /// </summary>
+ public decimal PremiumRate { get; set; }
+
+ /// <summary>
+ /// 鎵嬬画璐�
+ /// </summary>
+ public decimal PremiumPrice { get; set; }
+ /// <summary>
+ /// 骞冲彴鍒╂鼎
+ /// </summary>
+ public decimal? Profit { 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 LifePayOrderStatus { 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; }
+
+
+ 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 decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+}
public class CreateLifePayOrderOutput
{
public string OrderNo { get; set; }
@@ -499,4 +793,19 @@
public DateTime CreationTime { get; set; }
public bool IsDeleted { get; set; }
+}
+
+public class TopStatisticsOutput
+{
+ /// <summary>
+ /// 璐︽埛浣欓
+ /// </summary>
+ public string Amount { get; set; }
+
+ /// <summary>
+ /// 绱鏀舵
+ /// </summary>
+ public string AccumulatedReceipts { get; set; }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1