From d64a364e912bb0d34c3efabd1bdee9a2f6ec0878 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 14:06:24 +0800
Subject: [PATCH] fix:微信退款bug修复、新增获取渠道折扣接口
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 149 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 140 insertions(+), 9 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index ed35d68..ef263de 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -232,6 +232,11 @@
public string RefundCredentialsImgUrl { get; set; }
/// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+
+ /// <summary>
/// 涓嬪崟鏃堕棿
/// </summary>
public DateTime CreationTime { get; set; }
@@ -245,6 +250,12 @@
/// 鐢宠閫�娆惧師鍥�
/// </summary>
public string RefundApplyRemark { get; set; }
+
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
/// <summary>
/// 椹冲洖鍘熷洜
@@ -446,10 +457,21 @@
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
@@ -473,6 +495,12 @@
/// 璁㈠崟绫诲瀷
/// </summary>
public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
/// <summary>
/// 璁㈠崟鍙�
@@ -507,7 +535,7 @@
/// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ public LifePayOrderStatusEnum Status { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -539,9 +567,14 @@
/// </summary>
public string RefundCredentialsImgUrl { get; set; }
-
+ /// <summary>
+ /// 閫�娆惧師鍥�
+ /// </summary>
public string RefundApplyRemark { get; set; }
+ /// <summary>
+ /// 椹冲洖鍘熷洜
+ /// </summary>
public string RefundCheckRemark { get; set; }
/// <summary>
@@ -554,11 +587,15 @@
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
-
/// <summary>
/// 瀹為檯鍏呭�奸噾棰�
/// </summary>
public decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
/// <summary>
/// 閫�娆鹃噾棰�
@@ -594,16 +631,27 @@
/// <summary>
/// 鎵嬬画璐规瘮渚�
/// </summary>
- public decimal PremiumRate { get; set; }
+ 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
{
@@ -657,10 +705,12 @@
/// </summary>
public LifePayStatusEnum PayStatus { get; set; }
+
+
/// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ public LifePayOrderStatusEnum Status { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -688,10 +738,25 @@
/// </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>
/// 娓犻亾娴佹按鍙�
@@ -703,16 +768,31 @@
/// </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
{
@@ -735,6 +815,7 @@
/// 閫�娆惧師鍥�
/// </summary>
public string RefundApplyRemark { get; set; }
+
/// <summary>
/// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
@@ -799,14 +880,64 @@
public class TopStatisticsOutput
{
/// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
/// 璐︽埛浣欓
/// </summary>
- public string Amount { get; set; }
+ public decimal Amount { get; set; }
/// <summary>
/// 绱鏀舵
/// </summary>
- public string AccumulatedReceipts { get; set; }
+ 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