From 329afe481eadf53836d216ee7a2ee5b95c9334ac Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 09:22:17 +0800
Subject: [PATCH] 提交
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 122 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 28 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index da36ea5..16a9684 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -153,7 +153,7 @@
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙�
/// </summary>
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
/// <summary>
/// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -163,7 +163,7 @@
/// <summary>
/// 娓犻亾鍚嶇О
/// </summary>
- public string ChannelName { get; set; }
+ public string? ChannelName { get; set; }
/// <summary>
/// 璁㈠崟绫诲瀷
@@ -178,7 +178,7 @@
/// <summary>
/// 閫�娆捐鍗曞彿
/// </summary>
- public string RefundOrderNo { get; set; }
+ public string? RefundOrderNo { get; set; }
/// <summary>
/// 鍏呭�奸噾棰�
@@ -281,6 +281,13 @@
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal ActualReceivedAmount { get; set; }
+
+ public LifePayStatusEnum? ActualReceivedStatus { get; set; }
}
public class LifePayOrderListTemplate
@@ -322,6 +329,14 @@
public string RechargeAmountStr { get; set; }
/// <summary>
+ /// 瀹為檯鍏呭�奸噾棰�
+ /// </summary>
+ public decimal ActualRechargeAmount { get; set; }
+
+ [Name("瀹為檯鍏呭�奸噾棰�")]
+ public string ActualRechargeAmountStr { get; set; }
+
+ /// <summary>
/// 浼樻儬閲戦
/// </summary>
public decimal DiscountAmount { get; set; }
@@ -349,6 +364,36 @@
public string ACOOLYOrderNo { get; set; }
/// <summary>
+ /// 骞冲彴鎵f閲戦
+ /// </summary>
+ [Name("骞冲彴鎵f閲戦")]
+ public decimal PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ [Name("骞冲彴閫�娆剧姸鎬�")]
+ public string? LifePayRefundStatusStr { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ [Name("骞冲彴璁㈠崟鐘舵��")]
+ public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+
+
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+ public string? ACOOLYStatusStr { get; set; }
+
+ /// <summary>
/// 鏀粯鐘舵��
/// </summary>
public LifePayStatusEnum PayStatus { get; set; }
@@ -359,15 +404,15 @@
[Name("鏀粯娓犻亾娴佹按鍙�")]
public string OutOrderNo { get; set; }
- [Name("閫�娆剧敵璇�")]
- public string RefundApplyRemark { get; set; }
+ //[Name("閫�娆剧敵璇�")]
+ //public string RefundApplyRemark { get; set; }
- /// <summary>
- /// 璁㈠崟鐘舵��
- /// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ ///// <summary>
+ ///// 璁㈠崟鐘舵��
+ ///// </summary>
+ //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
- [Name("璁㈠崟鐘舵��")]
+ [Name("骞冲彴璁㈠崟鐘舵��")]
public string LifePayOrderStatusStr { get; set; }
/// <summary>
@@ -380,8 +425,6 @@
-
-
}
@@ -389,41 +432,49 @@
{
[Name("搴忓彿")]
- public int SerialNumber { get; set; }
+ public int? SerialNumber { get; set; }
[Name("鎵嬫満鍙�")]
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
public LifePayTypeEnum? LifePayType { get; set; }
- public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+ public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
[Name("鍏呭�肩被鍨�")]
- public string LifePayOrderTypeStr { get; set; }
+ public string? LifePayOrderTypeStr { get; set; }
[Name("鍏呭�兼笭閬�")]
- public string ChannelName { get; set; }
+ public string? ChannelName { get; set; }
+
+
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
/// <summary>
/// 閫�娆剧敵璇锋椂闂�
/// </summary>
[Name("鐢宠閫�娆炬椂闂�")]
- public string RefundApplyTimeStr { get; set; }
+ public string? RefundApplyTimeStr { get; set; }
/// <summary>
/// 涓嬪崟鏃堕棿
/// </summary>
public DateTime CreationTime { get; set; }
- [Name("涓嬪崟鏃堕棿")]
- public string CreationTimeStr { get; set; }
[Name("閫�娆捐鍗曞彿")]
- public string RefundOrderNo { get; set; }
+ public string? RefundOrderNo { get; set; }
+
+ [Name("閫�娆剧敵璇�")]
+ public string? RefundApplyRemark { get; set; }
[Name("鍏呭�奸噾棰�")]
- public string RechargeAmountStr { get; set; }
+ public string? RechargeAmountStr { get; set; }
/// <summary>
@@ -435,7 +486,7 @@
/// 瀹為檯鍒拌处閲戦
/// </summary>
[Name("瀹為檯鍒拌处閲戦")]
- public string ActualReceivedAmount { get; set; }
+ public string? ActualReceivedAmount { get; set; }
/// <summary>
/// 瀹炰粯閲戦
@@ -443,7 +494,7 @@
public decimal PayAmount { get; set; }
[Name("瀹炰粯閲戦")]
- public string PayAmountStr { get; set; }
+ public string? PayAmountStr { get; set; }
[Name("閫�娆炬笭閬�")]
public string LifePayTypeStr { get; set; }
@@ -455,13 +506,13 @@
public decimal? RefundPrice { get; set; }
- public ACOOLYStatusEnum ACOOLYStatus { get; set; }
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
/// <summary>
/// 渚涘簲鍟嗚鍗曠姸鎬�
/// </summary>
[Name("渚涘簲鍟嗚鍗曠姸鎬�")]
- public string ACOOLYStatusStr { get; set; }
+ public string? ACOOLYStatusStr { get; set; }
/// <summary>
@@ -473,11 +524,13 @@
/// <summary>
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
[Name("骞冲彴閫�娆剧姸鎬�")]
- public string LifePayRefundStatus { get; set; }
+ public string? LifePayRefundStatusStr { get; set; }
[Name("瀹屾垚鏃堕棿")]
- public string FinishTimeStr { get; set; }
+ public string? FinishTimeStr { get; set; }
}
@@ -549,6 +602,11 @@
/// 閫�娆炬椂闂�
/// </summary>
public DateTime? RefundTime { get; set; }
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
/// <summary>
/// 閫�娆惧嚟璇�
@@ -1042,4 +1100,12 @@
public class ChannelRateOutput
{
public decimal ChannlesRate { get; set; }
+}
+
+public class OnlineServiceInput
+{
+ /// <summary>
+ /// 鍦ㄧ嚎瀹㈡湇閾炬帴
+ /// </summary>
+ public string Link { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.1