From e896cbc0f5d5483d4661918556f45b7b9a6c31c2 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 20:31:36 +0800
Subject: [PATCH] fix:手续费、利润等计算

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs |  151 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 149 insertions(+), 2 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index 3482efa..2202231 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -217,7 +217,32 @@
     /// <summary>
     /// 涓嬪崟娓犻亾
     /// </summary>
-    public Guid? ChannelId { get; set; }
+    public string? ChannelId { get; set; }
+
+
+
+    /// <summary>
+    /// 骞冲彴鎶樻墸姣斾緥
+    /// </summary>
+    public decimal PlatformRate { get; set; }
+
+    public decimal PlatformDeductionAmount { get; set; }
+
+    /// <summary>
+    /// 娓犻亾鎶樻墸
+    /// </summary>
+    public decimal? ChannleRate { get; set; }
+
+    /// <summary>
+    /// 娓犻亾浣ｉ噾姣斾緥
+    /// </summary>
+    public decimal? ChannlesRakeRate { get; set; }
+
+    /// <summary>
+    /// 鎵嬬画璐规瘮渚�
+    /// </summary>
+    public decimal PremiumRate { get; set; }
+
 
 }
 
@@ -259,6 +284,11 @@
     public LifePayStatusEnum? PayStatus { get; set; }
 
     /// <summary>
+    /// 渚涘簲鍟嗙姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
     /// 璁㈠崟鐘舵��
     /// </summary>
     public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; }
@@ -272,6 +302,80 @@
     /// 缁撴潫瀹屾垚鏃堕棿
     /// </summary>
     public DateTime? EndFinishTime { get; set; }
+
+    
+
+    /// <summary>
+    /// 鐢ㄦ埛Id
+    /// </summary>
+    public Guid? UserId { get; set; }
+
+    /// <summary>
+    /// 鎼滅储鍏抽敭璇�
+    /// </summary>
+    public string KeyWords { get; set; }
+
+}
+public class QueryLifePayRefundOrderListInput : ChannelsBaseInput
+{
+    /// <summary>
+    /// 璁㈠崟绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
+
+    /// <summary>
+    /// 鐢熸椿缂磋垂鏀粯绫诲瀷
+    /// </summary>
+    public LifePayTypeEnum? LifePayType { get; set; }
+
+    /// <summary>
+    /// 寮�濮嬬敵璇烽��娆炬椂闂�
+    /// </summary>
+    public DateTime? BeginRefundApplyTime { get; set; }
+
+    /// <summary>
+    /// 缁撴潫鐢宠閫�娆炬椂闂�
+    /// </summary>
+    public DateTime? EndRefundApplyTime { get; set; }
+
+    /// <summary>
+    /// 寮�濮嬪畬鎴愭椂闂�
+    /// </summary>
+    public DateTime? BeginFinishTime { get; set; }
+
+    /// <summary>
+    /// 缁撴潫瀹屾垚鏃堕棿
+    /// </summary>
+    public DateTime? EndFinishTime { get; set; }
+
+    /// <summary>
+    /// 寮�濮嬮��娆炬椂闂�
+    /// </summary>
+    public DateTime? BeginRefundTime { get; set; }
+
+    /// <summary>
+    /// 缁撴潫閫�娆炬椂闂�
+    /// </summary>
+    public DateTime? EndRefundTime { get; set; }
+
+    /// <summary>
+    /// 鏀粯鐘舵��
+    /// </summary>
+    public LifePayStatusEnum? PayStatus { get; set; }
+
+    /// <summary>
+    /// 渚涘簲鍟嗙姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; }
+    /// <summary>
+    /// 璁㈠崟鐘舵��
+    /// </summary>
+    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
 
     /// <summary>
     /// 鐢ㄦ埛Id
@@ -289,10 +393,27 @@
 {
     public Guid Id { get; set; }
 
+    /// <summary>
+    /// 涓婁紶鍑瘉
+    /// </summary>
     public string RefundCredentialsImgUrl { get; set; }
 
+    /// <summary>
+    /// 閫�娆鹃┏鍥炲師鍥�
+    /// </summary>
     public string RefundCheckRemark { get; set; }
+
+    /// <summary>
+    /// 閫�娆剧被鍨�
+    /// </summary>
+    public LifePayRefundTypeEnum LifePayRefundType { get; set; }
+
+    /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    public decimal RefundPrice { get; set; }
 }
+
 public class RefundUserLifePayOrderInput : ChannelsBaseInput
 {
     public Guid Id { get; set; }
@@ -403,7 +524,8 @@
     /// <summary>
     /// 娉ㄥ唽鏃堕棿
     /// </summary>
-    public DateTime? CreationTime { get; set; }
+    public DateTime? CreationTimeBegin { get; set; }
+    public DateTime? CreationTimeEnd { get; set; }
 }
 
 public class Model_UserAccountExtraProperties
@@ -415,4 +537,29 @@
     public string Phone { get; set; }
 
     public string Remark { get; set; }
+}
+
+public class OrderPriceReturn
+{
+    /// <summary>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </summary>
+    public decimal PlatformPrice { get; set; }
+
+    /// <summary>
+    /// 鎵嬬画璐�
+    /// </summary>
+    public decimal PremiumPrice { get; set; }
+
+    /// <summary>
+    /// 娓犻亾浣ｉ噾
+    /// </summary>
+    public decimal ChannlesRakePrice { get; set; }
+
+    /// <summary>
+    /// 鍒╂鼎
+    /// </summary>
+
+    public decimal Profit { get; set; }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1