From 01962d7f7d9bb4963546eb0c79b921995e6fe271 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期四, 27 三月 2025 13:24:38 +0800 Subject: [PATCH] 提交 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 107 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 96 insertions(+), 11 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs index 96a1397..3afce11 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs @@ -329,6 +329,14 @@ public string RechargeAmountStr { get; set; } /// <summary> + /// 瀹為檯鍏呭�奸噾棰� + /// </summary> + public decimal ActualRechargeAmount { get; set; } + + [Name("瀹為檯鍏呭�奸噾棰�")] + public string ActualRechargeAmountStr { get; set; } + + /// <summary> /// 浼樻儬閲戦 /// </summary> public decimal DiscountAmount { get; set; } @@ -356,6 +364,36 @@ public string ACOOLYOrderNo { get; set; } /// <summary> + /// 骞冲彴鎵f閲戦 + /// </summary> + [Name("骞冲彴鎵f閲戦")] + public decimal PlatformPrice { get; set; } + + /// <summary> + /// 骞冲彴閫�娆剧姸鎬� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } + + [Name("骞冲彴閫�娆剧姸鎬�")] + public string? LifePayRefundStatusStr { get; set; } + + /// <summary> + /// 璁㈠崟鐘舵�� + /// </summary> + [Name("骞冲彴璁㈠崟鐘舵��")] + public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + + + + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } + + /// <summary> + /// 渚涘簲鍟嗚鍗曠姸鎬� + /// </summary> + [Name("渚涘簲鍟嗚鍗曠姸鎬�")] + public string? ACOOLYStatusStr { get; set; } + + /// <summary> /// 鏀粯鐘舵�� /// </summary> public LifePayStatusEnum PayStatus { get; set; } @@ -366,15 +404,15 @@ [Name("鏀粯娓犻亾娴佹按鍙�")] public string OutOrderNo { get; set; } - [Name("閫�娆剧敵璇�")] - public string RefundApplyRemark { get; set; } + //[Name("閫�娆剧敵璇�")] + //public string RefundApplyRemark { get; set; } - /// <summary> - /// 璁㈠崟鐘舵�� - /// </summary> - public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + ///// <summary> + ///// 璁㈠崟鐘舵�� + ///// </summary> + //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } - [Name("璁㈠崟鐘舵��")] + [Name("骞冲彴璁㈠崟鐘舵��")] public string LifePayOrderStatusStr { get; set; } /// <summary> @@ -386,8 +424,6 @@ public string FinishTimeStr { get; set; } - - } @@ -411,6 +447,13 @@ [Name("鍏呭�兼笭閬�")] public string? ChannelName { get; set; } + + + /// <summary> + /// 閫�娆剧敵璇锋椂闂� + /// </summary> + public DateTime? RefundApplyTime { get; set; } + /// <summary> /// 閫�娆剧敵璇锋椂闂� /// </summary> @@ -422,12 +465,13 @@ /// </summary> public DateTime CreationTime { get; set; } - [Name("涓嬪崟鏃堕棿")] - public string? CreationTimeStr { get; set; } [Name("閫�娆捐鍗曞彿")] public string? RefundOrderNo { get; set; } + + [Name("閫�娆剧敵璇�")] + public string? RefundApplyRemark { get; set; } [Name("鍏呭�奸噾棰�")] public string? RechargeAmountStr { get; set; } @@ -558,6 +602,11 @@ /// 閫�娆炬椂闂� /// </summary> public DateTime? RefundTime { get; set; } + + /// <summary> + /// 閫�娆剧敵璇锋椂闂� + /// </summary> + public DateTime? RefundApplyTime { get; set; } /// <summary> /// 閫�娆惧嚟璇� @@ -1051,4 +1100,40 @@ public class ChannelRateOutput { public decimal ChannlesRate { get; set; } +} + +public class OnlineServiceInput +{ + /// <summary> + /// 鍦ㄧ嚎瀹㈡湇閾炬帴 + /// </summary> + public string Link { get; set; } +} + +public class LifePayRechargeReceiptsListOutput +{ + /// <summary> + /// 缂栧彿 + /// </summary> + public Guid Id { get; set; } + + /// <summary> + /// 涓氬姟璁㈠崟鍙� + /// </summary> + public string OrderNo { get; set; } + + /// <summary> + /// 鍏呭�奸噾棰� + /// </summary> + public decimal RechargeAmount { get; set; } + + /// <summary> + /// 澶囨敞 + /// </summary> + public string Remark { get; set; } + + /// <summary> + /// 鍑瘉 + /// </summary> + public string Voucher { get; set; } } \ No newline at end of file -- Gitblit v1.9.1