From 6c866f17f43d6b672d03c9dd5bb0c60448be6c40 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 18:02:33 +0800
Subject: [PATCH] fix: bug
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 20 +++++++++++---------
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 8 ++++----
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index 978a80a..e6c7ebc 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -303,15 +303,7 @@
/// </summary>
public DateTime? EndFinishTime { get; set; }
- /// <summary>
- /// 寮�濮嬮��娆炬椂闂�
- /// </summary>
- public DateTime? BeginRefundTime { get; set; }
-
- /// <summary>
- /// 缁撴潫閫�娆炬椂闂�
- /// </summary>
- public DateTime? EndRefundTime { get; set; }
+
/// <summary>
/// 鐢ㄦ埛Id
@@ -357,6 +349,16 @@
public DateTime? EndFinishTime { get; set; }
/// <summary>
+ /// 寮�濮嬮��娆炬椂闂�
+ /// </summary>
+ public DateTime? BeginRefundTime { get; set; }
+
+ /// <summary>
+ /// 缁撴潫閫�娆炬椂闂�
+ /// </summary>
+ public DateTime? EndRefundTime { get; set; }
+
+ /// <summary>
/// 鏀粯鐘舵��
/// </summary>
public LifePayStatusEnum? PayStatus { get; set; }
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index e4a7211..f67f67c 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -246,8 +246,8 @@
{
var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
- .WhereIf(input.BeginRefundTime.HasValue, x => x.FinishTime >= input.BeginRefundTime)
- .WhereIf(input.EndRefundTime.HasValue, x => x.FinishTime <= input.EndRefundTime)
+ .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
+ .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
.WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
.WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
@@ -303,8 +303,8 @@
var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
.Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑
|| x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆�)
- .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
- .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
+ .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime)
+ .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime)
.WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
.WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
.WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
--
Gitblit v1.9.1