From e8f296f3017d46efb1018b8d8270c8db75c961d4 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 15:24:10 +0800
Subject: [PATCH] fix；bug修复

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 658 insertions(+), 3 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 2a06944..96a1397 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1,5 +1,6 @@
 锘縰sing LifePayment.Domain.Shared;
 using System;
+using System.Collections.Generic;
 using ZeroD.Base.Web.Models;
 
 namespace LifePayment.Application.Contracts;
@@ -21,6 +22,98 @@
 
     public Guid? Id { get; set; }
 }
+public class LifePayPremiumInput
+{
+    public LifePayTypeEnum PremiumType { get; set; }
+
+    public decimal Rate { get; set; }
+
+    public Guid? Id { get; set; }
+}
+
+public class LifePayIntroInfoInput
+{
+    /// <summary>
+    /// 鐢熸椿缂磋垂绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum LifePayType { get; set; }
+
+    /// <summary>
+    /// 鏇存柊鍐呭
+    /// </summary>
+    public List<LifePayIntroInfoDetail> Data { get; set; }
+}
+
+public class LifePayIntroInfoDetail
+{
+    /// <summary>
+    /// 绫诲瀷
+    /// </summary>
+    public IntroInfoTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// 鎽樿
+    /// </summary>
+    public string ContentSummary { get; set; }
+
+    /// <summary>
+    /// 鏂囨湰鍐呭
+    /// </summary>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 鍥剧墖/瑙嗛璺緞
+    /// </summary>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int Sequence { get; set; }
+}
+
+public class LifePayPremiumListOutput
+{
+    public LifePayTypeEnum PremiumType { get; set; }
+
+    public decimal Rate { get; set; }
+
+    public Guid Id { get; set; }
+}
+
+public class LifePayIntroInfoOutput
+{
+    /// <summary>
+    /// 绫诲瀷
+    /// </summary>
+    public IntroInfoTypeEnum Type { get; set; }
+
+
+    /// <summary>
+    /// 鐢熸椿缂磋垂绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum LifePayType { get; set; }
+
+    /// <summary>
+    /// 鎽樿
+    /// </summary>
+    public string ContentSummary { get; set; }
+
+    /// <summary>
+    /// 鏂囨湰鍐呭
+    /// </summary>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 鍥剧墖/瑙嗛璺緞
+    /// </summary>
+    public string Path { get; set; }
+
+    /// <summary>
+    /// 鎺掑簭
+    /// </summary>
+    public int Sequence { get; set; }
+}
 
 public class UserListOutput
 {
@@ -30,6 +123,21 @@
     /// 鐢ㄦ埛鎵嬫満鍙�
     /// </summary>
     public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// 濮撳悕
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 鏈�鍚庣櫥褰曟笭閬�
+    /// </summary>
+    public string? CreationChannle { get; set; }
+
+    /// <summary>
+    /// 鏈�鍚庣櫥褰曟笭閬�
+    /// </summary>
+    public string? LastLoginChannle { get; set; }
 
     public DateTime? LastLoginTime { get; set; }
 
@@ -45,7 +153,7 @@
     /// <summary>
     /// 鐢ㄦ埛鎵嬫満鍙�
     /// </summary>
-    public string PhoneNumber { get; set; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -55,7 +163,7 @@
     /// <summary>
     /// 娓犻亾鍚嶇О
     /// </summary>
-    public string ChannelName { get; set; }
+    public string? ChannelName { get; set; }
 
     /// <summary>
     /// 璁㈠崟绫诲瀷
@@ -68,9 +176,19 @@
     public string OrderNo { get; set; }
 
     /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string? RefundOrderNo { get; set; }
+
+    /// <summary>
     /// 鍏呭�奸噾棰�
     /// </summary>
     public decimal RechargeAmount { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍏呭�奸噾棰�
+    /// </summary>
+    public decimal? ActualRechargeAmount { get; set; }
 
     /// <summary>
     /// 浼樻儬閲戦
@@ -86,6 +204,12 @@
     /// 鏀粯鏃堕棿
     /// </summary>
     public DateTime? PayTime { get; set; }
+
+
+    /// <summary>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </summary>
+    public decimal? PlatformDeductionAmount { get; set; }
 
     /// <summary>
     /// 鏀粯鐘舵��
@@ -113,6 +237,11 @@
     public string RefundCredentialsImgUrl { get; set; }
 
     /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    public decimal? RefundPrice { get; set; }
+
+    /// <summary>
     /// 涓嬪崟鏃堕棿
     /// </summary>
     public DateTime CreationTime { get; set; }
@@ -122,13 +251,43 @@
     /// </summary>
     public DateTime? RefundTime { 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 ACOOLYOrderNo { get; set; }
 
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 骞冲彴閫�娆剧姸鎬�
+    /// </summary>
+    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal ActualReceivedAmount { get; set; }
+
+    public LifePayStatusEnum? ActualReceivedStatus { get; set; }
 }
 
 public class LifePayOrderListTemplate
@@ -232,6 +391,105 @@
 
 }
 
+
+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>
+    [Name("鐢宠閫�娆炬椂闂�")]
+    public string? RefundApplyTimeStr { get; set; }
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    [Name("涓嬪崟鏃堕棿")]
+    public string? CreationTimeStr { get; set; }
+
+    [Name("閫�娆捐鍗曞彿")]
+    public string? RefundOrderNo { 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; }
@@ -310,12 +568,343 @@
     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
+{
+    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? RefundOrderNo { 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 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; }
+
+    /// <summary>
+    /// 閫�娆惧師鍥�
+    /// </summary>
+    public string RefundApplyRemark { get; set; }
+
+    /// <summary>
+    /// 椹冲洖鍘熷洜
+    /// </summary>
+    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? ActualReceivedAmount { get; set; }
+
+    /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    public decimal? RefundPrice { get; set; }
+
+    /// <summary>
+    /// 骞冲彴鎶樻墸姣斾緥
+    /// </summary>
+    public decimal? PlatformRate { get; set; }
+
+    /// <summary>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </summary>
+    public decimal? PlatformPrice { get; set; }
+
+    /// <summary>
+    /// 娓犻亾鎶樻墸
+    /// </summary>
+    public decimal? ChannleRate { get; set; }
+
+
+    /// <summary>
+    /// 娓犻亾浣ｉ噾姣斾緥
+    /// </summary>
+    public decimal? ChannlesRakeRate { get; set; }
+
+    /// <summary>
+    /// 娓犻亾浣ｉ噾
+    /// </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; }
+
+    /// <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; }
@@ -337,6 +926,7 @@
     /// 閫�娆惧師鍥�
     /// </summary>
     public string RefundApplyRemark { get; set; }
+
 
     /// <summary>
     /// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
@@ -396,4 +986,69 @@
     public DateTime CreationTime { get; set; }
 
     public bool IsDeleted { get; set; }
+}
+
+public class TopStatisticsOutput
+{
+    /// <summary>
+    /// 鍒涘缓鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    /// <summary>
+    /// 璐︽埛浣欓
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// 绱鏀舵
+    /// </summary>
+    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; }
 }
\ No newline at end of file

--
Gitblit v1.9.1