From 430a0ee2578917bd7524515c3273e487c3f83171 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 17:04:44 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index fca55d3..af8d6e1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -24,6 +24,7 @@
private readonly IRepository<LifePayRechargeReceipts, Guid> _lifePayRechargeReceiptsRepository;
private readonly IRepository<LifePayExpensesReceipts, Guid> _lifePayExpensesReceiptsRepository;
private readonly IRepository<LifePayConsumption, Guid> _lifePayConsumption;
+ private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
private readonly IAliPayApi _aliPayApi;
@@ -34,6 +35,7 @@
IRepository<LifePayExpensesReceipts, Guid> lifePayExpensesReceiptsRepository,
IRepository<LifePayConsumption, Guid> lifePayConsumptionRepository,
IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
+ IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayOrder, Guid> lifePayOrderRepository,
IAliPayApi aliPayApi,
IWxPayApi wxPayApi)
@@ -42,6 +44,7 @@
_lifePayExpensesReceiptsRepository = lifePayExpensesReceiptsRepository;
_lifePayConsumption = lifePayConsumptionRepository;
_lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
+ _lifePayChannlesRep = lifePayChannlesRep;
_lifePayOrderRepository = lifePayOrderRepository;
_aliPayApi = aliPayApi;
_wxPayApi = wxPayApi;
@@ -56,8 +59,9 @@
/// <returns></returns>
public async Task<PageOutput<LifePayConsumptionListOutput>> GetLifePayConsumptionPage(LifePayConsumptionPageInput input)
{
+ var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWord)).Select(x => x.ChannlesNum).ToListAsync();
var list = await _lifePayConsumption.Where(x => x.IsDeleted == false)
- .WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) || x.OutOrderNo.Contains(input.KeyWord) || x.ChannelId.Contains(input.KeyWord))
+ .WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) || x.AcoolyOrderNo.Contains(input.KeyWord) || channles.Contains(x.ChannelId))
.WhereIf(input.Flow.HasValue, x => x.Flow == input.Flow)
.WhereIf(input.TimeBegin.HasValue, x => x.FinishTime >= input.TimeBegin)
.WhereIf(input.TimeEnd.HasValue, x => x.FinishTime <= input.TimeEnd)
@@ -65,8 +69,9 @@
{
Id = x.Id,
OrderNo = x.OrderNo,
- OutOrderNo = x.OutOrderNo,
+ AcoolyOrderNo = x.AcoolyOrderNo,
Amount = x.Amount,
+ ACOOLYStatus = x.ACOOLYStatus,
FinishTime = x.FinishTime,
FrozenStatus = x.FrozenStatus,
Flow = x.Flow,
@@ -337,10 +342,12 @@
LifePayConsumption lifePayConsumption = new LifePayConsumption()
{
OrderNo = item.OrderNo,
- OutOrderNo = item.OutOrderNo,
- //Amount = item.PayAmount,
+ AcoolyOrderNo = item.ACOOLYOrderNo,
+ Amount = item.PlatformDeductionAmount.Value,
+ //ACOOLYStatus =
};
+
//switch (item.ACOOLYStatus)
//{
// case ACOOLYStatusEnum.鍏呭�间腑:
--
Gitblit v1.9.1