From ad97a60eb0ff674a4e7419d2102e5a635c2122f2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 28 十月 2021 14:42:52 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 2 +-
zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs | 4 ++++
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs b/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
index 5d34850..9c8fcbd 100644
--- a/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
+++ b/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
@@ -10,6 +10,7 @@
public string OrderId { get; set; }
public decimal? Recievemoney { get; set; }
public string PayType { get; set; }
+ public string HuiyuanId { get; set; }
public DateTime PayTime { get; set; }
public string Remark { get; set; }
public string RecStatus { get; set; }
@@ -48,6 +49,9 @@
public string HuiyuanId { get; set; }
public string StartTime { get; set; }
public string EndTime { get; set; }
+ public string[] HuiyuanIds { get; set; }
+
+ public string[] OrderTypes { get; set; }
}
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,
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index 6d66d4f..95b623a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -322,7 +322,7 @@
{
search.page = 1;
- search.rows = 1;
+ search.rows = 10000;
search.Fkzt = "03";
ResultDataEntity<FiOrderrecievemoneyDTO> resultDataEntity = _fiOrderrecievemoneyService.SearchByPaging(search);
--
Gitblit v1.9.1