From b8d3cc1f394d47c9f50a8823577942a468778e69 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 17:56:34 +0800
Subject: [PATCH] fix;新增字段
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 17 ++++++++++++++---
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 2 --
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 17 ++++++++++++++++-
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
index 853074a..82c7994 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -10,8 +10,6 @@
public interface ILifePayService : IApplicationService
{
-
-
Task<TopStatisticsOutput> GetTopStatistics();
/// <summary>
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index dc33a4a..38e0732 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -474,6 +474,12 @@
/// </summary>
public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string? RefundOrderNo { get; set; }
+
/// <summary>
/// 璁㈠崟鍙�
/// </summary>
@@ -507,7 +513,7 @@
/// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ public LifePayOrderStatusEnum Status { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
@@ -539,9 +545,14 @@
/// </summary>
public string RefundCredentialsImgUrl { get; set; }
-
+ /// <summary>
+ /// 閫�娆惧師鍥�
+ /// </summary>
public string RefundApplyRemark { get; set; }
+ /// <summary>
+ /// 椹冲洖鍘熷洜
+ /// </summary>
public string RefundCheckRemark { get; set; }
/// <summary>
@@ -553,7 +564,6 @@
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
-
/// <summary>
/// 瀹為檯鍏呭�奸噾棰�
@@ -600,6 +610,7 @@
/// 鎵嬬画璐�
/// </summary>
public decimal PremiumPrice { get; set; }
+
/// <summary>
/// 骞冲彴鍒╂鼎
/// </summary>
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 866cf83..dc14ec6 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -92,6 +92,21 @@
var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.ToString("yyyy-MM-dd") == today).FirstOrDefaultAsync();
if (statistics == null)
{
+ //var accumulatedReceipts = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.PayAmount);
+
+ var entity = new DallyStatistics()
+ {
+ Id = GuidGenerator.Create(),
+ CreationTime = DateTime.Now,
+ Amount = "0",
+ AccumulatedReceipts = "0",
+ ReceiptsYesterda = "0",
+ AccumulatedOrders = "0",
+ OrdersNumYesterda = "0",
+ YesterdaSuccess = "0",
+ YesterdaFail = "0",
+ AccumulatedUsers = "0",
+ };
return new TopStatisticsOutput();
}
@@ -308,7 +323,7 @@
Id = order.Id,
OutOrderNo = order.OutOrderNo,
LifePayChannle = channle.ChannlesName,
- LifePayOrderStatus = order.LifePayOrderStatus,
+ Status = order.LifePayOrderStatus,
LifePayOrderType = order.LifePayOrderType,
LifePayType = order.LifePayType,
OrderNo = order.OrderNo,
--
Gitblit v1.9.1