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 | 1096 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,048 insertions(+), 48 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index b6de771..b3400d8 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using ZeroD.Base.Web.Models;
+using ZeroD.Util;
namespace LifePayment.Application.Contracts;
@@ -153,7 +154,7 @@
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙�
/// </summary>
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
/// <summary>
/// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -163,7 +164,12 @@
/// <summary>
/// 娓犻亾鍚嶇О
/// </summary>
- public string ChannelName { get; set; }
+ public string? ChannelName { get; set; }
+
+ /// <summary>
+ /// 杩愯惀鍟�
+ /// </summary>
+ public string Operator { get; set; }
/// <summary>
/// 璁㈠崟绫诲瀷
@@ -174,6 +180,11 @@
/// 璁㈠崟鍙�
/// </summary>
public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
/// <summary>
/// 鍏呭�奸噾棰�
@@ -232,6 +243,11 @@
public string RefundCredentialsImgUrl { get; set; }
/// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+
+ /// <summary>
/// 涓嬪崟鏃堕棿
/// </summary>
public DateTime CreationTime { get; set; }
@@ -245,6 +261,12 @@
/// 鐢宠閫�娆惧師鍥�
/// </summary>
public string RefundApplyRemark { get; set; }
+
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
/// <summary>
/// 椹冲洖鍘熷洜
@@ -265,6 +287,18 @@
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙傛暟璇︽儏
+ /// </summary>
+ public string OrderParamDetailJsonStr { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ public LifePayStatusEnum? ActualReceivedStatus { get; set; }
}
public class LifePayOrderListTemplate
@@ -287,6 +321,17 @@
public string ChannelName { get; set; }
/// <summary>
+ /// 杩愯惀鍟�
+ /// </summary>
+ [Name("杩愯惀鍟�")]
+ public string Operator { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙傛暟璇︽儏
+ /// </summary>
+ public string OrderParamDetailJsonStr { get; set; }
+
+ /// <summary>
/// 涓嬪崟鏃堕棿
/// </summary>
public DateTime CreationTime { get; set; }
@@ -304,6 +349,14 @@
[Name("鍏呭�奸噾棰�")]
public string RechargeAmountStr { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍏呭�奸噾棰�
+ /// </summary>
+ public decimal ActualRechargeAmount { get; set; }
+
+ [Name("瀹為檯鍏呭�奸噾棰�")]
+ public string ActualRechargeAmountStr { get; set; }
/// <summary>
/// 浼樻儬閲戦
@@ -333,6 +386,35 @@
public string ACOOLYOrderNo { get; set; }
/// <summary>
+ /// 骞冲彴鎵ｆ閲戦
+ /// </summary>
+ [Name("骞冲彴鎵ｆ閲戦")]
+ public decimal PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ [Name("骞冲彴閫�娆剧姸鎬�")]
+ public string? LifePayRefundStatusStr { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ 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; }
@@ -343,15 +425,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>
@@ -364,10 +446,260 @@
-
+}
+
+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; }
+
+ ///// <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 LifePayRefundOrderListTemplate
+{
+
+ [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; }
+
+ [Name("鍏呭�兼笭閬�")]
+ public string? ChannelName { get; set; }
+
+
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ [Name("鐢宠閫�娆炬椂闂�")]
+ public string? RefundApplyTimeStr { get; set; }
+
+ [Name("骞冲彴璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+
+ [Name("閫�娆捐鍗曞彿")]
+ public string? RefundOrderNo { get; set; }
+
+
+ [Name("閫�娆剧敵璇�")]
+ public string? RefundApplyRemark { get; set; }
+
+ [Name("鍏呭�奸噾棰�")]
+ public string? RechargeAmountStr { get; set; }
+
+
+ /// <summary>
+ /// 鍏呭�奸噾棰�
+ /// </summary>
+ public decimal RechargeAmount { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ [Name("瀹為檯鍒拌处閲戦")]
+ public string? ActualReceivedAmount { get; set; }
+
+ /// <summary>
+ /// 瀹炰粯閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+ [Name("瀹炰粯閲戦")]
+ public string? PayAmountStr { get; set; }
+
+ [Name("閫�娆炬笭閬�")]
+ public string LifePayTypeStr { get; set; }
+
+ /// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ [Name("閫�娆鹃噾棰�")]
+ public decimal? RefundPrice { get; set; }
+
+
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+ public string? ACOOLYStatusStr { get; set; }
+
+
+ /// <summary>
+ /// 瀹屾垚鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ [Name("骞冲彴閫�娆剧姸鎬�")]
+ public string? LifePayRefundStatusStr { get; set; }
+
+ [Name("瀹屾垚鏃堕棿")]
+ public string? FinishTimeStr { get; set; }
+
+
+}
public class UserLifePayOrderOutput
{
public Guid Id { get; set; }
@@ -438,6 +770,11 @@
public DateTime? RefundTime { get; set; }
/// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
+
+ /// <summary>
/// 閫�娆惧嚟璇�
/// </summary>
public string RefundCredentialsImgUrl { get; set; }
@@ -446,16 +783,214 @@
public string RefundApplyRemark { get; set; }
public string RefundCheckRemark { get; set; }
+
/// <summary>
/// 娓犻亾娴佹按鍙�
/// </summary>
public string ACOOLYOrderNo { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鐘舵��
+ /// </summary>
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
}
public class LifePayOrderOutput
{
public Guid Id { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛璐﹀彿
+ /// </summary>
+ public string UserPhoneNumber { get; set; }
+
+ public string UserName { get; set; }
+
+ public string LifePayChannle { get; set; }
+ /// <summary>
+ /// 鐢熸椿缂磋垂鏀粯绫诲瀷
+ /// </summary>
+ public LifePayTypeEnum? LifePayType { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟绫诲瀷
+ /// </summary>
+ public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鍏呭�奸噾棰�
+ /// </summary>
+ public decimal RechargeAmount { get; set; }
+
+ /// <summary>
+ /// 浼樻儬閲戦
+ /// </summary>
+ public decimal DiscountAmount { get; set; }
+
+ /// <summary>
+ /// 瀹炰粯閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+ /// <summary>
+ /// 鏀粯鏃堕棿
+ /// </summary>
+ public DateTime? PayTime { get; set; }
+
+ /// <summary>
+ /// 鏀粯鐘舵��
+ /// </summary>
+ public LifePayStatusEnum PayStatus { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ public LifePayOrderStatusEnum Status { get; set; }
+
+ /// <summary>
+ /// 瀹屾垚鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+ /// <summary>
+ /// 澶栭儴璁㈠崟鍙�
+ /// </summary>
+ public string OutOrderNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟璇︾粏鏁版嵁
+ /// </summary>
+ public string OrderParamDetailJsonStr { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime? CreationTime { get; set; }
+
+ /// <summary>
+ /// 閫�娆炬椂闂�
+ /// </summary>
+ public DateTime? RefundTime { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧嚟璇�
+ /// </summary>
+ public string RefundCredentialsImgUrl { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧師鍥�
+ /// </summary>
+ public string RefundApplyRemark { get; set; }
+
+ /// <summary>
+ /// 椹冲洖鍘熷洜
+ /// </summary>
+ public string RefundCheckRemark { get; set; }
+
+ /// <summary>
+ /// 娓犻亾娴佹按鍙�
+ /// </summary>
+ public string ACOOLYOrderNo { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍏呭�奸噾棰�
+ /// </summary>
+ public decimal? ActualRechargeAmount { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ /// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎶樻墸姣斾緥
+ /// </summary>
+ public decimal? PlatformRate { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鎵ｆ閲戦
+ /// </summary>
+ public decimal? PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鎶樻墸
+ /// </summary>
+ public decimal? ChannleRate { get; set; }
+
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾姣斾緥
+ /// </summary>
+ public decimal? ChannlesRakeRate { get; set; }
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾
+ /// </summary>
+ public decimal? ChannlesRakePrice { get; set; }
+
+ /// <summary>
+ /// 鎵嬬画璐规瘮渚�
+ /// </summary>
+ public decimal? PremiumRate { get; set; }
+
+ /// <summary>
+ /// 鎵嬬画璐�
+ /// </summary>
+ public decimal PremiumPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴鍒╂鼎
+ /// </summary>
+ public decimal? Profit { get; set; }
+
+ /// <summary>
+ /// 鍥炲崟鍦板潃
+ /// </summary>
+ public string? ElecBillUrl { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧洖鍗曞湴鍧�
+ /// </summary>
+ public string? RefundElecBillUrl { get; set; }
+}
+public class LifePayRefundOrderOutput
+{
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛璐﹀彿
+ /// </summary>
+ public string UserPhoneNumber { get; set; }
+
+ public string UserName { get; set; }
+
+ public string LifePayChannle { get; set; }
/// <summary>
/// 鐢熸椿缂磋垂鏀粯绫诲瀷
/// </summary>
@@ -496,10 +1031,12 @@
/// </summary>
public LifePayStatusEnum PayStatus { get; set; }
+
+
/// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ public LifePayOrderStatusEnum Status { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -507,9 +1044,10 @@
public DateTime? FinishTime { get; set; }
/// <summary>
- /// 璁㈠崟璇︾粏鏁版嵁
+ /// 澶栭儴璁㈠崟鍙�
/// </summary>
- public string OrderParamDetailJsonStr { get; set; }
+ public string OutOrderNo { get; set; }
+
/// <summary>
/// 涓嬪崟鏃堕棿
@@ -526,10 +1064,25 @@
/// </summary>
public string RefundCredentialsImgUrl { 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 string? RefundOrderNo { get; set; }
/// <summary>
/// 娓犻亾娴佹按鍙�
@@ -541,54 +1094,32 @@
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
-
/// <summary>
/// 瀹為檯鍏呭�奸噾棰�
/// </summary>
public decimal? ActualRechargeAmount { get; set; }
/// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ /// <summary>
/// 閫�娆鹃噾棰�
/// </summary>
public decimal? RefundPrice { get; set; }
- /// <summary>
- /// 骞冲彴鎶樻墸姣斾緥
- /// </summary>
- public decimal? PlatformRate { get; set; }
/// <summary>
- /// 骞冲彴鎵ｆ閲戦
+ /// 鍥炲崟鍦板潃
/// </summary>
- public decimal? PlatformPrice { get; set; }
+ public string? ElecBillUrl { get; set; }
/// <summary>
- /// 娓犻亾鎶樻墸
+ /// 閫�娆惧洖鍗曞湴鍧�
/// </summary>
- public decimal? ChannleRate { get; set; }
-
-
- /// <summary>
- /// 娓犻亾浣ｉ噾姣斾緥
- /// </summary>
- public decimal? ChannlesRakeRate { get; set; }
-
- /// <summary>
- /// 娓犻亾浣ｉ噾
- /// </summary>
- public decimal? ChannlesRakePrice { get; set; }
-
- /// <summary>
- /// 鎵嬬画璐规瘮渚�
- /// </summary>
- public decimal PremiumRate { get; set; }
-
- /// <summary>
- /// 鎵嬬画璐�
- /// </summary>
- public decimal PremiumPrice { get; set; }
+ public string? RefundElecBillUrl { get; set; }
}
-
public class CreateLifePayOrderOutput
{
public string OrderNo { get; set; }
@@ -610,6 +1141,7 @@
/// 閫�娆惧師鍥�
/// </summary>
public string RefundApplyRemark { get; set; }
+
/// <summary>
/// 鍚庡彴濉啓鐨勯┏鍥炲師鍥�
@@ -674,14 +1206,482 @@
public class TopStatisticsOutput
{
/// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
/// 璐︽埛浣欓
/// </summary>
- public string Amount { get; set; }
+ public decimal Amount { get; set; }
/// <summary>
/// 绱鏀舵
/// </summary>
- public string AccumulatedReceipts { get; set; }
+ public decimal AccumulatedReceipts { get; set; }
+
+ /// <summary>
+ /// 鏄ㄦ棩鏀舵
+ /// </summary>
+ public decimal ReceiptsYesterday { get; set; }
-}
\ No newline at end of file
+ /// <summary>
+ /// 绱鏀跺叆
+ /// </summary>
+ public decimal AccumulatedIncome { get; set; }
+
+ /// <summary>
+ /// 绱涓嬪崟
+ /// </summary>
+ public int AccumulatedOrders { get; set; }
+
+ /// <summary>
+ /// 鏄ㄦ棩涓嬪崟
+ /// </summary>
+ public int OrdersNumYesterday { get; set; }
+
+ /// <summary>
+ /// 鏄ㄦ棩鎴愬姛
+ /// </summary>
+ public int YesterdaySuccess { get; set; }
+
+ /// <summary>
+ /// 鏄ㄦ棩澶辫触
+ /// </summary>
+ public int YesterdayFail { get; set; }
+
+ /// <summary>
+ /// 绱鐢ㄦ埛
+ /// </summary>
+ public int AccumulatedUsers { get; set; }
+
+ /// <summary>
+ /// 鏄ㄦ棩娲昏穬鐢ㄦ埛
+ /// </summary>
+ public int YesterdayActiveUsers { get; set; }
+
+ /// <summary>
+ /// 绱浣ｉ噾
+ /// </summary>
+ public decimal AccumulatedChannlesRakePrice { get; set; }
+}
+
+public class ChannelRateOutput
+{
+ public decimal ChannlesRate { get; set; }
+}
+
+public class OnlineServiceInput
+{
+ /// <summary>
+ /// 鍦ㄧ嚎瀹㈡湇閾炬帴
+ /// </summary>
+ public string Link { get; set; }
+}
+
+public class LifePayConsumptionStatistics
+{
+ /// <summary>
+ /// 绱鎵ｆ
+ /// </summary>
+ public decimal TotalDeductionAmount { get; set; }
+
+ /// <summary>
+ /// 鍐荤粨涓�
+ /// </summary>
+ public decimal TotalFrozenAmount { get; set; }
+}
+
+public class LifePayRechargeReceiptsStatistics
+{
+ /// <summary>
+ /// 绱鍏呭��
+ /// </summary>
+ public decimal TotalRechargeAmount { 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; }
+
+ /// <summary>
+ /// 璁拌处鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+}
+
+public class LifePayConsumptionListOutput
+{
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 澶栭儴璁㈠崟鍙�
+ /// </summary>
+ public string AcoolyOrderNo { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗閲戦
+ /// </summary>
+ public decimal Amount { get; set; }
+
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ public ACOOLYStatusEnum ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 璁拌处鏃堕棿
+ /// </summary>
+ public DateTime FinishTime { get; set; }
+
+ /// <summary>
+ /// 鍐荤粨鐘舵��
+ /// </summary>
+ public ConsumptionFrozenStatusEnum FrozenStatus { get; set; }
+
+ /// <summary>
+ /// 璧勯噾娴佸悜
+ /// </summary>
+ public ConsumptionFlowEnum Flow { get; set; }
+
+ /// <summary>
+ /// 鎵ｆ閲戦
+ /// </summary>
+ public decimal DeductionAmount { get; set; }
+
+ /// <summary>
+ /// 鍐荤粨閲戦
+ /// </summary>
+ public decimal FrozenAmount { get; set; }
+}
+
+public class LifePayPhoneMesssageCodeLoginOutput
+{
+ /// <summary>
+ /// 鐢ㄦ埛Id
+ /// </summary>
+ public Guid UserId { get; set; }
+
+ /// <summary>
+ /// 鎺ㄥ箍鍛業D
+ /// </summary>
+ public string PromoterIdNumber { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏄悗鍙扮敤鎴�
+ /// </summary>
+ public bool IsBackClientUser { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍙�
+ /// </summary>
+ public List<ChannelOutput> ChannlesNum { get; set; }
+}
+
+public class ChannelOutput
+{
+ public string Name { get; set; }
+
+ public string ChannlesNum { get; set; }
+
+ public Guid ChannlesId { get; set; }
+
+ public LifePaySwitchTypeEnum SwitchType { get; set; }
+}
+
+public class BackClientUserInfoOutput
+{
+ /// <summary>
+ /// 鏄惁鏄悗鍙扮敤鎴�
+ /// </summary>
+ public bool IsBackClientUser { get; set; }
+
+ public string[] Roles { get; set; }
+
+ public bool IsSystem { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍙�
+ /// </summary>
+ public List<ChannelOutput> ChannleList { get; set; }
+}
+
+public class LifePayExpensesReceiptsListOutput
+{
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 娓犻亾娴佹按鍙�
+ /// </summary>
+ public string OutOrderNo { get; set; }
+
+ /// <summary>
+ /// 鏀粯娓犻亾
+ /// </summary>
+ public LifePayTypeEnum LifePayType { get; set; }
+
+ /// <summary>
+ /// 鏀舵敮绫诲瀷
+ /// </summary>
+ public ExpensesReceiptsTypeEnum ExpensesReceiptsType { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗閲戦
+ /// </summary>
+ public decimal Amount { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗鏃堕棿
+ /// </summary>
+ public DateTime FinishTime { get; set; }
+}
+public class LifePayExpensesReceiptsStatistics
+{
+ /// <summary>
+ /// 绱鏀跺叆
+ /// </summary>
+ public decimal TotalIncome { get; set; }
+
+ /// <summary>
+ /// 绱閫�娆�
+ /// </summary>
+ public decimal TotalRefund { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鏀跺叆
+ /// </summary>
+ public decimal RealIncome { get; set; }
+}
+
+public class LifePayLifePayChannlesRakeStatistics
+{
+ /// <summary>
+ /// 鍚堣浣ｉ噾
+ /// </summary>
+ public decimal TotalRakePrice { get; set; }
+}
+
+public class ReceiptsListOutPut
+{
+ /// <summary>
+ /// 30澶╂敹娆�
+ /// </summary>
+ public List<ReceiptsDetail> ReceiveList { get; set; } = new List<ReceiptsDetail>();
+
+ /// <summary>
+ /// 30澶╂敹鍏�
+ /// </summary>
+ public List<ReceiptsDetail> IncomeList { get; set; } = new List<ReceiptsDetail>();
+}
+
+public class ReceiptsDetail
+{
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public string CreationTime { get; set; }
+
+ /// <summary>
+ /// 閲戦
+ /// </summary>
+ public decimal Amount { get; set; }
+}
+
+public class ChannlesRakeListOutPut
+{
+ /// <summary>
+ /// 30澶╀剑閲�
+ /// </summary>
+ public List<ReceiptsDetail> ChannlesRakeList { get; set; } = new List<ReceiptsDetail> { };
+}
+
+public class ChannelDataListOutPut
+{
+ /// <summary>
+ /// Top5娓犻亾鏀舵
+ /// </summary>
+ public List<ChannelDataReceive> ReceiveList { get; set; } = new List<ChannelDataReceive>();
+
+ /// <summary>
+ /// Top5娓犻亾鐢ㄦ埛
+ /// </summary>
+ public List<ChannelDataUserNumber> UserNumberList { get; set; } = new List<ChannelDataUserNumber>();
+
+}
+
+public class ChannelDataReceive
+{
+ /// <summary>
+ /// 娓犻亾鍚嶇О
+ /// </summary>
+ public string ChannelName { get; set; }
+
+ /// <summary>
+ /// 鏀舵
+ /// </summary>
+ public decimal ReceivePrice { get; set; }
+
+ /// <summary>
+ /// 浣ｉ噾
+ /// </summary>
+ public decimal ChannlesRakePrice { get; set; }
+
+}
+
+public class ChannelDataUserNumber
+{
+ /// <summary>
+ /// 娓犻亾鍚嶇О
+ /// </summary>
+ public string ChannelName { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏁伴噺
+ /// </summary>
+ public int Number { get; set; }
+
+}
+
+
+public class LifePayChannlesRakeListOutput
+{
+
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鎴愪氦閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾姣斾緥
+ /// </summary>
+ public decimal ChannlesRakeRate { get; set; }
+
+ /// <summary>
+ /// 浣ｉ噾
+ /// </summary>
+ public decimal ChannlesRakePrice { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
+ /// 鎷撳睍灞炴��
+ /// </summary>
+ public string ExtraProperties { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟娓犻亾
+ /// </summary>
+ public string ChannelId { get; set; }
+}
+public class LifePayChannlesRakeListTemplate
+{
+ [Name("搴忓彿")]
+ public int SerialNumber { get; set; }
+
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ [Name("涓嬪崟鏃堕棿")]
+ public string CreationTimeStr { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ [Name("骞冲彴璁㈠崟鍙�")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鎴愪氦閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+ [Name("鎴愪氦閲戦(鍏�)")]
+ public string PayAmountStr { get; set; }
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾姣斾緥
+ /// </summary>
+ public decimal ChannlesRakeRate { get; set; }
+
+ [Name("浣ｉ噾姣斾緥")]
+ public string ChannlesRakeRateStr { get; set; }
+
+ /// <summary>
+ /// 浣ｉ噾
+ /// </summary>
+ public decimal ChannlesRakePrice { get; set; }
+
+ [Name("鍒嗕剑(鍏�)")]
+ public string ChannlesRakePriceStr { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+ [Name("缁撶畻鏃堕棿")]
+ public string FinishTimeStr { get; set; }
+}
--
Gitblit v1.9.1