提交

username@email.com

2022-07-06 1aa53fde5eb18a39c53daf910d69cb857913b08d

 zhengcaioa/Services/FiOrderrecievemoneyService.cs

@@ -200,7 +200,9 @@
                          && (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())



@@ -223,7 +225,7 @@
                             YishouMoney = lll.YishouMoney??0,
                             WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney??0),


                             HuiyuanId = ggg.HuiyuanId,



@@ -242,7 +244,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"))
                {