From 7a540f529d2c9a541993bc9818cad9c9093fec91 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 03 十二月 2025 11:04:35 +0800
Subject: [PATCH] fix: bug
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 174 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index ce946f5..b3400d8 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -167,6 +167,11 @@
public string? ChannelName { get; set; }
/// <summary>
+ /// 杩愯惀鍟�
+ /// </summary>
+ public string Operator { get; set; }
+
+ /// <summary>
/// 璁㈠崟绫诲瀷
/// </summary>
public LifePayOrderTypeEnum LifePayOrderType { get; set; }
@@ -284,9 +289,14 @@
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
/// <summary>
+ /// 璁㈠崟鍙傛暟璇︽儏
+ /// </summary>
+ public string OrderParamDetailJsonStr { get; set; }
+
+ /// <summary>
/// 瀹為檯鍒拌处閲戦
/// </summary>
- public decimal ActualReceivedAmount { get; set; }
+ public decimal? ActualReceivedAmount { get; set; }
public LifePayStatusEnum? ActualReceivedStatus { get; set; }
}
@@ -309,6 +319,17 @@
[Name("鍏呭�兼笭閬�")]
public string ChannelName { get; set; }
+
+ /// <summary>
+ /// 杩愯惀鍟�
+ /// </summary>
+ [Name("杩愯惀鍟�")]
+ public string Operator { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙傛暟璇︽儏
+ /// </summary>
+ public string OrderParamDetailJsonStr { get; set; }
/// <summary>
/// 涓嬪崟鏃堕棿
@@ -381,7 +402,6 @@
/// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
- [Name("骞冲彴璁㈠崟鐘舵��")]
public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
@@ -404,6 +424,148 @@
[Name("鏀粯娓犻亾娴佹按鍙�")]
public string OutOrderNo { get; set; }
+
+ //[Name("閫�娆剧敵璇�")]
+ //public string RefundApplyRemark { get; set; }
+
+ ///// <summary>
+ ///// 璁㈠崟鐘舵��
+ ///// </summary>
+ //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+ [Name("骞冲彴璁㈠崟鐘舵��")]
+ public string LifePayOrderStatusStr { get; set; }
+
+ /// <summary>
+ /// 瀹屾垚鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+ [Name("瀹屾垚鏃堕棿")]
+ public string FinishTimeStr { get; set; }
+
+
+
+}
+
+public class LifePayOrderListTemplateForChannle
+{
+
+ [Name("搴忓彿")]
+ public int SerialNumber { get; set; }
+
+ [Name("鎵嬫満鍙�")]
+ public string PhoneNumber { get; set; }
+
+ public LifePayTypeEnum? LifePayType { get; set; }
+
+ public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+ [Name("鍏呭�肩被鍨�")]
+ public string LifePayOrderTypeStr { get; set; }
+
+ public string ChannelName { get; set; }
+
+ /// <summary>
+ /// 杩愯惀鍟�
+ /// </summary>
+ [Name("杩愯惀鍟�")]
+ public string Operator { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ [Name("涓嬪崟鏃堕棿")]
+ public string CreationTimeStr { get; set; }
+
+ [Name("骞冲彴璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鍏呭�奸噾棰�
+ /// </summary>
+ public decimal RechargeAmount { get; set; }
+
+ [Name("鍏呭�奸噾棰�")]
+ 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; }
+
+ /// <summary>
+ /// 瀹炰粯閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+ [Name("鐢ㄦ埛瀹炰粯閲戦")]
+ public string PayAmountStr { get; set; }
+
+ /// <summary>
+ /// 鏀粯鏃堕棿
+ /// </summary>
+ public DateTime? PayTime { get; set; }
+
+ [Name("鏀粯鏃堕棿")]
+ public string PayTimeStr { get; set; }
+
+ [Name("鏀粯娓犻亾")]
+ public string LifePayTypeStr { get; set; }
+
+ [Name("鏀粯娓犻亾娴佹按鍙�")]
+ public string OutOrderNo { get; set; }
+
+ [Name("鏀粯鐘舵��")]
+ public string PayStatusStr { get; set; }
+
+ public string ACOOLYOrderNo { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵ｆ閲戦
+ /// </summary>
+ public decimal PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙傛暟璇︽儏
+ /// </summary>
+ public string OrderParamDetailJsonStr { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ public string? LifePayRefundStatusStr { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+
+
+
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ public string? ACOOLYStatusStr { get; set; }
+
+ /// <summary>
+ /// 鏀粯鐘舵��
+ /// </summary>
+ public LifePayStatusEnum PayStatus { get; set; }
//[Name("閫�娆剧敵璇�")]
//public string RefundApplyRemark { get; set; }
@@ -460,6 +622,9 @@
/// </summary>
[Name("鐢宠閫�娆炬椂闂�")]
public string? RefundApplyTimeStr { get; set; }
+
+ [Name("骞冲彴璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
/// <summary>
/// 涓嬪崟鏃堕棿
@@ -532,9 +697,6 @@
[Name("瀹屾垚鏃堕棿")]
public string? FinishTimeStr { get; set; }
-
- [Name("骞冲彴璁㈠崟鍙�")]
- public string OrderNo { get; set; }
}
@@ -1234,6 +1396,11 @@
public Guid UserId { get; set; }
/// <summary>
+ /// 鎺ㄥ箍鍛業D
+ /// </summary>
+ public string PromoterIdNumber { get; set; }
+
+ /// <summary>
/// 鏄惁鏄悗鍙扮敤鎴�
/// </summary>
public bool IsBackClientUser { get; set; }
@@ -1262,6 +1429,8 @@
/// </summary>
public bool IsBackClientUser { get; set; }
+ public string[] Roles { get; set; }
+
public bool IsSystem { get; set; }
/// <summary>
--
Gitblit v1.9.1