From cf7069e5b979e025d30f13a2fe3ee3b3d824cea6 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 25 三月 2025 11:03:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index f54f710..2202231 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -224,7 +224,9 @@
/// <summary>
/// 骞冲彴鎶樻墸姣斾緥
/// </summary>
- public decimal? PlatformRate { get; set; }
+ public decimal PlatformRate { get; set; }
+
+ public decimal PlatformDeductionAmount { get; set; }
/// <summary>
/// 娓犻亾鎶樻墸
@@ -240,6 +242,7 @@
/// 鎵嬬画璐规瘮渚�
/// </summary>
public decimal PremiumRate { get; set; }
+
}
@@ -300,6 +303,8 @@
/// </summary>
public DateTime? EndFinishTime { get; set; }
+
+
/// <summary>
/// 鐢ㄦ埛Id
/// </summary>
@@ -344,6 +349,16 @@
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; }
@@ -357,6 +372,10 @@
/// 璁㈠崟鐘舵��
/// </summary>
public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; }
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
/// <summary>
/// 鐢ㄦ埛Id
@@ -518,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