From fbd573b5d2d05cac61d2184064bb5dd18d0fe61f Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 16:48:48 +0800
Subject: [PATCH] fix:退款订单号bug修复

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  638 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 634 insertions(+), 4 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 62aed58..ed35d68 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1,10 +1,7 @@
 锘縰sing LifePayment.Domain.Shared;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ZeroD.Util;
+using ZeroD.Base.Web.Models;
 
 namespace LifePayment.Application.Contracts;
 
@@ -13,6 +10,109 @@
     public LifePayRateTypeEnum RateType { get; set; }
 
     public decimal Rate { get; set; }
+
+    public Guid Id { get; set; }
+}
+
+public class LifePayRateInput
+{
+    public LifePayRateTypeEnum RateType { get; set; }
+
+    public decimal Rate { get; set; }
+
+    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
@@ -23,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; }
 
@@ -46,6 +161,11 @@
     public LifePayTypeEnum? LifePayType { get; set; }
 
     /// <summary>
+    /// 娓犻亾鍚嶇О
+    /// </summary>
+    public string ChannelName { get; set; }
+
+    /// <summary>
     /// 璁㈠崟绫诲瀷
     /// </summary>
     public LifePayOrderTypeEnum LifePayOrderType { get; set; }
@@ -61,6 +181,11 @@
     public decimal RechargeAmount { get; set; }
 
     /// <summary>
+    /// 瀹為檯鍏呭�奸噾棰�
+    /// </summary>
+    public decimal? ActualRechargeAmount { get; set; }
+
+    /// <summary>
     /// 浼樻儬閲戦
     /// </summary>
     public decimal DiscountAmount { get; set; }
@@ -74,6 +199,12 @@
     /// 鏀粯鏃堕棿
     /// </summary>
     public DateTime? PayTime { get; set; }
+
+
+    /// <summary>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </summary>
+    public decimal? PlatformDeductionAmount { get; set; }
 
     /// <summary>
     /// 鏀粯鐘舵��
@@ -104,6 +235,137 @@
     /// 涓嬪崟鏃堕棿
     /// </summary>
     public DateTime CreationTime { get; set; }
+
+    /// <summary>
+    /// 閫�娆炬椂闂�
+    /// </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
+{
+
+    [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 CreationTime { get; set; }
+
+    [Name("涓嬪崟鏃堕棿")]
+    public string CreationTimeStr { get; set; }
+
+    [Name("骞冲彴璁㈠崟鍙�")]
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    [Name("鍏呭�奸噾棰�")]
+    public string RechargeAmountStr { get; set; }
+
+    /// <summary>
+    /// 浼樻儬閲戦
+    /// </summary>
+    public decimal DiscountAmount { get; set; }
+
+    /// <summary>
+    /// 瀹炰粯閲戦
+    /// </summary>
+    public decimal PayAmount { get; set; }
+
+    [Name("瀹炰粯閲戦")]
+    public string PayAmountStr { get; set; }
+
+    /// <summary>
+    /// 鏀粯鏃堕棿
+    /// </summary>
+    public DateTime? PayTime { get; set; }
+
+    [Name("鏀粯鏃堕棿")]
+    public string PayTimeStr { get; set; }
+
+    [Name("鏀粯娓犻亾")]
+    public string LifePayTypeStr { get; set; }
+
+    [Name("澶栭儴璁㈠崟鍙�")]
+    public string ACOOLYOrderNo { get; set; }
+
+    /// <summary>
+    /// 鏀粯鐘舵��
+    /// </summary>
+    public LifePayStatusEnum PayStatus { get; set; }
+
+    [Name("鏀粯鐘舵��")]
+    public string PayStatusStr { get; set; }
+
+    [Name("鏀粯娓犻亾娴佹按鍙�")]
+    public string OutOrderNo { get; set; }
+
+    [Name("閫�娆剧敵璇�")]
+    public string RefundApplyRemark { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+    [Name("璁㈠崟鐘舵��")]
+    public string LifePayOrderStatusStr { get; set; }
+
+    /// <summary>
+    /// 瀹屾垚鏃堕棿
+    /// </summary>
+    public DateTime? FinishTime { get; set; }
+
+    [Name("瀹屾垚鏃堕棿")]
+    public string FinishTimeStr { get; set; }
+
+
+
+    
+
 }
 
 public class UserLifePayOrderOutput
@@ -174,9 +436,377 @@
     /// 閫�娆炬椂闂�
     /// </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; }
 }
 
+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>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </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; }
+}
+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; }
+}
+
+public class UserLifePayOrderRefundOutput
+{
+    /// <summary>
+    /// 璁㈠崟缂栧彿
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 閫�娆惧師鍥�
+    /// </summary>
+    public string RefundApplyRemark { get; set; }
+
+    /// <summary>
+    /// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
+    /// </summary>
+    public string RefundCheckRemark { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+}
+
+public class UserAccountOutput
+{
+
+    public Guid Id { get; set; }
+
+
+    /// <summary>
+    /// 鐢熸椿缂磋垂绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum LifePayType { get; set; }
+
+    /// <summary>
+    /// 杩愯惀鍟�
+    /// </summary>
+    public string Operators { get; set; }
+
+    /// <summary>
+    /// 鎵嬫満鍙�/鎴峰彿
+    /// </summary>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 鐪�
+    /// </summary>
+    public string Province { get; set; }
+
+    /// <summary>
+    /// 甯�
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// 鎷撳睍瀛楁锛堢數璐圭被鍨嬶級
+    /// </summary>
+    public string ExtraProperties { get; set; }
+
+    /// <summary>
+    /// 澶囨敞
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 鍒涘缓鏃堕棿
+    /// </summary>
+    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