From e464c8747667a0bbf6ea462539ec5c5f57074dce Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 16:35:09 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 2 +-
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 0e4a39c..ad5178a 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -242,7 +242,7 @@
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
- join b in _lifePayChannlesRep on a.ChannelId equals b.Id into temp
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
@@ -1585,7 +1585,7 @@
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
- join b in _lifePayChannlesRep on a.ChannelId equals b.Id into temp
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index f5336a2..f48715e 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -104,6 +104,6 @@
public Guid? RefundCheckUserId { get; set; }
- public Guid? ChannelId { get; set; }
+ public string? ChannelId { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1