From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 773918e..682dddb 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -181,12 +181,32 @@
into ksssss
from kkk in ksssss.DefaultIfEmpty()
+
+ join n in _context.FiBooks
+ on a.OrderType1 equals n.Id
+ into nsssss
+ from nnn in nsssss.DefaultIfEmpty()
+
+ join m in _context.FiMembers
+ on a.OrderType1 equals m.Id
+ into msssss
+ from mmm in msssss.DefaultIfEmpty()
+
+ join s in _context.PltUsers
+ on a.Creater equals s.Id
+ into ssssss
+ from sss in ssssss.DefaultIfEmpty()
+
where a.RecStatus == "A" && a.ChedanStatus == "D"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.OrderType) || a.OrderType == searchEntity.OrderType.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.OrderNo) || a.OrderNo.Contains(searchEntity.OrderNo.Trim()))
-
-
+ && (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))
+ && (string.IsNullOrWhiteSpace(searchEntity.OrderType1) || a.OrderType1 == searchEntity.OrderType1.Trim())
@@ -196,18 +216,20 @@
{
Id = a.Id,
OrderId = a.Id,
- XdTimeName = a.XdTime.ToString("yyyy-MM-dd"),
+ XdTime = a.XdTime,
+ XdTimeName = a.XdTime.ToString("yyyy-MM-dd HH:mm:ss"),
OrderNo = a.OrderNo,
OrderNum = a.OrderNum,
Khdw = a.Khdw,
KhdwName = ggg.Name,
OrderType = a.OrderType,
OrderTypeName = fff.Comments,
- Money = (a.Money ?? 0) - (a.Youhui ?? 0),
+ OrderTypeName1 = fff.Comments +"-"+ (string.IsNullOrEmpty(nnn.BookName) ? string.IsNullOrEmpty(mmm.MemberType) ? a.OrderType1 : mmm.MemberType : nnn.BookName) + (string.IsNullOrEmpty(a.OrderType2)?"":"-"+ a.OrderType2),
+ Money = (a.Money ?? 0)/* - (a.Youhui ?? 0)*/,
YishouMoney = lll.YishouMoney??0,
- WeishouMoney = (a.Money ?? 0) - (a.Youhui ?? 0) - (lll.YishouMoney??0),
+ WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney??0),
-
+ HuiyuanId = ggg.HuiyuanId,
@@ -215,7 +237,7 @@
Creater = a.Creater,
Createtime = a.Createtime,
-
+ CreaterName = sss.UserName,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
@@ -226,7 +248,7 @@
if ( !string.IsNullOrWhiteSpace(searchEntity.Fkzt)){
if (searchEntity.Fkzt.Trim().Equals("01"))
{
- query = query.Where(x => x.YishouMoney <= 0).OrderByDescending(x => x.OrderNo).ToList();
+ query = query.Where(x => x.YishouMoney <= 0 && x.WeishouMoney>0).OrderByDescending(x => x.OrderNo).ToList();
}
else if (searchEntity.Fkzt.Trim().Equals("02"))
{
@@ -240,7 +262,15 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.OrderNum) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Money) , 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.YishouMoney), 2);
+ data.Heji4 = Math.Round(query.Sum(x => x.WeishouMoney), 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.OrderNum)??0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Money), 2);
+ data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.YishouMoney) , 2);
+ data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.WeishouMoney) , 2);
data.LoadData(searchEntity, lianlist);
return data;
}
--
Gitblit v1.9.1