From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 8f76c34..9532878 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -181,11 +181,25 @@
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()
+
+
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))
@@ -196,16 +210,18 @@
{
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),
@@ -238,7 +254,7 @@
}
}
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
--
Gitblit v1.9.1