From ecf7e9c83e733408f22fa3ca9a79d04029728721 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 10:18:19 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3

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

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 7ba1524..7fe3e08 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using ZeroD.Base.Web.Models;
+using ZeroD.Util;
 
 namespace LifePayment.Application.Contracts;
 
@@ -377,6 +378,12 @@
     [Name("骞冲彴閫�娆剧姸鎬�")]
     public string? LifePayRefundStatusStr { get; set; }
 
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    [Name("骞冲彴璁㈠崟鐘舵��")]
+    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
 
 
     public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
@@ -406,8 +413,8 @@
     ///// </summary>
     //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
 
-    //[Name("璁㈠崟鐘舵��")]
-    //public string LifePayOrderStatusStr { get; set; }
+    [Name("骞冲彴璁㈠崟鐘舵��")]
+    public string LifePayOrderStatusStr { get; set; }
 
     /// <summary>
     /// 瀹屾垚鏃堕棿
@@ -418,8 +425,6 @@
     public string FinishTimeStr { get; set; }
 
 
-
-    
 
 }
 
@@ -442,6 +447,13 @@
 
     [Name("鍏呭�兼笭閬�")]
     public string? ChannelName { get; set; }
+
+
+
+    /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    public DateTime? RefundApplyTime { get; set; }
 
     /// <summary>
     /// 閫�娆剧敵璇锋椂闂�
@@ -1089,4 +1101,143 @@
 public class ChannelRateOutput
 {
     public decimal ChannlesRate { get; set; }
+}
+
+public class OnlineServiceInput
+{
+    /// <summary>
+    /// 鍦ㄧ嚎瀹㈡湇閾炬帴
+    /// </summary>
+    public string Link { get; set; }
+}
+public class LifePayRechargeReceiptsStatistics
+{
+
+    /// <summary>
+    /// 绱鍏呭��
+    /// </summary>
+    public decimal TotalRechargeAmount { get; set; }
+}
+
+public class LifePayRechargeReceiptsListOutput
+{
+    /// <summary>
+    /// 缂栧彿
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 涓氬姟璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    /// <summary>
+    /// 澶囨敞
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 鍑瘉
+    /// </summary>
+    public string Voucher { get; set; }
+
+    /// <summary>
+    /// 璁拌处鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+}
+
+public class LifePayPhoneMesssageCodeLoginOutput
+{
+    /// <summary>
+    /// 鐢ㄦ埛Id
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 鏄惁鏄悗鍙扮敤鎴�
+    /// </summary>
+    public bool IsBackClientUser { get; set; }
+
+    /// <summary>
+    /// 娓犻亾鍙�
+    /// </summary>
+    public List<ChannelOutput> ChannlesNum { get; set; }
+}
+
+public class ChannelOutput
+{
+    public string Name { get; set; }
+
+    public string ChannlesNum { get; set; }
+}
+
+public class LifePayExpensesReceiptsListOutput
+{
+    /// <summary>
+    /// 缂栧彿
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 骞冲彴璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 娓犻亾娴佹按鍙�
+    /// </summary>
+    public string OutOrderNo { get; set; }
+
+    /// <summary>
+    /// 鏀粯娓犻亾
+    /// </summary>
+    public LifePayTypeEnum LifePayType { get; set; }
+
+    /// <summary>
+    /// 鏀舵敮绫诲瀷
+    /// </summary>
+    public ExpensesReceiptsTypeEnum ExpensesReceiptsType { get; set; }
+
+    /// <summary>
+    /// 浜ゆ槗閲戦
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// 浜ゆ槗鏃堕棿
+    /// </summary>
+    public DateTime FinishTime { get; set; }
+}
+public class LifePayExpensesReceiptsStatistics
+{
+    /// <summary>
+    /// 绱鏀跺叆
+    /// </summary>
+    public decimal TotalIncome { get; set; }
+
+    /// <summary>
+    /// 绱閫�娆�
+    /// </summary>
+    public decimal TotalRefund { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鏀跺叆
+    /// </summary>
+    public decimal RealIncome { get; set; }
+}
+
+public class ReceiptsListOutPut
+{
+    /// <summary>
+    /// 鍒涘缓鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    public decimal Amount { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.1