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),