From c1ec7e06f7b44beaf793af23477e1134451c80ae Mon Sep 17 00:00:00 2001
From: PC-201906131823\Administrator <zyyao>
Date: 星期三, 10 十一月 2021 08:59:06 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 9532878..cce3cfd 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -200,6 +200,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || ggg.HuiyuanId == searchEntity.HuiyuanId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.StartTime) || a.XdTime >= DateTime.Parse(searchEntity.StartTime) )
&& (string.IsNullOrWhiteSpace(searchEntity.EndTime) || a.XdTime <= DateTime.Parse(searchEntity.EndTime).AddSeconds(1))
+ && ((searchEntity.HuiyuanIds == null || searchEntity.HuiyuanIds.Length == 0) || searchEntity.HuiyuanIds.Contains(ggg.HuiyuanId))
+ && ((searchEntity.OrderTypes == null || searchEntity.OrderTypes.Length == 0) || searchEntity.OrderTypes.Contains(a.OrderType))
@@ -223,7 +225,7 @@
YishouMoney = lll.YishouMoney??0,
WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney??0),
-
+ HuiyuanId = ggg.HuiyuanId,
--
Gitblit v1.9.1