提交

username@email.com

2021-10-28 ad97a60eb0ff674a4e7419d2102e5a635c2122f2

提交

 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; }


    }

 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,




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