Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

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

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Common;
 using System.IRepositories;
 using System.Linq;
+using System.Security.Claims;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
@@ -13,13 +15,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
     [Route("api/[controller]")]
     public class ManagementCenterController : BaseController
     {
-        private readonly ICus_VipInfoRepository _cus_vip_infoRepository;
-        private readonly ISys_UserAccountRepository _sys_useraccountRepository;
-        private readonly ISys_TaskManagementRepository _sys_taskmanagement_Repository;
-        private readonly ISys_DepartmentRepository _sys_departmentRepository;
-        public ManagementCenterController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository,
-            ISys_UserAccountRepository sys_useraccountRepository)
+        private readonly IBus_OrderRepository _bus_OrderRepository;//订单
+        private readonly ICus_VipInfoRepository _cus_vip_infoRepository;//客户
+        private readonly ISys_UserAccountRepository _sys_useraccountRepository;//用户
+        private readonly ISys_TaskManagementRepository _sys_taskmanagement_Repository;//任务
+        private readonly ISys_DepartmentRepository _sys_departmentRepository;//部门
+        public ManagementCenterController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_TaskManagementRepository sys_taskmanagement_Repository, ISys_DepartmentRepository sys_departmentRepository, ISys_UserAccountRepository sys_useraccountRepository,IBus_OrderRepository bus_OrderRepository)
         {
+            _bus_OrderRepository = bus_OrderRepository;
             _cus_vip_infoRepository = cus_vip_infoRepository;
             _sys_taskmanagement_Repository = sys_taskmanagement_Repository;
             _sys_departmentRepository = sys_departmentRepository;
@@ -34,17 +37,123 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
         public async Task<IActionResult> Realtimesales(string time)
         {
             if (string.IsNullOrEmpty(time))
-                time = DateTime.Now.ToString("yyyy-MM-dd");
-            var customer = _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")).Result;
-            int newcustomer = customer .Select (x=>x.F_CreateOn >= DateTime.Parse(time + "00:00:00")&& x.F_CreateOn <= DateTime.Parse(time + "23:59:59")) != null ? customer .Select(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00") && x.F_CreateOn <= DateTime.Parse(time + "23:59:59")).Count ():0;//新增客户
-            int oldcustomer = customer.Select(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00").AddDays (-1) && x.F_CreateOn <= DateTime.Parse(time + "23:59:59").AddDays(-1)) != null ? customer.Select(x => x.F_CreateOn >= DateTime.Parse(time + "00:00:00").AddDays(-1) && x.F_CreateOn <= DateTime.Parse(time + "23:59:59").AddDays(-1)).Count() : 0;//昨日新增客户
+                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;//昨日新增客户
+            int newcustomer = todaycustomer != null ? todaycustomer.Count ():0;//新增客户
+            int oldcustomer = yesterday != null ? yesterday.Count() : 0;//昨日新增客户
             int newaftersale = 0;//售后订单量
             int oldaftersale = 0;//昨日订单量
-            int customerorder = 0;
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            int newcustomers = 0;//新客户下单量
+            int oldcustomers = 0;//昨日新客户下单量
+            int newcustomerorder = 0;//老客户下单量
+            int oldcustomerorder = 0;//昨日老客户下单量
+            string vipid = "";
+            if (newcustomer>0)
+            {
+                string  F_VipId = "";
+                foreach (var it in todaycustomer)
+                {
+                    if (F_VipId == "")
+                        F_VipId = it.F_ID + "";
+                    else
+                        F_VipId +=","+ it.F_ID + "";
+                    if (vipid == "")
+                        vipid = it.F_ID + "";
+                    else
+                        vipid += "," + it.F_ID + "";
+                }
+                if (F_VipId == "")
+                    newcustomers = 0;
+                else 
+                newcustomers = _bus_OrderRepository.GetListALL(ConModels(DateTime .Parse (time), F_VipId,true ), " F_AddTime DESC").Result != null ? _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time), F_VipId, true), " F_AddTime DESC").Result.Count : 0;
+            }
+            if (vipid == "")
+                newcustomerorder = 0;
+            else
+                newcustomerorder = _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time), vipid, false), " F_AddTime DESC").Result != null ? _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time), vipid, false), " F_AddTime DESC").Result.Count : 0;
+            if (oldcustomer > 0)
+            { 
+                string F_VipId = "";
+                foreach (var it in yesterday)
+                {
+                    if (F_VipId == "")
+                        F_VipId = it.F_ID + "";
+                    else
+                        F_VipId += "," + it.F_ID + "";
+                    if (vipid == "")
+                        vipid = it.F_ID + "";
+                    else
+                        vipid += "," + it.F_ID + "";
+                }
+                if (F_VipId == "")
+                    oldcustomers = 0;
+                else 
+                oldcustomers = _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time).AddDays (-1), F_VipId, true), " F_AddTime DESC").Result != null ? _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time).AddDays(-1), F_VipId,true), " F_AddTime DESC").Result.Count : 0;
+            }
+            if (vipid == "")
+                oldcustomerorder = 0;
+            else
+                oldcustomerorder = _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time).AddDays(-1), vipid, false), " F_AddTime DESC").Result != null ? _bus_OrderRepository.GetListALL(ConModels(DateTime.Parse(time).AddDays(-1), vipid, false), " F_AddTime DESC").Result.Count : 0;
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                 newcustomer,//新增客户
+                oldcustomer ,//昨日新增客户
+                newaftersale ,//售后订单量
+                oldaftersale,//昨日订单量
+                newcustomers,//新客户下单量
+                oldcustomers,//昨日新客户下单量
+                newcustomerorder,//老客户下单量
+                oldcustomerorder,//昨日老客户下单量
 
+            };
+            return Content(obj.ToJson());
+        }
+        private List<IConditionalModel> ConModels (DateTime time,string F_VipId,bool n )
+        {
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
+            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") });
+            if (n )
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_VipId", ConditionalType = ConditionalType.In, FieldValue = F_VipId });
+            }
+            else
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_VipId", ConditionalType = ConditionalType.NotIn, FieldValue = F_VipId });
+            }
+            return conModels;
+        }
+        /// <summary>
+        /// 实时销售行为分析
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        [HttpGet("totaltasks")]
+        public async Task<IActionResult> Totaltasks(string time)
+        {
+            if (string.IsNullOrEmpty(time))
+                time = DateTime.Now.ToString("yyyy-MM");
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            int userid= _sys_useraccountRepository.GetSingle(x => x.F_UserCode  == user).Result!=null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_UserId:0;
+            if (userid > 0)
+            {
+                List<IConditionalModel> conModels = new List<IConditionalModel>();
+                conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
+                conModels.Add(new ConditionalModel() { FieldName = "F_CreateTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = DateTime .Parse ( time).AddMonths (1).AddDays (-1).ToString("yyyy-MM-dd 23:59:59") });
+                conModels.Add(new ConditionalModel() { FieldName = "F_CreateTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = DateTime.Parse(time).ToString("yyyy-MM-01 00:00:00") });
+                return null;
+            }
+                else
+                return Error("查询失败");
 
-            return null;
         }
 
+
+
     }
 }

代码/TVShoppingCallCenter_ZLJ/Controllers/MediaCente/MediaCenteController.cs

@@ -90,6 +90,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
          string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             var model = new T_Sys_MediaCente();
             model =  Transformation(model, input, user, 0);
+            model.F_State = 0;
             var res = await _sys_mediacenter_Repository.Add(model);
             if (res > 0)
             {
@@ -231,7 +232,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
-            conModels.Add(new ConditionalModel() { FieldName = "F_ParentId", ConditionalType = ConditionalType.Equal, FieldValue = pid.ToString() });
             var list_ModuleInfo = await _sys_areaRepository.GetListALL(conModels, "F_Code asc");
 
             var treeList = new List<TreeModel>();
@@ -244,7 +244,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
                 treeModel.parentid = item.F_ParentId.Value;
                 treeList.Add(treeModel);
             }
-            return Success("获取地区树成功", TreeRecursion(treeList,0));
+            return Success("获取地区树成功", TreeRecursion(treeList, pid));
         }
         /// <summary>
         /// 递归算法
@@ -377,37 +377,34 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
 
                 }
             }
-            if (type >0)
+            MediaCente.F_IsRemind = (int)it.F_IsRemind; //是否提醒
+            MediaCente.F_DeptId = it.F_DeptId; //提醒部门
+            string deptmsg = "";
+            if (!string.IsNullOrEmpty(it.F_DeptId))
             {
-                MediaCente.F_IsRemind = (int)it.F_IsRemind; //是否提醒
-                MediaCente.F_DeptId = it.F_DeptId; //提醒部门
-                string deptmsg = "";
-                if (!string .IsNullOrEmpty (it .F_DeptId ))
+                try
                 {
-                    try
-                    {
-                       
-                        string[] sprit = it.F_DeptId.Split(',');
-                        foreach (var iv in sprit)
-                        {
-                           
-                            if (deptmsg=="")
-                                deptmsg= _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result != null ? _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result.F_DeptName : "";
-                            else
-                                deptmsg= deptmsg+","+ _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result != null ? _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result.F_DeptName : "";
 
-                        }
-                      
-                    }
-                    catch
+                    string[] sprit = it.F_DeptId.Split(',');
+                    foreach (var iv in sprit)
                     {
 
+                        if (deptmsg == "")
+                            deptmsg = _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result != null ? _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result.F_DeptName : "";
+                        else
+                            deptmsg = deptmsg + "," + _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result != null ? _sys_departmentRepository.GetSingle(x => x.F_DeptId == int.Parse(iv)).Result.F_DeptName : "";
+
                     }
-                   
+
+                }
+                catch
+                {
+
                 }
-                MediaCente.F_DeptName = deptmsg;
-                MediaCente.F_ReminderTime = it.F_ReminderTime; //提醒时间
+
             }
+            MediaCente.F_DeptName = deptmsg;
+            MediaCente.F_ReminderTime = it.F_ReminderTime; //提醒时间
             MediaCente.F_MediaChange = it.F_MediaChange; //媒体变更  ID
             if (type > 0)
             {
@@ -420,8 +417,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
                         PlanManagemenInput t_Sys_PlanManagemen = new PlanManagemenInput();
                         var planplay = _sys_planmanagemenRepository.GetSingle(x => x.F_Id == int.Parse(ib)).Result;
                         t_Sys_PlanManagemen.F_Type =(int ) planplay.F_Type;//0计划1媒体变更 
-                        t_Sys_PlanManagemen.F_State = planplay.F_State.ToString ();//状态
-                        t_Sys_PlanManagemen.F_ChangeType = (int)planplay.F_ChangeType;//变更类型字典
+                        t_Sys_PlanManagemen.F_ChangeType = planplay.F_ChangeType!=null ? (int )planplay.F_ChangeType:0 ;//变更类型字典
                         t_Sys_PlanManagemen.F_ChangeTypeName= _sys_dictionaryRepository.GetSingle(x => x.F_ValueId == planplay.F_ChangeType).Result.F_Value;//  /变更类型
                         t_Sys_PlanManagemen.F_ChangeTime = planplay.F_ChangeTime;//变更时间
                         t_Sys_PlanManagemen.F_Describe = planplay.F_Describe;//变更说明

代码/TVShoppingCallCenter_ZLJ/Controllers/TaskManagement/TaskManagementController.cs

@@ -400,7 +400,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
                     }
                     if (_sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString()).Result != null)
                     {
-                        model.F_Tasker = _sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString()).Result.F_UserId ;
+                        model.F_Tasker = _sys_useraccountRepository.GetSingle(x => x.F_UserName == dr["任务人"].ToString()).Result.F_UserId   ;
                       
                     }
                     else