管理中心售后表

代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/ManagementCenterController.cs

@@ -46,15 +46,37 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
         public async Task<IActionResult> Realtimesales(string time)
         {
             if (string.IsNullOrEmpty(time))
-                time = DateTime.Now.ToString("yyyy-MM-dd"); 
-            var todaycustomer = _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + " 00:00:00") && x.F_CreateOn <= DateTime.Parse(time + " 23:59:59")).Result;//新增客户
-            var yesterday= _cus_vip_infoRepository.GetListALL(x => x.F_CreateOn >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_CreateOn <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result;//昨日新增客户
+                time = DateTime.Now.ToString("yyyy-MM-dd");
+            List<IConditionalModel> cosModels = new List<IConditionalModel>();
+            cosModels.Add(new ConditionalModel() { FieldName = "F_CreateOn", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = time + " 00:00:00" });
+            cosModels.Add(new ConditionalModel() { FieldName = "F_CreateOn", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = time + " 23:59:59" });
+            var todaycustomer = _cus_vip_infoRepository.GetListALL(cosModels, "F_CreateOn asc").Result;//新增客户
+            List<IConditionalModel> cosoldModels = new List<IConditionalModel>();
+            cosoldModels.Add(new ConditionalModel() { FieldName = "F_CreateOn", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = DateTime.Parse(time ).AddDays(-1).ToString ("yyyy-MM-dd") + " 00:00:00"});
+            cosoldModels.Add(new ConditionalModel() { FieldName = "F_CreateOn", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = DateTime.Parse(time).AddDays(-1).ToString("yyyy-MM-dd") + " 23:59:59" });
+            var yesterday= _cus_vip_infoRepository.GetListALL(cosoldModels, "F_CreateOn asc").Result;//昨日新增客户
+
+
             int newcustomer = todaycustomer != null ? todaycustomer.Count ():0;//新增客户
             int oldcustomer = yesterday != null ? yesterday.Count() : 0;//昨日新增客户
-            int neworder = _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00") && x.F_AddTime <= DateTime.Parse(time + " 23:59:59")).Result != null ? _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00") && x.F_AddTime <= DateTime.Parse(time + " 23:59:59")).Result.Count : 0;
-            int oldorder = _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_AddTime <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result != null ? _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time + " 00:00:00").AddDays(-1) && x.F_AddTime <= DateTime.Parse(time + " 23:59:59").AddDays(-1)).Result.Count : 0;
-            int newaftersale = _bus_OrderRepository.GetListALL (Aftersale(DateTime.Parse(time)), " F_AddTime DESC").Result !=null ? _bus_OrderRepository.GetListALL(Aftersale(DateTime.Parse(time)), " F_AddTime DESC").Result.Count : 0;//售后订单量
-            int oldaftersale = _bus_OrderRepository.GetListALL(Aftersale(DateTime.Parse(time).AddDays(-1)), " F_AddTime DESC").Result != null ? _bus_OrderRepository.GetListALL(Aftersale(DateTime.Parse(time).AddDays(-1)), " F_AddTime DESC").Result.Count:0;//昨日订单量
+
+
+
+            List<IConditionalModel> cosorderModels = new List<IConditionalModel>();
+            cosorderModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = time + " 00:00:00" });
+            cosorderModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = time + " 23:59:59" });
+            int neworder = _bus_OrderRepository.GetListALL(cosorderModels, "F_AddTime asc").Result.Count;
+
+            List<IConditionalModel> oldorderModels = new List<IConditionalModel>();
+            oldorderModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = DateTime.Parse(time).AddDays(-1).ToString("yyyy-MM-dd") + " 00:00:00" });
+            oldorderModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = DateTime.Parse(time).AddDays(-1).ToString("yyyy-MM-dd") + " 23:59:59" });
+            int oldorder = _bus_OrderRepository.GetListALL(oldorderModels, "F_AddTime asc").Result.Count ;
+
+
+            int newaftersale = _busAfterSaleRepository.GetListALL (cosorderModels, " F_AddTime DESC").Result.Count ;//售后订单量
+
+            int oldaftersale = _busAfterSaleRepository.GetListALL(oldorderModels, " F_AddTime DESC").Result.Count;//昨日售后订单量
+
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             int newcustomers = 0;//新客户下单量
             int oldcustomers = 0;//昨日新客户下单量
@@ -125,14 +147,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             };
             return Content(obj.ToJson());
         }
-        private List<IConditionalModel> Aftersale(DateTime time)
-        {
-            List<IConditionalModel> conModels = new List<IConditionalModel>();
-            conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "售后订单" });
-            conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = time.ToString("yyyy-MM-dd 23:59:59") });
-            conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = time.ToString("yyyy-MM-dd 00:00:00") });
-            return conModels;
-        }
+    
             private List<IConditionalModel> ConModels (DateTime time,string F_VipId,bool n )
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
@@ -220,11 +235,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
                     reviewreturn = Order.Where(x => x.F_State == 2).Count();//审核退回
                     tobedistribution = Order.Where(x => x.F_State == 3).Count();//审核退回
                     tobecollected = Order.Where(x => x.F_PayState == 0).Count();//待回款
-                aftersale = Order.Where(x => x.F_Type =="售后订单").Count();//售后订单
                 toberefunded = Order.Where(x => x.F_PayState  == 2).Count();
             }
                 if (AfterOrder!=null )
             {
+                aftersale = AfterOrder.Count();//售后订单
                 toberefunded += AfterOrder.Where(x => x.F_Type == 2 || x.F_Type == 3).Count();
                 pendingclaims = AfterOrder.Where(x => x.F_Type ==6).Count();
             }
@@ -430,14 +445,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
 
 
         /// <summary>
-        /// 当月任务总量
+        /// 售后表
         /// </summary>
         /// <param name="time"></param>
         /// <returns></returns>
         [HttpGet("aftersale")]
         public async Task<IActionResult> Aftersale(string month)
         {
-            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+           // string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             DateTime time = DateTime.Now;
             if (!string.IsNullOrEmpty(month))
                 time = DateTime.Parse (month);
@@ -447,10 +462,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             {
                 days = DateTime.Now.Day;
             }
-            var order = _bus_OrderRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time.ToString("yyyy-MM-01"))
-              && x.F_AddTime <= time && x.F_State == 6).Result;
-            var after = _busAfterSaleRepository.GetListALL(x => x.F_AddTime >= DateTime.Parse(time.ToString("yyyy-MM-01"))
-             && x.F_AddTime <= time).Result;
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = time.ToString("yyyy-MM-01") });
+            conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = time.ToString("yyyy-MM") + "-" + days + " 23:59:59" });
+            var after = _busAfterSaleRepository.GetListALL(conModels, "F_AddTime asc ").Result;
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "6" });
+            var order = _bus_OrderRepository.GetListALL(conModels, "F_AddTime asc ").Result;
+
+
             var dept = _sys_departmentRepository.GetListALL(x => x.F_DeptName == "销售").Result;
             int refunds = 0; decimal refundamounts =0;
             if (dept != null)
@@ -468,12 +487,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
                             var aftertotal= after.Where
                                 (x => x.F_CheckUserXS == it.F_UserId);
                             var aftersale = after.Where
-                                (x => x.F_AddTime >= DateTime.Parse(time.ToString("yyyy-MM-" + days))
-                           && x.F_AddTime <= DateTime.Parse(time.ToString("yyyy-MM-" + days)));
+                                (x => x.F_AddTime >= DateTime.Parse(time.ToString("yyyy-MM") + "-" + i)
+                           && x.F_AddTime <= DateTime.Parse(time.ToString("yyyy-MM"  ) + "-"+ i +" 23:59:59"));
+
                             aftersaleInput.time = time.Month + "月" + i + "日";
                             aftersaleInput.name = it.F_UserName;
-                            aftersaleInput.total = order.Where (x =>x .F_Belong == it.F_UserId&& x.F_AddTime >= DateTime.Parse(time.ToString("yyyy-MM-" + days))
-                           && x.F_AddTime <= DateTime.Parse(time.ToString("yyyy-MM-" + days)) && x.F_Type == "售后订单").Count ();
+                            aftersaleInput.total = order.Where (x =>x .F_Belong == it.F_UserId&& x.F_AddTime >= DateTime.Parse(time.ToString("yyyy-MM") + "-" + i)
+                           && x.F_AddTime <= DateTime.Parse(time.ToString("yyyy-MM" ) + "-"+i + " 23:59:59") && x.F_Type == "售后订单").Count ();
                             aftersaleInput.problem = aftersale.Where(x => x.F_ReturnType == "产品问题").Count();
 
                             aftersaleInput.warehousehair = aftersale.Where(x => x.F_ReturnType == "仓库错发" ||
@@ -499,7 +519,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
 
                         }
                     }
-                    string msg = time.Year +"年"+ time.Month  + "4月份400销售中心共发货"+order .Count ()+"单, 退款共"+ refunds + "单，退款总金额为"+ refundamounts + "元。";
+                    string msg = time.Year +"年"+ time.Month  + "月份400销售中心共发货"+order .Count ()+"单, 退款共"+ refunds + "单，退款总金额为"+ refundamounts + "元。";
                     var obj = new
                     {
                         state = "success",