From fbd573b5d2d05cac61d2184064bb5dd18d0fe61f Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期四, 20 三月 2025 16:48:48 +0800 Subject: [PATCH] fix:退款订单号bug修复 --- LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 65 +++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs index 592a574..fd522ed 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> + /// 骞冲彴鎵f閲戦 + /// </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,45 @@ 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 LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } } } \ No newline at end of file -- Gitblit v1.9.1