From 0dfdacf054c5d9539a12da3f97402b1cf45ffb77 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 14:09:36 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index 8780794..f640885 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -117,7 +117,7 @@
public async Task<PageOutput<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakePage(LifePayChannlesRakePageInput input)
{
var list = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
- .WhereIf(input.ChannelId != null, x => x.ChannelId == input.ChannelId)
+ .WhereIf(input.ChannelId.IsNotNullOrEmpty(), x => x.ChannelId == input.ChannelId)
.WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
.WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
.WhereIf(input.FinishTimeBegin.HasValue, x => x.FinishTime >= input.FinishTimeBegin)
@@ -144,6 +144,51 @@
return list;
}
+ public async Task<List<LifePayChannlesRakeListTemplate>> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input)
+ {
+ //var result = await (await GetLifePayOrderListFilter(input)).Select(x => new LifePayOrderListTemplate
+ //{
+ // DiscountAmount = x.DiscountAmount,
+ // FinishTime = x.FinishTime,
+ // LifePayOrderStatus = x.LifePayOrderStatus,
+ // LifePayOrderType = x.LifePayOrderType,
+ // LifePayType = x.LifePayType,
+ // OrderNo = x.OrderNo,
+ // PayAmount = x.PayAmount,
+ // ActualRechargeAmount = x.RechargeAmount,
+ // PhoneNumber = x.PhoneNumber,
+ // RechargeAmount = x.RechargeAmount,
+ // OutOrderNo = x.OutOrderNo,
+ // PayStatus = x.PayStatus,
+ // PayTime = x.PayTime,
+ // ACOOLYOrderNo = x.ACOOLYOrderNo,
+ // CreationTime = x.CreationTime,
+ // LifePayRefundStatus = x.LifePayRefundStatus,
+ // ACOOLYStatus = x.ACOOLYStatus,
+ // //RefundApplyRemark = x.RefundApplyRemark,
+ // ChannelName = x.ChannelName,
+ // PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
+ //}).OrderByDescending(r => r.CreationTime).ToListAsync();
+ //var i = 0;
+ //result.ForEach(s =>
+ //{
+ // s.SerialNumber = ++i;
+ // s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
+ // s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ // s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
+ // s.PayAmountStr = s.PayAmount.ToString("F2");
+ // s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ // s.LifePayTypeStr = s.LifePayType.GetDescription();
+ // s.PayStatusStr = s.PayStatus.GetDescription();
+ // s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
+ // s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
+ // s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
+ // s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
+ // s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ //});
+ return null;
+ }
+
#endregion
--
Gitblit v1.9.1