From a22995ea9ded904780c27319510a82275a972cab Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 21 三月 2025 17:55:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 104 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 97 insertions(+), 7 deletions(-)
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index 592a574..f6c1394 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -1,5 +1,4 @@
锘縰sing LifePayment.Domain.Shared;
-using Org.BouncyCastle.Bcpg.OpenPgp;
using System;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;
@@ -39,6 +38,8 @@
/// </summary>
public decimal RechargeAmount { get; set; }
+
+
/// <summary>
/// 浼樻儬閲戦
/// </summary>
@@ -48,6 +49,11 @@
/// 瀹炰粯閲戦
/// </summary>
public decimal PayAmount { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵ｆ閲戦
+ /// </summary>
+ public decimal? PlatformDeductionAmount { get; set; }
/// <summary>
/// 鏀粯鏃堕棿
@@ -65,9 +71,24 @@
public string OutOrderNo { get; set; }
/// <summary>
- /// 璁㈠崟鐘舵��
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
+
+ /// <summary>
+ /// 娓犻亾娴佹按鍙�
+ /// </summary>
+ public string ACOOLYOrderNo { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鐘舵��
/// </summary>
public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙姸鎬�
+ /// </summary>
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -90,13 +111,82 @@
public string OutRequestNo { get; set; }
/// <summary>
- /// ACOOLY璁㈠崟鍙�
- /// </summary>
- public string ACOOLYOrderNo { get; set; }
-
- /// <summary>
/// 閫�娆炬椂闂�
/// </summary>
public DateTime? RefundTime { 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 Guid? RefundCheckUserId { get; set; }
+
+ public string? ChannelId { get; set; }
+
+ /// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍏呭�奸噾棰�
+ /// </summary>
+ public decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 鍥炲崟鍦板潃
+ /// </summary>
+ public string? ElecBillUrl { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧洖鍗曞湴鍧�
+ /// </summary>
+ public string? RefundElecBillUrl { get; set; }
+
+
+ /// <summary>
+ /// 骞冲彴鎶樻墸姣斾緥
+ /// </summary>
+ public decimal? PlatformRate { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鎶樻墸
+ /// </summary>
+ public decimal? ChannleRate { get; set; }
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾姣斾緥
+ /// </summary>
+ public decimal? ChannlesRakeRate { get; set; }
+
+ /// <summary>
+ /// 鎵嬬画璐规瘮渚�
+ /// </summary>
+ public decimal? PremiumRate { get; set; }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1