From 4e54aab4960fb97a549d9d715428b5374ecad6b5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 10 六月 2025 18:25:38 +0800
Subject: [PATCH] fix:运营端--订单管理--退款管理--列表数据导出文件不正确 运营端--订单管理--列表数据导出文件不正确

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  140 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 137 insertions(+), 3 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index ce946f5..7529438 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -286,7 +286,7 @@
     /// <summary>
     /// 瀹為檯鍒拌处閲戦
     /// </summary>
-    public decimal ActualReceivedAmount { get; set; }
+    public decimal? ActualReceivedAmount { get; set; }
 
     public LifePayStatusEnum? ActualReceivedStatus { get; set; }
 }
@@ -381,7 +381,6 @@
     /// <summary>
     /// 璁㈠崟鐘舵��
     /// </summary>
-    [Name("骞冲彴璁㈠崟鐘舵��")]
     public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
 
 
@@ -404,6 +403,137 @@
 
     [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>
+    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 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; }
@@ -533,7 +663,6 @@
     [Name("瀹屾垚鏃堕棿")]
     public string? FinishTimeStr { get; set; }
 
-    [Name("骞冲彴璁㈠崟鍙�")]
     public string OrderNo { get; set; }
 
 
@@ -1234,6 +1363,11 @@
     public Guid UserId { get; set; }
 
     /// <summary>
+    /// 鎺ㄥ箍鍛業D
+    /// </summary>
+    public string PromoterIdNumber { get; set; }
+
+    /// <summary>
     /// 鏄惁鏄悗鍙扮敤鎴�
     /// </summary>
     public bool IsBackClientUser { get; set; }

--
Gitblit v1.9.1