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

代码/System.Model/Sys/V_DeptTeam.cs

@@ -51,5 +51,9 @@ namespace System.Model
         /// 删除工号
         /// </summary>
         public string F_DeleteBy { get; set; }
+        /// <summary>
+        /// 当月任务金额
+        /// </summary>
+        public decimal F_TargetMoney { get; set; }
     }
 }

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

@@ -27,12 +27,16 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         private readonly ISys_MobileDataRepository busMobileDataRepository;
         private readonly ICall_CallRecordsRepository busCallRecordsRepository;
         private readonly ICDRRepository busCdrRepository;
-        public CallFunctionController(ICDRRepository _busCdrRepository,ICall_CallRecordsRepository _busCallRecordsRepository,IConfiguration _configuration, ISys_MobileDataRepository _busMobileDataRepository)
+        private readonly ISys_SystemConfigRepository busSystemConfigRepository;
+
+        public CallFunctionController(ISys_SystemConfigRepository _busSystemConfigRepository,ICDRRepository _busCdrRepository,ICall_CallRecordsRepository _busCallRecordsRepository,IConfiguration _configuration, ISys_MobileDataRepository _busMobileDataRepository)
         {
+            busSystemConfigRepository = _busSystemConfigRepository;
             busCdrRepository = _busCdrRepository;
             busCallRecordsRepository = _busCallRecordsRepository;
             config = _configuration;
             busMobileDataRepository = _busMobileDataRepository;
+
         }
 
         /// <summary>
@@ -129,7 +133,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             int n1 = 0;
             if (modellist != null && modellist.Count > 0)
             {
-
+                string url = "请配置videoURL/";
+                T_Sys_SystemConfig   model =await busSystemConfigRepository.GetSingle(q=>q.F_ParamCode== "videoURL");
+                if (model != null)
+                {
+                    url = model.F_ParamValue;
+                }
                 totle = modellist.Count;
                 List<T_Call_CallRecords> modelRecordList = new List<T_Call_CallRecords>();
                 foreach (cdr modelcdr in modellist)
@@ -153,10 +162,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                     modelRecord.MYD = modelcdr.myd;
                     modelRecord.Remark = modelcdr.note;
                     modelRecord.OperateType = modelcdr.op_type;
-                    modelRecord.FilePath = modelcdr.record_path;
+                    modelRecord.FilePath = url+ modelcdr.record_path;
                     if (string.IsNullOrEmpty(modelcdr.record_path) && !string.IsNullOrEmpty(modelcdr.leave_path))
                     {
-                        modelRecord.FilePath = modelcdr.leave_path;
+                        modelRecord.FilePath = url+ modelcdr.leave_path;
                     }
                     modelRecord.RingStartTime = modelcdr.ring_time;
                     modelRecord.RelayNumber = modelcdr.trunk_num;

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

@@ -54,7 +54,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             }
             if (!string.IsNullOrEmpty(input.CallNumber))
             {
-                ConditionalModels.Add(new ConditionalModel { FieldName = "CallNumber", ConditionalType = ConditionalType.Like, FieldValue = input.CallNumber });
+                ConditionalModels.Add(new ConditionalModel { FieldName = "Caller", ConditionalType = ConditionalType.Like, FieldValue = input.CallNumber });
             }
             if (!string.IsNullOrEmpty(input.UserCode))
             {

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

@@ -159,7 +159,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)>1)
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone&&q.F_State== (int)EnumDelState.Enabled) >0)
             {
                 return Error("手机号已存在");
             }
@@ -237,7 +237,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) > 1)
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone&&q.F_ID!= input.id && q.F_State == (int)EnumDelState.Enabled) > 0)
             {
                 return Error("手机号已存在");
             }

代码/TVShoppingCallCenter_ZLJ/Controllers/Marketing/MarketingController.cs

@@ -99,11 +99,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Marketing
             {
                 foreach (var item in ids)
                 {
-                    var model = await _sys_marketing_Repository.GetSingle(x => x.F_ID == item);
-                    model.F_IsDelete  = (int)EnumUserCountState.Delete;
-                    model.F_DeleteTime  = DateTime.Now.ToLocalTime();
-                    model.F_DeleteUser  = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
-                    if (_sys_marketing_Repository.Update(model).Result)
+                    //var model = await _sys_marketing_Repository.GetSingle(x => x.F_ID == item);
+                    //model.F_IsDelete  = (int)EnumUserCountState.Delete;
+                    //model.F_DeleteTime  = DateTime.Now.ToLocalTime();
+                    //model.F_DeleteUser  = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+                    if (_sys_marketing_Repository.Delete(q=>q.F_ID== item).Result)
                         res += 1;
                 }
                 if (res == ids.Length)

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

@@ -1122,7 +1122,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             #region 条件筛选
 
 
-            conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "售后订单" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Equal, FieldValue = "售后订单" });
 
             //状态
             if (input.F_State > -2)

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

@@ -87,6 +87,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {
                     return Error("此订单号已存在");
                 }
+
                 T_Bus_Order modelOrder = new T_Bus_Order();
                 #region 订单属性
                 //必填
@@ -696,7 +697,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             if (!modelOrder.F_Type.Contains("售后"))
             { modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - modelOrder.F_ActivityMoney + modelOrder.F_ExpressFee - modelOrder.F_UseScore / modelscore.F_DebitPercent;
         }
-            DataTable dt=await busOrderMoneyRepository.GetTableSugar(string.Format("SELECT ISNULL(SUM(F_Money),0) FROM dbo.T_Bus_OrderMoney WHERE F_OrderId='{0}' AND F_State=1", modelOrder.F_Id));
+            DataTable dt=await busOrderMoneyRepository.GetTableSugar(string.Format("SELECT IFNULL(SUM(F_Money),0) FROM T_Bus_OrderMoney WHERE F_OrderId='{0}' AND F_State=1", modelOrder.F_Id));
             modelOrder.F_RealPrice = dt.Rows[0][0].ObjToDecimal() ;
             if (modelOrder.F_ShouldPrice > 0)
             {

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

@@ -158,7 +158,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpPost("update")]
-        public async Task<IActionResult> Update(SysUser_GradeInput input)
+        public async Task<IActionResult> Update([FromBody]SysUser_GradeInput input)
         {
             if (UserLogin.RoleCode == "XS" || UserLogin.RoleCode == "SH" || UserLogin.RoleCode == "KG")
             {
@@ -278,7 +278,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
 
 
 
-            Expression<Func<T_Sys_Department, bool>> whereExpressiondept = q => q.F_DeptCode.Contains("|0|1|");
+            Expression<Func<T_Sys_Department, bool>> whereExpressiondept = q =>q.F_State==1&& q.F_DeptCode.Contains("|0|1|");
             if (deptid > 0)
             {
                 whereExpressiondept.And(q => q.F_DeptId == deptid);

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

@@ -148,7 +148,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpPost("update")]
-        public async Task<IActionResult> Update(SysUser_TeamGradeInput input)
+        public async Task<IActionResult> Update([FromBody]SysUser_TeamGradeInput input)
         {
             if (UserLogin.RoleCode == "XS" || UserLogin.RoleCode == "SH" || UserLogin.RoleCode == "KG")
             {
@@ -159,7 +159,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             {
                 return Error("已锁定绩效不能修改");
             }
-            ModelConvertHelper<T_SysUser_TeamGrade, SysUser_TeamGradeInput>.ModeToModel(model, input);
+            ModelConvertHelper<T_SysUser_TeamGrade, SysUser_TeamGradeInput>.ModeToModelDefault(model, input);
             model.F_State = 4;
             if (await busTeamGradeRepository.Update(model))
             {
@@ -259,7 +259,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                 #endregion
             }
             #region 有效部门
-            Expression<Func<T_Sys_Department, bool>> whereExpressiondept = q => q.F_DeptCode.Contains("|0|1|");
+            Expression<Func<T_Sys_Department, bool>> whereExpressiondept = q =>q.F_State==1&& q.F_DeptCode.Contains("|0|1|");
             if (deptid > 0)
             {
                 whereExpressiondept.And(q => q.F_DeptId == deptid);
@@ -303,7 +303,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             #region 更新团队
             if (teamid >= 0)
             {
-                Expression<Func<T_Sys_DeptTeam, bool>> whereExpressionTeam = q => deptarry.Contains(q.F_DeptId);
+                Expression<Func<T_Sys_DeptTeam, bool>> whereExpressionTeam = q => deptarry.Contains(q.F_DeptId)&& q.F_State == 1;
                 if (teamid > 0)
                 {
                     whereExpressionTeam.And(q => q.F_Id == teamid);

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/SysUser/SysUser_TeamGradeInput.cs

@@ -39,8 +39,8 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		private int? _f_afternumber;
 		private decimal _f_aftermoney = 0.00M;
 		private decimal _f_alongmoney = 0.00M;
-		private int _f_tasknumber;
-		private int _f_taskovernumber;
+		private decimal _f_tasknumber;
+		private decimal _f_taskovernumber;
 		private string _f_taskrate;
 		private decimal? _f_agentsignmoney;
 		private int? _f_teamid = 0;
@@ -253,7 +253,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 任务数
 		/// </summary>
-		public int F_TaskNumber
+		public decimal F_TaskNumber
 		{
 			set { _f_tasknumber = value; }
 			get { return _f_tasknumber; }
@@ -261,7 +261,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 任务完成数
 		/// </summary>
-		public int F_TaskOverNumber
+		public decimal F_TaskOverNumber
 		{
 			set { _f_taskovernumber = value; }
 			get { return _f_taskovernumber; }

代码/TVShoppingCallCenter_ZLJ/appsettings.json

@@ -30,7 +30,7 @@
     "productkey": "ProductId,ProductNumber,ProductNumberName,ProductName,ProductShortName",
     "productvalue": "产品ID,款号,款名,产品名称,短标题",
 
-    "ordertrackkey": "F_Id,F_TrackingNo,ProductNumberName",
+    "ordertrackkey": "F_Id,F_TrackingNo,F_Status",
     "ordertracktvalue": "订单号,运单号,物流状态",
 
     "vipkey": "F_Name,F_Birthday,F_Age,F_Sex,F_ShoeSize,F_Mobile,F_Mobile1,F_Phone,F_Recommender,F_Label,F_Note,F_Nickname,F_CreateOn,F_Province,F_City,F_Area,F_Town,F_Postcode,F_Address,F_Address1,F_Score,F_Money,F_TotalScore,F_Saleperson,F_Type",