修改

代码/System.Common/Filter/ActionFilter.cs

@@ -61,7 +61,8 @@ namespace System.Common
                 {
                     param = request.Form.ToJson();
                 }
-                log.Error("IP：" + ip.ToString() + "|||UserInfo：" + userinfo + "|||ContentType：" + request.ContentType + "|||Params：" + param);
+                  log.Error("IP：" + ip.ToString() + "|||UserInfo：" + userinfo + "|||ContentType：" + request.ContentType + "|||Params：" + param);
+              
 
             }
             base.OnActionExecuting(context);

代码/System.Common/Filter/ExceptionFilter.cs

@@ -50,8 +50,8 @@ namespace System.Common
                 + "|||Error："+ context.Exception.ToString() + "|||/r/n<br>\\r\\n" + context.Exception.StackTrace;
             log.Error(strError);
 
-            //context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = "系统异常，请稍后重试" }.ToJson() };
-            context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = strError }.ToJson() };
+            context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = "系统异常，请稍后重试" }.ToJson() };
+           // context.Result = new ContentResult() { Content = new AjaxResult { state = ResultTypes.error.ToString(), message = strError }.ToJson() };
 
             base.OnException(context);
         }

代码/System.Common/Helpers/Billoflading.cs

@@ -72,5 +72,10 @@ namespace System.Common.Helpers
         public decimal? sendmoney;
         public decimal? signformoney;
     }
-    
+    public class kingNo
+    {
+        public string F_Id;
+        public string F_TrackingNo;
+    }
+
 }

代码/System.Common/Helpers/NPOIHelper.cs

@@ -617,8 +617,95 @@ namespace System.Common.Helpers
                 return bs;
             }
         }
+        /// <summary>
+        /// 下载excel
+        /// </summary>
+        /// <param name="cols"></param>
+        /// <returns></returns>
+        public byte[] kingNoExportToExcel(List <string > objs, string[] cols = null, string[] colname = null)
+        {
+            IWorkbook workbook = new XSSFWorkbook();
+            ISheet sheet = workbook.CreateSheet("Sheet1");
+
+            ICellStyle HeadercellStyle = workbook.CreateCellStyle();
+            HeadercellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+            HeadercellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+            HeadercellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+            HeadercellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+            HeadercellStyle.Alignment = HorizontalAlignment.Center;
+            HeadercellStyle.FillForegroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
+            HeadercellStyle.FillPattern = FillPattern.SolidForeground;
+            HeadercellStyle.FillBackgroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
+
+            //字体
+            NPOI.SS.UserModel.IFont headerfont = workbook.CreateFont();
+            headerfont.Boldweight = (short)FontBoldWeight.Bold;
+            headerfont.FontHeightInPoints = 12;
+            HeadercellStyle.SetFont(headerfont);
+
+
+
+            if (objs.Count   > 0)
+            {
+                ICellStyle cellStyle = workbook.CreateCellStyle();
+
+                //为避免日期格式被Excel自动替换，所以设定 format 为 『@』 表示一率当成text來看
+                cellStyle.DataFormat = HSSFDataFormat.GetBuiltinFormat("@");
+                cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+
+
+                NPOI.SS.UserModel.IFont cellfont = workbook.CreateFont();
+                cellfont.Boldweight = (short)FontBoldWeight.Normal;
+                cellStyle.SetFont(cellfont);
+
+                int icolIndex = 0;
+                IRow headerRow = sheet.CreateRow(0);
+
+             
+                foreach (string dc in cols)
+                {
+                    ICell cell = headerRow.CreateCell(icolIndex);
+                    cell.SetCellValue(dc);
+                    cell.CellStyle = HeadercellStyle;
+
+                    sheet.SetDefaultColumnStyle(icolIndex, cellStyle);
 
+                    icolIndex++;
+                }
+                //处理数据内容
+                //建立内容行
+                int iRowIndex = 0;
 
+                for (int i  = 0; i < objs.Count; i++)
+                {
+                    IRow irow5 = sheet.CreateRow(1 + i );
+                    ICell cell2 = irow5.CreateCell(0);
+                    cell2.SetCellValue(objs [i ]);
+                    cell2.CellStyle = cellStyle;
+                }
+
+            }
+            //自适应列宽度
+            for (int i = 0; i < 2; i++)
+            {
+                sheet.AutoSizeColumn(i);
+            }
+            using (MemoryStream ms = new MemoryStream())
+            {
+                workbook.Write(ms);
+                byte[] bs = ms.ToArray();
+
+                workbook = null;
+                ms.Close();
+                ms.Dispose();
+
+                return bs;
+            }
+        }
+       
         /// <summary>
         /// 下载excel
         /// </summary>

代码/System.Model/Bus/T_Bus_ChatLog.cs

@@ -106,6 +106,9 @@ namespace System.Model.Bus
             set { _f_updatetime = value; }
             get { return _f_updatetime; }
         }
+        /// <summary>
+        /// 0订单1会员
+        /// </summary>
         public int F_State { set; get; } = 0;
         #endregion Model
 

代码/System.Model/Bus/T_Bus_Order.cs

@@ -623,7 +623,12 @@ namespace System.Model
         /// 订购次数
         /// </summary>
         public int VipCount { set; get; } = 0;
+
         public DateTime  F_Waybill { set; get; }
+
+        public int? F_Department { set; get; } = 0;//部门
+        public int? F_Core { set; get; } = 0;//中心
+        public int? F_Group { set; get; } = 0;//小组
         #endregion Model
 
     }

代码/System.Model/Call/T_Call_Distribution.cs

@@ -37,7 +37,7 @@ namespace System.Model
         /// <summary>
         /// 部门
         /// </summary>
-        public int  F_Dept { set; get; }
+        public int F_Dept { set; get; } = 0;
         /// <summary>
         /// 部门名称
         /// </summary>
@@ -45,7 +45,7 @@ namespace System.Model
         /// <summary>
         /// 团队
         /// </summary>
-        public int  F_Team { set; get; }
+        public int F_Team { set; get; } = 0;
         /// <summary>
         /// 团队名称
         /// </summary>
@@ -53,7 +53,7 @@ namespace System.Model
         /// <summary>
         /// 小组
         /// </summary>
-        public int  F_Group { set; get; }
+        public int F_Group { set; get; } = 0;
         /// <summary>
         /// 小组名称
         /// </summary>
@@ -80,5 +80,9 @@ namespace System.Model
         public string F_Handler { set; get; }
          public int F_IsDelete { set; get; }
         public DateTime F_AssignmentTime { set; get; }
+        /// <summary>
+        /// 0媒体1中转池
+        /// </summary>
+        public int F_Type { set; get; } = 0;
     }
 }

代码/System.Model/Cus/T_Cus_VipInfo.cs

@@ -292,6 +292,14 @@ namespace System.Model
         public string  F_Membership { get; set; }
         public int F_Count { set; get; }
         public DateTime     F_GiveTime { set; get; }
+        /// <summary>
+        /// 是否转售后
+        /// </summary>
+        public int F_IsTransfer { set; get; } = 0;
+        /// <summary>
+        /// 已处理未处理
+        /// </summary>
+        public int F_TransferState { set; get; } = 0;
         #endregion Model
     }
 }

代码/System.Model/Cus/V_Cus_VipInfo.cs

@@ -203,6 +203,14 @@ namespace System.Model
         public string F_Membership { set; get; }
         public int F_Count { set; get; }
         public DateTime F_GiveTime { set; get; }
+        /// <summary>
+        /// 是否转售后
+        /// </summary>
+        public int F_IsTransfer { set; get; } = 0;
+        /// <summary>
+        /// 已处理未处理
+        /// </summary>
+        public int F_TransferState { set; get; } = 0;
         #endregion Model
     }
 }

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallFunctionController.cs

@@ -48,14 +48,19 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         private readonly IBus_OrderRepository bus_OrderRepository;
         private readonly IBus_OrderDetailRepository bus_OrderDetailRepository;
         private readonly IBus_OrderlogsRepository busOrderlogsRepository;
+        private readonly ISys_UserAccountRepository _sys_useraccountRepository;
+        private readonly ICall_DistributionRepository call_DistributionRepository;
         public CallFunctionController(ISys_SystemConfigRepository _busSystemConfigRepository,ICDRRepository _busCdrRepository,ICall_CallRecordsRepository _busCallRecordsRepository,IConfiguration _configuration, ISys_MobileDataRepository _busMobileDataRepository, ICus_VipInfoRepository cus_vip_infoRepository,
             ICall_CallOutboundRepository _CallOutboundRecordsRepository, Iauto_cdrRepository _auto_cdrRepository
             , ItaskRepository _taskRepository, ISys_AutoDialRepository _sys_autodialrepository, IBus_AfterSaleRepository _busAfterSaleRepository, ISys_UserAccountRepository _sys_UserAccountRepository, IBus_AutomaticOrderRepository _bus_AutomaticOrderRepository,
             IBus_ProductRepository productRepository, OrderFunctionController _OrderFunctionController
             , IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository
-            , IBus_OrderlogsRepository _busOrderlogsRepository)
+            , IBus_OrderlogsRepository _busOrderlogsRepository,
+            ISys_UserAccountRepository sys_useraccountRepository
+            , ICall_DistributionRepository _call_DistributionRepository)
            
         {
+            call_DistributionRepository = _call_DistributionRepository;
             busOrderlogsRepository = _busOrderlogsRepository;
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
@@ -74,6 +79,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             bus_AutomaticOrderRepository = _bus_AutomaticOrderRepository;
             _productRepository = productRepository;
             busOrderFunctionController = _OrderFunctionController;
+            _sys_useraccountRepository = sys_useraccountRepository;
         }
        
         /// <summary>
@@ -139,9 +145,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             return location;
 
         }
+     
 
 
- 
 
         #region  同步通话记录
         /// <summary>
@@ -165,6 +171,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                     dtime = modelCallRecord.EndTime.GetValueOrDefault();
             }
             List<cdr> modellist = await busCdrRepository.GetListALL(q => q.id > maxid || q.end_time >= dtime);
+           
             int totle = 0;
             int n = 0;
             int n1 = 0;
@@ -178,6 +185,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                 }
                 totle = modellist.Count;
                 List<T_Call_CallRecords> modelRecordList = new List<T_Call_CallRecords>();
+                List<T_Call_Distribution> Distributions = new List<T_Call_Distribution>();
                 foreach (cdr modelcdr in modellist)
                 {
 
@@ -187,31 +195,51 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                     modelRecord.Callee = modelcdr.callee;
                     if (modelcdr.call_type == 0)
                     {
-                        string tel = modelcdr.caller.TrimStart('0');
+                        string tel = "";
+                        if (modelcdr.caller.Length > 11)
+                            tel = modelcdr.caller.TrimStart('0');
+                        else
+                            tel = modelcdr.caller;
                         modelRecord.UserCode = modelcdr.callee_agent;
-                        var user = await sys_UserAccountRepository.GetListALL (x => x.F_UserCode == modelcdr.callee_agent
-                        &&x.F_DeleteFlag ==0);
-                        if (user!=null && user.Count >0)
+                        if (!string .IsNullOrEmpty(modelcdr.callee_agent))
                         {
-                            modelRecord.UserName = user.FirstOrDefault().F_UserName;
-                            modelRecord.Deptid = user.FirstOrDefault().F_DeptId ;
-                            modelRecord.DeptName  = user.FirstOrDefault().F_Dept ;
+                            var user = await sys_UserAccountRepository.GetListALL(x => x.F_UserCode == modelcdr.callee_agent
+                                                  && x.F_DeleteFlag == 0);
+                            if (user != null && user.Count > 0)
+                            {
+                                modelRecord.UserName = user.FirstOrDefault().F_UserName;
+                                modelRecord.Deptid =(int ) user.FirstOrDefault().F_DeptTeamId; ;
+                                modelRecord.DeptName = user.FirstOrDefault().F_Dept;
+                            }
                         }
-                        var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && x.F_Phone
-                       == modelcdr.caller || x.F_Phone == tel|| x.F_Mobile == modelcdr.caller || x.F_Mobile == tel
-                       || x.F_Mobile1 == modelcdr.caller || x.F_Mobile1 == tel );
-                        if (cus!=null&&cus.Count >0 )
+                        var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && ( x.F_Phone == tel  || x.F_Mobile.Contains(tel)
+                          ));
+                        if (cus != null && cus.Count > 0)
                         {
-                            modelRecord.CusCode = cus.FirstOrDefault ().F_Name ;
-                            modelRecord.CusId = cus.FirstOrDefault().F_ID ;
+                            modelRecord.CusCode = cus.FirstOrDefault().F_Name;
+                            modelRecord.CusId = cus.FirstOrDefault().F_ID;
                             if (modelcdr.is_answer == 1)
                             {
                                 if (cus.FirstOrDefault().F_Firstcalltime == null)
                                     cus.FirstOrDefault().F_Firstcalltime = modelcdr.end_time;
-                                cus.FirstOrDefault().F_Lastholetime  = modelcdr.end_time;
+                                cus.FirstOrDefault().F_Lastholetime = modelcdr.end_time;
                                 var res = await _cus_vip_infoRepository.Update(cus.FirstOrDefault());
                             }
                         }
+                        else
+                        {
+                            T_Call_Distribution t_Call_Distribution = new T_Call_Distribution();
+                            t_Call_Distribution.F_Tel = tel;
+                            t_Call_Distribution.F_Name = "";
+                            t_Call_Distribution.F_Media =0;
+                            t_Call_Distribution.F_MediaName = "";
+                            t_Call_Distribution.F_CrateTime =DateTime .Now ;
+                            t_Call_Distribution.F_CrateUser = "";
+                            t_Call_Distribution.F_Type = 1;
+                            Distributions.Add(t_Call_Distribution);
+                           
+                        }
+
                     }
                     else
                     {
@@ -221,26 +249,32 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                         if (user != null && user.Count > 0)
                         {
                             modelRecord.UserName = user.FirstOrDefault().F_UserName;
-                            modelRecord.Deptid = user.FirstOrDefault().F_DeptId;
+                            modelRecord.Deptid = (int)user.FirstOrDefault().F_DeptTeamId; ;
                             modelRecord.DeptName = user.FirstOrDefault().F_Dept;
                         }
-                        string tel = modelcdr.callee.TrimStart('0');
+                        string tel = "";
+                        if (tel.Length > 11 && tel.Length < 13)
+                            tel = modelcdr.callee.Substring(1, 12);
+                        else if (tel.Length > 12)
+                            tel = modelcdr.callee.Substring(2, 13);
+                        else
+                            tel = modelcdr.callee;
                         modelRecord.UserCode = modelcdr.callee_agent;
-                        var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 &&( x.F_Phone
-                       == modelcdr.caller || x.F_Phone == tel||x.F_Mobile == modelcdr.caller || x.F_Mobile
-                       == tel || x.F_Mobile1 == modelcdr.caller || x.F_Mobile1 == tel ));
+                        var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 &&( x.F_Phone == tel|| x.F_Mobile
+                       .Contains ( tel)  ));
                          if (cus != null && cus.Count > 0)
                         {
                             modelRecord.CusCode = cus.FirstOrDefault().F_Name;
                             modelRecord.CusId = cus.FirstOrDefault().F_ID;
+                            if (modelcdr.is_answer == 1)
+                            {
+                                if (cus.FirstOrDefault().F_Firstcalltime == null)
+                                    cus.FirstOrDefault().F_Firstcalltime = modelcdr.end_time;
+                                cus.FirstOrDefault().F_Lastholetime = modelcdr.end_time;
+                                var res = await _cus_vip_infoRepository.Update(cus.FirstOrDefault());
+                            }
                         }
-                        if (modelcdr.is_answer == 1)
-                        {
-                            if (cus.FirstOrDefault().F_Firstcalltime == null)
-                                cus.FirstOrDefault().F_Firstcalltime = modelcdr.end_time;
-                            cus.FirstOrDefault().F_Lastholetime = modelcdr.end_time;
-                            var res = await _cus_vip_infoRepository.Update(cus.FirstOrDefault());
-                        }
+                       
                     }
                     modelRecord.Caller = modelcdr.caller;
                     modelRecord.CallType = modelcdr.call_type;
@@ -279,6 +313,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                     {
                         await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
                         modelRecordList.Clear();
+                        await call_DistributionRepository.AddAndUpdateList(Distributions);
                         n = 0;
                     }
 
@@ -287,6 +322,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                 //T_Call_CallRecords modelreturn = 
                 await busCallRecordsRepository.AddAndUpdateList(modelRecordList);
             }
+            
             return $"同步情况  成功/总数 = {n1}/{totle}";
         }
         /// <summary>
@@ -506,6 +542,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                             modelOrder.F_PayType = "货到付款";
                             modelOrder.F_VipId = iv.F_ID;
                             modelOrder.F_Belong = iv.F_Saleperson.ObjToInt();
+                            var useraccount = await _sys_useraccountRepository.GetSingle(x => x.F_UserId == modelOrder.F_Belong);
+
+                            if (useraccount != null)
+                            {
+                                modelOrder.F_Department = useraccount.F_DeptId;
+                                modelOrder.F_Core = useraccount.F_DeptTeamId;
+                                modelOrder.F_Group = useraccount.F_GroupId;
+                            }
                             modelOrder.F_BelongName = "ID:" + iv.F_Saleperson;
                             modelOrder.F_ExpressFee = 0;
                             //  modelOrder.F_Stock = input.F_Stock;

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/DistributionController.cs

@@ -7,7 +7,8 @@ using System.Linq;
 using System.Model;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-
+using SqlSugar;
+using System.Text.RegularExpressions;
 namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
 {
     [Route("api/[controller]")]
@@ -15,48 +16,390 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
     {
         private readonly ICall_DistributionRepository call_DistributionRepository;
         private readonly ICus_VipInfoRepository _cus_vip_infoRepository;
-        public DistributionController(ICall_DistributionRepository _call_DistributionRepository, ICus_VipInfoRepository cus_vip_infoRepository)
+        private readonly ICall_CallRecordsRepository busCallRecordsRepository;
+        private readonly ISys_UserAccountRepository sys_UserAccountRepository;
+        public DistributionController(ICall_DistributionRepository _call_DistributionRepository, ICus_VipInfoRepository cus_vip_infoRepository,
+            ICall_CallRecordsRepository _busCallRecordsRepository,
+           ISys_UserAccountRepository _sys_UserAccountRepository)
         {
             call_DistributionRepository = _call_DistributionRepository;
             _cus_vip_infoRepository = cus_vip_infoRepository;
+            busCallRecordsRepository = _busCallRecordsRepository;
+            sys_UserAccountRepository = _sys_UserAccountRepository;
         }
-    /// <summary>
-    /// 添加
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("add")]
+
+            /// <summary>
+           /// 添加
+          /// </summary>
+         /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("add")]
         public async Task<IActionResult> AddAsync(T_Call_Distribution input)
         {
             if (string.IsNullOrEmpty(input.F_Tel ))
                 return Error("请输入联系电话");
-
+            if (!valtel(input.F_Tel))
+                return Error("手机号必须为11位数字");
+            var list = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && (x.F_Phone == input.F_Tel || x
+             .F_Mobile.Contains(input.F_Tel)));
             input.F_CrateTime = DateTime.Now;
             input.F_CrateUser = UserLogin.UserCode;
             input.F_IsDelete = 0;
-            if (input .F_Dept >0)
+            if (list!=null && list.Count >0)
+            {
+                var user = await sys_UserAccountRepository.GetSingle (x => x.F_UserId  == list[0].F_Saleperson.ObjToInt () );
+                T_Call_CallRecords modelRecord = new T_Call_CallRecords();
+                modelRecord.ActionID = 1;
+                modelRecord.Caller = input.F_Tel;
+                modelRecord.CallType = 0;
+                modelRecord.CallState = 0;
+                modelRecord.Id = 0;
+                modelRecord.MYD = 1;
+                modelRecord.OperateType =0;
+                modelRecord.LongTime = 0;
+                input.F_IsDelete = 1;
+                modelRecord.UserCode = user.F_UserCode;
+                modelRecord.UserName = user.F_UserName;
+                modelRecord.Deptid =(int ) user.F_DeptTeamId ;
+                modelRecord.DeptName = user.F_Team;
+
+                await busCallRecordsRepository.Add(modelRecord);
+            }
+            else
+            {
+                if (input.F_Dept > 0)
+                {
+                    input.F_OperationDept = UserLogin.UserCode;
+                    if (input.F_Team > 0)
+                    {
+                        input.F_OperationTeam = UserLogin.UserCode;
+                        if (input.F_Group > 0)
+                        {
+                            input.F_OperationGroup = UserLogin.UserCode;
+                            {
+                                if (!string.IsNullOrEmpty(input.F_OperationHandler))
+                                {
+                                   var user = await sys_UserAccountRepository.GetListALL(x => x.F_UserCode == input.F_OperationHandler
+                                               && x.F_DeleteFlag == 0);
+                                    if (user == null)
+                                        return Error("分配人员不存在");
+                                    input.F_OperationHandler = UserLogin.UserCode;
+                                    T_Call_CallRecords modelRecord = new T_Call_CallRecords();
+                                    modelRecord.ActionID = 1;
+                                    modelRecord.Caller = input.F_Tel;
+                                    modelRecord.CallType = 0;
+                                    modelRecord.CallState = 0;
+                                    modelRecord.Id = 0;
+                                    modelRecord.MYD = 1;
+                                    modelRecord.OperateType = 0;
+                                    modelRecord.LongTime = 0;
+                                    input.F_IsDelete = 1;
+                                    modelRecord.UserCode = user[0].F_UserCode;
+                                    modelRecord.UserName = user[0].F_UserName;
+                                    modelRecord.Deptid = (int)user[0].F_DeptTeamId;
+                                    modelRecord.DeptName = user[0].F_Team;
+                                    await busCallRecordsRepository.Add(modelRecord);
+                                }
+                            }
+                        }
+                    }
+                    input.F_AssignmentTime = DateTime.Now;
+                }
+                if (await call_DistributionRepository.Add(input) > 0)
+                {
+                    return Success("添加成功");
+                }
+              
+            }
+            return Error("添加失败");
+        }
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("update")]
+        public async Task<IActionResult> UpdateAsync(T_Call_Distribution input)
+        {
+            if (input.F_ID <=0)
+                return Error("参数错误");
+            if (string.IsNullOrEmpty(input.F_Tel))
+                return Error("请输入联系电话");
+            if (!valtel(input.F_Tel))
+                return Error("手机号必须为11位数字");
+
+
+            var model = await call_DistributionRepository.GetSingle(x => x.F_ID == input.F_ID);
+            if (model == null)
+                return Error("操作失败");
+            var list = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && (x.F_Phone == input.F_Tel || x
+             .F_Mobile.Contains(input.F_Tel)));
+            model.F_Tel = input.F_Tel;
+            model.F_Name = input.F_Name;
+            model.F_Media = input.F_Media;
+            model.F_MediaName = input.F_MediaName;
+            model.F_CrateTime = model.F_CrateTime;
+            model.F_CrateUser = model.F_CrateUser;
+            input.F_IsDelete = 0;
+            if (list != null && list.Count > 0)
+            {
+                var user = await sys_UserAccountRepository.GetSingle(x => x.F_UserId == list[0].F_Saleperson.ObjToInt());
+                T_Call_CallRecords modelRecord = new T_Call_CallRecords();
+                modelRecord.ActionID = 1;
+                modelRecord.Caller = input.F_Tel;
+                modelRecord.CallType = 0;
+                modelRecord.CallState = 0;
+                modelRecord.Id = 0;
+                modelRecord.MYD = 1;
+                modelRecord.OperateType = 0;
+                modelRecord.LongTime = 0;
+                model.F_IsDelete = 1;
+                modelRecord.UserCode = user.F_UserCode;
+                modelRecord.UserName = user.F_UserName;
+                modelRecord.Deptid = (int)user.F_DeptTeamId;
+                modelRecord.DeptName = user.F_Team;
+
+                await busCallRecordsRepository.Add(modelRecord);
+            }
+            else
             {
+                if (input.F_Dept > 0)
+                {
+                    model.F_Dept = input.F_Dept;
+                    model.F_DeptName = input.F_DeptName;
+                    input.F_OperationDept = UserLogin.UserCode;
+                    if (input.F_Team > 0)
+                    {
+                        model.F_Team = input.F_Team;
+                        model.F_TeamName  = input.F_TeamName;
+                        input.F_OperationTeam = UserLogin.UserCode;
+                        if (input.F_Group > 0)
+                        {
+                            model.F_Group = input.F_Group;
+                            model.F_GroupName  = input.F_GroupName;
+                            input.F_OperationGroup = UserLogin.UserCode;
+                            {
+                                    if (!string.IsNullOrEmpty(input.F_OperationHandler))
+                                    {
+                                        var user = await sys_UserAccountRepository.GetListALL(x => x.F_UserCode == input.F_OperationHandler
+                                                    && x.F_DeleteFlag == 0);
+                                        if (user == null)
+                                            return Error("分配人员不存在");
+                                        input.F_OperationHandler = UserLogin.UserCode;
+                                        T_Call_CallRecords modelRecord = new T_Call_CallRecords();
+                                        modelRecord.ActionID = 1;
+                                        modelRecord.Caller = input.F_Tel;
+                                        modelRecord.CallType = 0;
+                                        modelRecord.CallState = 0;
+                                        modelRecord.Id = 0;
+                                        modelRecord.MYD = 1;
+                                        modelRecord.OperateType = 0;
+                                        modelRecord.LongTime = 0;
+                                        model.F_IsDelete = 1;
+                                  
+                                        modelRecord.UserCode = user[0].F_UserCode;
+                                        modelRecord.UserName = user[0].F_UserName;
+                                        modelRecord.Deptid = (int)user[0].F_DeptTeamId;
+                                        modelRecord.DeptName = user[0].F_Team;
+                                        await busCallRecordsRepository.Add(modelRecord);
+                                    }
+                            }
+                        }
+                    }
+                    input.F_AssignmentTime = DateTime.Now;
+                }
+                if (await call_DistributionRepository.Update(model))
+                {
+                    return Success("修改成功");
+                }
+
+            }
+            return Error("添加失败");
+        }
+        /// <summary>
+        /// 分配
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("distribution")]
+        public async Task<IActionResult> Distribution(T_Call_Distribution input)
+        {
+            if (input.F_ID <= 0)
+                return Error("参数错误");
+            if (string.IsNullOrEmpty(input.F_Tel))
+                return Error("请输入联系电话");
+            var model = await call_DistributionRepository.GetSingle(x => x.F_ID == input.F_ID);
+            if (model == null)
+                return Error("操作失败");
+            if (input.F_Dept > 0)
+            {
+                model.F_Dept = input.F_Dept;
+                model.F_DeptName  = input.F_DeptName;
                 input.F_OperationDept = UserLogin.UserCode;
                 if (input.F_Team > 0)
                 {
+                    model.F_Team = input.F_Team;
+                    model.F_TeamName  = input.F_TeamName;
                     input.F_OperationTeam = UserLogin.UserCode;
                     if (input.F_Group > 0)
                     {
+                        model.F_Group = input.F_Group;
+                        model.F_GroupName  = input.F_GroupName;
                         input.F_OperationGroup = UserLogin.UserCode;
                         {
                             if (!string.IsNullOrEmpty(input.F_OperationHandler))
+                            {
+                                var user = await sys_UserAccountRepository.GetListALL(x => x.F_UserCode == input.F_OperationHandler
+                                            && x.F_DeleteFlag == 0);
+                                if (user == null)
+                                    return Error("分配人员不存在");
                                 input.F_OperationHandler = UserLogin.UserCode;
+                                T_Call_CallRecords modelRecord = new T_Call_CallRecords();
+                                modelRecord.ActionID = 1;
+                                modelRecord.Caller = input.F_Tel;
+                                modelRecord.CallType = 0;
+                                modelRecord.CallState = 0;
+                                modelRecord.Id = 0;
+                                modelRecord.MYD = 1;
+                                modelRecord.OperateType = 0;
+                                modelRecord.LongTime = 0;
+                                model.F_IsDelete = 1;
+                                modelRecord.UserCode = user[0].F_UserCode;
+                                modelRecord.UserName = user[0].F_UserName;
+                                modelRecord.Deptid = (int)user[0].F_DeptTeamId;
+                                modelRecord.DeptName = user[0].F_Team;
+                                await busCallRecordsRepository.Add(modelRecord);
+                            }
                         }
                     }
                 }
                 input.F_AssignmentTime = DateTime.Now;
             }
-            if (await call_DistributionRepository.Add(input) > 0)
+        
+
+            if (await call_DistributionRepository.Update(model))
+                {
+                    return Success("分配成功");
+                }
+            
+            return Error("分配失败");
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpPost("delete")]
+        public async Task<IActionResult> Remove(int[] ids)
+        {
+            var res = 0;
+            if (ids != null && ids.Length > 0)
             {
-                return Success("添加成功");
+                foreach (var item in ids)
+                {
+                    var model = await call_DistributionRepository.GetSingle(x => x.F_ID == item);
+                    model.F_IsDelete  = 1;
+                    if (call_DistributionRepository.Update(model).Result)
+                        res += 1;
+                }
+                if (res == ids.Length)
+                    return Success("操作成功");
+                else if (res > 0 && res < ids.Length)
+                    return Error("部分操作失败，请查看后重新操作");
+                else
+                    return Error("操作失败，请查看后重新操作");
             }
-            return Error("添加失败");
+            else
+                return Error("请选择要删除的记录");
         }
-       
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <param name="pageindex"></param>
+        /// <param name="pagesize"></param>
+        /// <returns></returns>
+        [HttpGet("getlist")]
+        public async Task<IActionResult> GetLisAsync(string name, int dept = 0, int team = 0, int group = 0, int type = 0, int pageindex = 1, int pagesize = 20)
+        {
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+            conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = "0" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Equal, FieldValue = type.ToString () });
+            if (!string.IsNullOrEmpty(name))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Equal, FieldValue = name });
+            }
+            if (dept >0 )
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Dept", ConditionalType = ConditionalType.Equal, FieldValue = dept.ToString() });
+            }
+            if (team > 0)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Team", ConditionalType = ConditionalType.Equal, FieldValue = team.ToString() });
+               
+            }
+            if (group > 0)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Group", ConditionalType = ConditionalType.Equal, FieldValue = group.ToString() });
+            }
+
+            if (UserLogin.RoleCode == "ZXFZR")
+            {
+                var useraccount = await sys_UserAccountRepository.GetSingle(x => x.F_UserId == UserLogin.UserId.ObjToInt());
+                conModels.Add(new ConditionalModel() { FieldName = "F_Team", ConditionalType = ConditionalType.Equal, FieldValue = useraccount.F_DeptTeamId.ToString() });
+            }
+            else if (UserLogin.RoleCode == "XZFZR")
+            {
+                var useraccount = await sys_UserAccountRepository.GetSingle(x => x.F_UserId == UserLogin.UserId.ObjToInt());
+                conModels.Add(new ConditionalModel() { FieldName = "F_Group", ConditionalType = ConditionalType.Equal, FieldValue = useraccount.F_GroupId .ToString ()});
+            }
+            #endregion
+            int recordCount = 0;
+            var list = await call_DistributionRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = list,
+                total = list.Totals,
+            };
+            return Content(obj.ToJson());
+        }
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id">id</param>
+        /// <returns></returns>
+        [HttpGet("getdetails")]
+        public async Task<IActionResult> GetDetailsAsync(int id)
+        {
+            if (id <= 0)
+                return Error("参数错误");
+
+            var model = await call_DistributionRepository.GetSingle(x => x.F_ID == id);
+            if (model == null)
+            {
+                return Error("获取失败");
+            }
+           
+            return Success("获取成功！", model);
+        }
+
+        /// <summary>
+        /// 判断号码必须为十一位数字
+        /// </summary>
+        /// <param name="tel"></param>
+        /// <returns></returns>
+        public bool valtel(string tel)
+        {
+            var res = false;
+            //11位数字
+            if (tel.Length == 11 && Regex.IsMatch(tel, @"^\d{11}$"))
+                res = true;
+            return res;
+        }
+
     }
 }

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -21,6 +21,7 @@ using System.Utility.Encrypt;
 using System.IRepositories.Bus;
 using System.IRepositories.Cus;
 using System.Model.Cus;
+using System.Model.Bus;
 
 namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
 {
@@ -38,8 +39,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         private readonly Ipoint_agentRepository _point_agentrepository;
         private readonly IBus_OrderRepository busOrderRepository;
         private readonly ICus_MembershipRepository _cus_membershiprepository;
+        private readonly IBus_ChatLogRepository bus_ChatLogRepository;
         public VipInfoController(ICus_VipInfoRepository cus_vip_infoRepository, ISys_UserAccountRepository sys_user_accountRepository, ICus_MsgRepository cus_msgRepository,IConfiguration configuration,
-            ISMS_InternalMessagesReposytory sys_internalMessagesrepository, ICall_CallRecordsRepository _busCallRecordsRepository, Ipoint_agentRepository point_agentrepository, IBus_OrderRepository _busOrderRepository,ICus_MembershipRepository cus_membershiprepository)
+            ISMS_InternalMessagesReposytory sys_internalMessagesrepository, ICall_CallRecordsRepository _busCallRecordsRepository, Ipoint_agentRepository point_agentrepository, IBus_OrderRepository _busOrderRepository,ICus_MembershipRepository cus_membershiprepository,
+            IBus_ChatLogRepository _bus_ChatLogRepository)
         {
             _cus_vip_infoRepository = cus_vip_infoRepository;
             _sys_user_accountRepository = sys_user_accountRepository;
@@ -50,6 +53,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             _point_agentrepository = point_agentrepository;
             busOrderRepository = _busOrderRepository;
             _cus_membershiprepository = cus_membershiprepository;
+            bus_ChatLogRepository = _bus_ChatLogRepository;
         }
 
         [HttpGet]
@@ -66,7 +70,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         /// <param name="pagesize"></param>
         /// <returns></returns>
         [HttpGet("getlistbypage")]
-        public async Task<IActionResult> GetListsByPageAsync(string keyword,string label, string name,string phone,string type, string province,string city,string area,string town,string address,string birthday,string recommender,string saleperson,string  laststartholetime,string lastendholetime,    int pageindex = 1, int pagesize = 20)
+        public async Task<IActionResult> GetListsByPageAsync(string keyword,string label, string name,string phone,string type, string province,string city,string area,string town,string address,string birthday,string recommender,string saleperson,string  laststartholetime,string lastendholetime, int transferState = -1,    int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
@@ -112,6 +116,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Town", ConditionalType = ConditionalType.Like, FieldValue = town });
             }
+            if (transferState > -1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_TransferState", ConditionalType = ConditionalType.Equal , FieldValue = transferState.ToString () });
+            }
             if (!string.IsNullOrEmpty(address))
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Address", ConditionalType = ConditionalType.Like, FieldValue = address });
@@ -408,7 +416,61 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 return Error ("部分档案拆分成功");
         }
 
+        /// <summary>
+        /// 转办售后
+        /// </summary>
+        /// <param name="id">id</param>
+        /// <returns></returns>
+        [HttpGet("ransfer")]
+        public async Task<IActionResult> Transfer(int id)
+        {
+            if (id <= 0)
+                return Error("请选择要转办的会员");
+            var model = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == id && x.F_State == (int)EnumDelState.Enabled);
+            if (model == null)
+                return Error("操作失败，会员不存在");
+
+            model.F_IsTransfer = 1;
+            model.F_TransferState = 0;
+            bool b = await _cus_vip_infoRepository.Update(model);
+            if (b)
+                return Success("转办成功");
+            else
+                return Error("转办失败");
+        }
+        /// <summary>
+        /// 处理转办
+        /// </summary>
+        /// <param name="id">id</param>
+        /// <returns></returns>
+        [HttpGet("handleTransfer")]
+        public async Task<IActionResult> HandleTransfer(int id,string message)
+        {
+            if (id <= 0)
+                return Error("请选择要处理的会员");
+            var model = await _cus_vip_infoRepository.GetSingle(x => x.F_ID == id && x.F_State == (int)EnumDelState.Enabled);
+            if (model == null)
+                return Error("操作失败，会员不存在");
 
+            model.F_IsTransfer = 1;
+            model.F_TransferState = 1;
+            T_Bus_ChatLog log = new T_Bus_ChatLog();
+            log.F_WoID = model.F_ID.ToString ();
+            log.F_Content = message;
+            log.F_AddUser = UserLogin .UserId ;
+            log.F_AddUserName = UserLogin.UserName ;
+            log.F_AddTime = DateTime .Now ;
+            log.F_IsSo =1;
+            log.F_IsDelete = 0;
+            log.F_State =1;
+            if (await bus_ChatLogRepository.Add(log) > 0)
+            {
+                bool b = await _cus_vip_infoRepository.Update(model);
+                if (b)
+                    return Success("处理成功");
+            }
+            return Error("处理失败");
+        }
         /// <summary>
         /// 获取会员所有手机号
         /// </summary>
@@ -528,7 +590,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             if (string.IsNullOrEmpty(input.phone))
                 return Error("请输入联系方式");
 
-            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone   == input.phone  && q.F_State== (int)EnumDelState.Enabled) >0)
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone||q .F_Mobile .Contains (input.phone)  && q.F_State== (int)EnumDelState.Enabled) >0)
             {
                 return Error("手机号已存在");
             }
@@ -603,7 +665,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_City1 = input.city1;
             model.F_Address1 = input.address1;
 
-
+            
             model.F_Province2 = input.province2;
             model.F_Area2 = input.area2;
             model.F_Town2 = input.town2;
@@ -616,7 +678,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_Score = input.score;
             model.F_Money = input.money;
             model.F_TotalScore = input.totalscore;
-            model.F_Saleperson = user; //"8000";input.saleperson;
+            model.F_Saleperson =UserLogin .UserId ; //"8000";input.saleperson;
             model.F_Type = input.type;
             model.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value; //"8000";
             model.F_CreateOn = DateTime.Now;
@@ -658,7 +720,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             var res = await _cus_vip_infoRepository.Add(model);
             if (res > 0)
             {
-                return Success("添加成功");
+                return Success("添加成功", res);
             }
             else
             {
@@ -678,7 +740,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             if (string.IsNullOrEmpty(input.phone))
                 return Error("请输入联系方式");
 
-            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone && q.F_ID!= input.id && q.F_State == (int)EnumDelState.Enabled) > 0)
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone|| q.F_Mobile.Contains(input.phone) && q.F_ID!= input.id && q.F_State == (int)EnumDelState.Enabled) > 0)
             {
                 return Error("手机号已存在");
             }
@@ -766,8 +828,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             model.F_MembershipId = model.F_MembershipId;
             model.F_Membership = model.F_Membership;
             model.F_Address2 = input.address2;
-            //model.F_Saleperson = input.saleperson;
-            //model.F_Contact = input.contact;
+           model.F_Saleperson = model.F_Saleperson;
+        //  model.F_Contact = input.contact;
             model.F_Type = input.type;
             if (model.F_GiftYear != DateTime.Now.Year.ToString())
             {
@@ -806,6 +868,26 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             return Error("修改失败");
         }
         /// <summary>
+        /// 判断号码是否存在
+        /// </summary>
+        /// <param name="phone"></param>
+        /// <returns></returns>
+        [HttpGet("getexistence")]
+        public async Task<IActionResult> GetExistence(string phone)
+        {
+            if (string.IsNullOrEmpty(phone))
+                return Error("参数错误");
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == phone || q.F_Mobile.Contains(phone) && q.F_State == (int)EnumDelState.Enabled) > 0)
+            {
+                return Success("手机号已存在",1);
+            }
+            else
+            {
+                return Success ("成功",2);
+            }
+        }
+
+        /// <summary>
         /// 删除会员信息 by ids
         /// </summary>
         /// <param name="ids"></param>

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/ChatLogController.cs

@@ -125,12 +125,21 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="pagesize"></param>
         /// <returns></returns>
         [HttpGet("getlist")]
-        public async Task<IActionResult> GetLisAsync(string woid ,int state = 1, int pageindex = 1, int pagesize = 20)
+        public async Task<IActionResult> GetLisAsync(string woid , int state = 1, int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal , FieldValue = state.ToString() });
             conModels.Add(new ConditionalModel() { FieldName = "F_WoID", ConditionalType = ConditionalType.Equal, FieldValue = woid.ToString() });
+            conModels.Add(new ConditionalCollections()
+            {
+                ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_IsSo", ConditionalType = ConditionalType.Equal , FieldValue = "1"}),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Like, FieldValue =  UserLogin.UserId }),
+                    }
+            });
+
             #endregion
             int recordCount = 0;
             var list = await bus_ChatLogRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KFOrderController.cs

@@ -557,7 +557,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         }
 
         /// <summary>
-        /// 订单二审 审完 走发货
+        /// 订单
         /// </summary>
         /// <param name="orderid">订单号</param>
         /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4KG退回 5已分拣 6已发货7，8分仓</param>
@@ -741,7 +741,16 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
                 
             }
-
+            if (UserLogin.RoleCode == "ZXFZR")
+            {
+                var useraccount = await _sys_useraccountRepository.GetSingle(x => x.F_UserId == UserLogin.UserId.ObjToInt());
+                conModels.Add(new ConditionalModel() { FieldName = "F_Core", ConditionalType = ConditionalType.Equal, FieldValue = useraccount.F_DeptTeamId.ToString() });
+            }
+            else if (UserLogin.RoleCode == "XZFZR")
+            {
+                var useraccount = await _sys_useraccountRepository.GetSingle(x => x.F_UserId == UserLogin.UserId.ObjToInt());
+                conModels.Add(new ConditionalModel() { FieldName = "F_Group", ConditionalType = ConditionalType.Equal, FieldValue = useraccount.F_GroupId.ToString() });
+            }
             //else if (UserLogin.RoleCode == "KF")
             //{
             //    conModels.Add(new ConditionalCollections()
@@ -909,8 +918,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             List<OrderInput> returnlist = new List<OrderInput>();
             if (isdc ==1)
             {
-                var zzroleid =await  sys_RoleInfoRepository.GetListALL (x => x.F_RoleCode == "XSZZ"&&x .F_State ==1);
-                var jlroleid = await sys_RoleInfoRepository.GetListALL(x => x.F_RoleCode == "ZXJL" && x.F_State == 1);
+                var zzroleid =await  sys_RoleInfoRepository.GetListALL (x => x.F_RoleCode == "XZFZR" && x .F_State ==1);
+                var jlroleid = await sys_RoleInfoRepository.GetListALL(x => x.F_RoleCode == "ZXFZR" && x.F_State == 1);
                 foreach (T_Bus_Order t in list.Rows)
                 {
                     OrderInput m = new OrderInput();
@@ -1032,8 +1041,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             }
             else if (isdc ==3)
             {
-
-                var tb = ModelConvertHelper<T_Bus_Order>.ConvertListToDataTable(list.Rows);
+                var tb = ModelConvertHelper<T_Bus_Order>.ConvertListToDataTable(list .Rows);
                 NPOIHelper npoi = new NPOIHelper();
                 string dbkeys = config["Import:ordertrackkey"].ToString();
                 string title = config["Import:ordertracktvalue"].ToString();
@@ -1484,7 +1492,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="status">0 未发出 1未签收2签收3改代收4拒收</param>
         /// <returns></returns>
         [HttpPost("afterSignfor")]
-        public async Task<IActionResult> AfterSignfor(string orderids,string id)
+        public async Task<IActionResult> AfterSignfor(string orderids, string id, int Status = 2)
         {
 
             #region 验证参数 必填项  
@@ -1496,12 +1504,16 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             #endregion
             string[] ids = id.Split(',');
             string[] orderid = orderids.Split(',');
-            if (await bus_OrderRepository .Update(s => new T_Bus_Order () { F_Status  = 2 }, q => orderid.Contains(q.F_Id)))
-            {
-                if (await busAfterSaleRepository.Update(s => new T_Bus_AfterSale() { F_IsSignfor = 1 }, q => ids.Contains(q.F_Id)))
+            if (await bus_OrderRepository .Update(s => new T_Bus_Order () { F_Status  = Status }, q => orderid.Contains(q.F_Id)))
+            {if (Status==2)
                 {
-                    return Success("成功");
+                    if (await busAfterSaleRepository.Update(s => new T_Bus_AfterSale() { F_IsSignfor = 1 }, q => ids.Contains(q.F_Id)))
+                    {
+                        return Success("成功");
+                    }
+
                 }
+               
             }
             return Error("失败,请重试！");
 
@@ -1866,7 +1878,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
         /// <summary>
-        /// 上传文件并导入数据库批量导入快递信息
+        /// 上传文件并导入数据库批量提交
         /// </summary>
         /// <returns></returns>
         [HttpPost("importordersubmitexcel")]

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderFunctionController.cs

@@ -12,8 +12,10 @@ using System.Data;
 using System.IRepositories;
 using System.Linq;
 using System.Model;
+using System.Net.Http;
 using System.Repositories;
 using System.Security.Claims;
+using System.Text;
 using System.Threading.Tasks;
 using System.Utility.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -219,7 +221,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             modelset.appkey = config["eBoss:appkey"].ToString();
             modelset.billdate = DateTime.Now.ToString("yyyyMMdd");
             string url = config["eBoss:url"].ToString();
-            string ret = await HttpHelper.HttpGetAsync(url + modelset.ToJson());//"\"success\": true";
+            HttpClient client = new HttpClient();
+            var content = new StringContent(modelset.ToJson(), Encoding.UTF8, "application/json");
+            var response = await client.PostAsync(url, content);
+            var result = await response.Content.ReadAsByteArrayAsync();
+            string ret = Encoding.Default.GetString(result);//"\"success\": true";
             //ret.ToJson();
             
             foreach (T_Bus_StockLog stocklog in modelStockLogs)

代码/TVShoppingCallCenter_ZLJ/Controllers/Report/KFReportController.cs

@@ -24,9 +24,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Report
         private readonly IConfiguration config;
         private readonly IBus_AfterSaleRepository busAfterSaleRepository;
         private readonly IBus_ProductRepository _productRepository;
+        private readonly ISys_DeptTeamRepository _sys_deptteamRepository;
+        private readonly ISys_DepartmentRepository _sys_departmentRepository;
         public KFReportController(IBus_OrderDetailRepository _bus_OrderDetailRepository
             , IBus_OrderRepository _bus_OrderRepository,IConfiguration _config
-            , IBus_AfterSaleRepository _busAfterSaleRepository, IBus_ProductRepository productRepository)
+            , IBus_AfterSaleRepository _busAfterSaleRepository, IBus_ProductRepository productRepository,
+            ISys_DeptTeamRepository sys_deptteamRepository, ISys_DepartmentRepository sys_departmentRepository)
         {
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
@@ -461,5 +464,204 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Report
 
             return Success("获取成功", Detail);
         }
+
+        public class Efficiencys
+        {
+            public string name { get; set; }//名称
+            public decimal  oeder { get; set; } = 0;//下单金额
+            public decimal deliver { get; set; } = 0;//发货金额
+            public decimal signfor { get; set; } = 0;//签收金额
+        }
+        /// <summary>
+        /// 销售数据表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("efficiency")]
+        public async Task<IActionResult> Efficiency(string starttime, string endtime,int type=0, int isdc = 0)
+        {
+            if (string.IsNullOrEmpty(starttime))
+                starttime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).ToString("yyyy-MM-dd");
+            if (string.IsNullOrEmpty(endtime))
+                endtime = DateTime.Now.ToString("yyyy-MM-dd");
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = starttime });
+            conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = endtime });
+            List<T_Bus_Order> list = await bus_OrderRepository.GetListALL(conModels, "F_AddTime ASC");
+            var rows = list.GroupBy(x => new { x.F_Belong,x .F_BelongName,x .F_State ,x .F_Status  }).Select(
+                 x => new { F_State = x.Key.F_State, F_Status = x.Key.F_Status, F_BelongName = x.Key.F_BelongName, Count = x.Select(y => y .F_ShouldPrice ).Sum() });
+            var Group = list.GroupBy(x => new {  x.F_Group, x.F_Status ,x .F_State  }).Select(
+               x => new { F_Group = x.Key.F_Group, F_Status = x.Key.F_Status, F_State = x.Key.F_State, Count = x.Select(y => y.F_ShouldPrice).Sum() });
+            var Core = list.GroupBy(x => new { x.F_Core, x.F_Status, x.F_State }).Select(
+               x => new { F_Core = x.Key.F_Core, F_Status = x.Key.F_Status, F_State = x.Key.F_State, Count = x.Select(y => y.F_ShouldPrice).Sum() });
+            var Department = list.GroupBy(x => new { x.F_Department, x.F_Status, x.F_State }).Select(
+              x => new { F_Department = x.Key.F_Department, F_Status = x.Key.F_Status, F_State = x.Key.F_State, Count = x.Select(y => y.F_ShouldPrice).Sum() });
+            List<Efficiencys> efficiencys = new List<Efficiencys>();
+            List<Efficiencys> Effic1 = new List<Efficiencys>();
+            foreach (var it in rows)
+            {
+                Efficiencys efficienc = new Efficiencys();
+                efficienc.name = it.F_BelongName;
+                if (it .F_State >-1)
+                {
+                    efficienc.oeder+=it .Count;
+                }
+                if (it.F_State ==6)
+                {
+                    efficienc.deliver += it.Count;
+                    if (it.F_Status ==2)
+                    {
+                        efficienc.signfor += it.Count;
+                    }
+                }
+                Effic1.Add(efficienc);
+            }
+            efficiencys= TobeEfficiencys(efficiencys, Effic1,type );
+            List<Efficiencys> Effic2 = new List<Efficiencys>();
+            foreach (var it in Group)
+            {
+                Efficiencys efficienc = new Efficiencys();
+                var team = await _sys_deptteamRepository.GetSingle(x => x.F_Id == it.F_Group);
+                if (team!=null )
+                {
+                    efficienc.name = team.F_Name ;
+                    if (it.F_State > -1)
+                    {
+                        efficienc.oeder += it.Count;
+                    }
+                    if (it.F_State == 6)
+                    {
+                        efficienc.deliver += it.Count;
+                        if (it.F_Status == 2)
+                        {
+                            efficienc.signfor += it.Count;
+                        }
+                    }
+                    Effic2.Add(efficienc);
+                }
+            }
+            efficiencys = TobeEfficiencys(efficiencys, Effic2, type);
+            List<Efficiencys> Effic3 = new List<Efficiencys>();
+    
+            foreach (var it in Core)
+            {
+                Efficiencys efficienc = new Efficiencys();
+                var team = await _sys_deptteamRepository.GetSingle(x => x.F_Id == it.F_Core );
+                if (team != null)
+                {
+                    efficienc.name = team.F_Name;
+                    if (it.F_State > -1)
+                    {
+                        efficienc.oeder += it.Count;
+                    }
+                    if (it.F_State == 6)
+                    {
+                        efficienc.deliver += it.Count;
+                        if (it.F_Status == 2)
+                        {
+                            efficienc.signfor += it.Count;
+                        }
+                    }
+                    Effic3.Add(efficienc);
+                }
+            }
+            efficiencys = TobeEfficiencys(efficiencys, Effic3, type);
+            List<Efficiencys> Effic4 = new List<Efficiencys>();
+            foreach (var it in Department)
+            {
+                Efficiencys efficienc = new Efficiencys();
+                var team = await _sys_departmentRepository.GetSingle(x => x.F_DeptId  == it.F_Department );
+                if (team != null)
+                {
+                    efficienc.name = team.F_DeptName ;
+                    if (it.F_State > -1)
+                    {
+                        efficienc.oeder += it.Count;
+                    }
+                    if (it.F_State == 6)
+                    {
+                        efficienc.deliver += it.Count;
+                        if (it.F_Status == 2)
+                        {
+                            efficienc.signfor += it.Count;
+                        }
+                    }
+                    Effic4.Add(efficienc);
+                }
+            }
+            efficiencys = TobeEfficiencys(efficiencys, Effic4, type);
+            if (isdc > 0)
+            {
+               
+                NPOIHelper npoi = new NPOIHelper();
+                string dbkeys = "name,oeder,deliver,signfor";
+                string title = "名称,下单金额,发货金额,签收金额";
+                string[] colname = dbkeys.Split(",");
+                string[] cols = title.Split(",");
+                byte[] sm = npoi.ExportToExcel(efficiencys, cols, colname);
+                if (sm != null)
+                {
+                    return File(sm, "application/vnd.ms-excel", "销售数据报表.xlsx");
+                }
+                else
+                {
+                    return Error("导出失败");
+                }
+
+            }
+            return Success("获取成功", efficiencys);
+        }
+        private List <Efficiencys> TobeEfficiencys(List<Efficiencys> efficiencys, List<Efficiencys>  Effic1
+           ,int type)
+        {
+            var date = Effic1.GroupBy(x => new { x.name }).Select(
+          x => new {
+              name = x.Key.name,
+              oeder = x.Select(y => y.oeder).Sum(),
+              deliver = x.Select(y => y.deliver).Sum(),
+              signfor = x.Select(y => y.signfor).Sum()
+          });
+           
+            if (type==0)
+            {
+                var obj = date.OrderByDescending(x => x.oeder).ToList();
+                foreach (var it in obj)
+                {
+                    Efficiencys reportdata = new Efficiencys();
+                    reportdata.name = it.name;
+                    reportdata.oeder = it.oeder;
+                    reportdata.deliver = it.deliver;
+                    reportdata.signfor = it.signfor;
+                    efficiencys.Add(reportdata);
+                }
+            }
+            else if (type == 1)
+            {
+                var obj = date.OrderByDescending(x => x.deliver).ToList();
+                foreach (var it in obj)
+                {
+                    Efficiencys reportdata = new Efficiencys();
+                    reportdata.name = it.name;
+                    reportdata.oeder = it.oeder;
+                    reportdata.deliver = it.deliver;
+                    reportdata.signfor = it.signfor;
+                    efficiencys.Add(reportdata);
+                }
+            }
+            else if (type == 2)
+            {
+                var obj = date.OrderByDescending(x => x.signfor).ToList();
+                foreach (var it in obj)
+                {
+                    Efficiencys reportdata = new Efficiencys();
+                    reportdata.name = it.name;
+                    reportdata.oeder = it.oeder;
+                    reportdata.deliver = it.deliver;
+                    reportdata.signfor = it.signfor;
+                    efficiencys.Add(reportdata);
+                }
+            }
+            return efficiencys;
+        }
     }
 }

代码/TVShoppingCallCenter_ZLJ/Controllers/System/UserAccountController.cs

@@ -149,6 +149,32 @@ namespace TVShoppingCallCenter_ZLJ.Controllers
             {
                 return Error("手机号已经存在");
             }
+            var rolemodel = await _sys_role_infoRepository.GetSingle(x => x.F_RoleId  == input.roleid);
+            if (rolemodel!=null )
+            {
+                if (input.deptid<=0)
+                {
+                    if ( rolemodel.F_RoleCode == "ZXFZR" || rolemodel.F_RoleCode == "XZFZR")
+                    {
+                        return Error("请选择部门");
+                    }
+                }
+                if (input.deptteamid <= 0)
+                {
+                    if ( rolemodel.F_RoleCode == "ZXFZR" || rolemodel.F_RoleCode == "XZFZR")
+                    {
+                        return Error("请选择中心");
+                    }
+                }
+                if (input.groupid <= 0)
+                {
+                    if ( rolemodel.F_RoleCode == "XZFZR")
+                    {
+                        return Error("请选择小组");
+                    }
+                }
+            }
+
             #endregion
             var model = new T_Sys_UserAccount();
             model.F_UserCode = input.usercode;

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -239,8 +239,8 @@ namespace TVShoppingCallCenter_ZLJ
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             app.UseCors("Cors");
-            app.UseDeveloperExceptionPage();
-            app.UseDatabaseErrorPage();
+           app.UseDeveloperExceptionPage();
+           app.UseDatabaseErrorPage();
             app.UseBrowserLink();
             app.UseStaticFiles(new StaticFileOptions()
             {
@@ -261,7 +261,7 @@ namespace TVShoppingCallCenter_ZLJ
 
             app.UseHangfireServer(new BackgroundJobServerOptions
             {
-                Queues = new[] { "daily", "minutely", "monthly", "outbound", "autodial", "month12" },//队列名称，只能为小写
+                Queues = new[] { "daily", "minutely", "automatic", "aftersale", "outbound", "autodial", "month12" },//队列名称，只能为小写
                 WorkerCount = Environment.ProcessorCount * 3, //并发任务数
                 ServerName = "hangfireMysql",//服务器名称
             });//启动Hangfire服务  有可选参数

代码/TVShoppingCallCenter_ZLJ/appsettings.json

@@ -39,8 +39,8 @@
     "vipkey": "F_Name,F_Birthday,F_Age,F_Sex,F_ShoeSize,F_Phone,F_Mobile,F_Recommender,F_RecommenderTel,F_Label,F_Province,F_City,F_Area,F_Town,F_Address,F_Province1,F_City1,F_Area1,F_Town1,F_Address1,F_Province2,F_City2,F_Area2,F_Town2,F_Address2,F_Score,F_Money,F_TotalScore,F_Saleperson,F_Membership",
     "vipvalue": "姓名,生日,年龄,性别,鞋码,联系方式,备用号码,推荐人,推荐人电话,会员标签,省份,城市,县区,乡镇,地址,备用省份1,,备用城市1,备用县区1,备用乡镇1,备用地址1,备用省份2,,备用城市2,备用县区2,备用乡镇2,备用地址2,会员积分,累计消费,累计积分,销售负责人,会员类型",
 
-    "orderkey": "F_Customer,F_Addressee,F_AddPhone,F_CustomerPhone,F_Ress,F_ProductName,Count,F_TotlePrice,Preferential,F_ShouldPrice,F_RealPrice,F_CheckUserName,XSZZ,DeptName,Manager,F_Remark,F_Id,F_Type,F_AddTime,F_Express",
-    "ordervalue": "会员姓名,收件人姓名,手机号,固话,收件人地址,商品名称,数量,订单总金额,优惠活动,应收金额,实收金额,客服姓名,销售组长,中心,中心经理,备注,订单编号,订单类型,订单时间,快递",
+    "orderkey": "F_Customer,F_Addressee,F_AddPhone,F_CustomerPhone,F_AddDes,F_Ress,F_ProductName,Count,F_TotlePrice,Preferential,F_ShouldPrice,F_RealPrice,F_CheckUserName,XSZZ,DeptName,Manager,F_Remark,F_Id,F_Type,F_AddTime,F_Express",
+    "ordervalue": "会员姓名,收件人姓名,手机号,固话,送货说明,收件人地址,商品名称,数量,订单总金额,优惠活动,应收金额,实收金额,客服姓名,销售组长,中心,中心经理,备注,订单编号,订单类型,订单时间,快递",
     "ordercommoditykey": "F_ProductName,Count,DeliveryMoney,Signfor,SignforMoney",
     "ordercommodityvalue": "商品名称,发货数量,发货金额,签收数量,签收金额",