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

Conflicts:
	.gitignore

.gitignore

@@ -2,3 +2,10 @@
 bin/
 obj/
 代码/TVShoppingCallCenter_ZLJ/Properties/launchSettings.json
+代码/.vs/TVShoppingCallCenter_ZLJ/v16/.suo
+文档/需求文档/~$20200610_足力健功能清单.xlsx
+文档/需求文档/~$健需求分析说明书0529持续.docx
+文档/开发文档/~$库设计说明书V1.0.0_孟洁.doc
+文档/需求文档/~$参考-足力健现用平台.xlsx
+代码/TVShoppingCallCenter_ZLJ/Properties/PublishProfiles/CustomProfile.pubxml
+代码/TVShoppingCallCenter_ZLJ/.config/dotnet-tools.json

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

@@ -192,7 +192,25 @@ namespace System.Common.Helpers
             {
                 // 判断此属性是否有Getter      
                 if (!pi.CanRead) continue;
-                dt.Columns.Add(pi.Name, pi.PropertyType);
+
+                if (pi.PropertyType.FullName.Contains(typeof(System.DateTime).FullName))
+                {
+                    dt.Columns.Add(pi.Name, typeof(System.DateTime));
+                }
+                else if (pi.PropertyType.FullName.Contains(typeof(System.Int64).FullName))
+                {
+                    dt.Columns.Add(pi.Name, typeof(System.Int64));
+                }
+                else if (pi.PropertyType.FullName.Contains(typeof(System.Int32).FullName))
+                {
+                    dt.Columns.Add(pi.Name, typeof(System.Int32));
+                }
+                else if (pi.PropertyType.FullName.Contains(typeof(System.Decimal).FullName))
+                {
+                    dt.Columns.Add(pi.Name, typeof(System.Decimal));
+                }
+                else { dt.Columns.Add(pi.Name, pi.PropertyType); }
+
             }
             foreach (T item in list)
             {
@@ -201,7 +219,12 @@ namespace System.Common.Helpers
                 foreach (PropertyInfo pi in propertys)
                 {
                     if (!pi.CanRead) continue;
-                    newRow[pi.Name] = pi.GetValue(item);
+                    if (pi.GetValue(item) == DBNull.Value || pi.GetValue(item) == null)
+                    {
+                        newRow[pi.Name] = DBNull.Value;
+                    }
+                    else { newRow[pi.Name] = pi.GetValue(item); }
+                   
                 }
                 dt.Rows.Add(newRow);
             }
@@ -267,7 +290,7 @@ namespace System.Common.Helpers
                         }
                         else if (t1p.PropertyType.FullName.Contains(typeof(System.Decimal).FullName))
                         {
-                            t1p.SetValue(t1, t2value, null);
+                            t1p.SetValue(t1, t2value, null); 
                         }
                         else if (t1p.PropertyType.FullName.Contains(typeof(System.DateTime).FullName))
                         {

代码/System.IRepositories/IBus_SMSLogRepository.cs

@@ -0,0 +1,10 @@
+using System.Common;
+using System;
+using System.Model;
+
+namespace System.IRepositories
+{
+    public interface IBus_SMSLogRepository : IRepository<T_Bus_SMSLog>
+    {
+    }
+}

代码/System.IRepositories/IBus_SMSTemplateRepository.cs

@@ -0,0 +1,10 @@
+using System.Common;
+using System;
+using System.Model;
+
+namespace System.IRepositories
+{
+    public interface IBus_SMSTemplateRepository : IRepository<T_Bus_SMSTemplate>
+    {
+    }
+}

代码/System.Model/T_Bus_Order.cs

@@ -359,7 +359,7 @@ namespace System.Model
 			get { return _f_paytime; }
 		}
 		/// <summary>
-		/// //0待回款1已支付 2待退款3已退款
+		/// 0待回款1已支付 2待退款3已退款
 		/// </summary>
 		public int F_PayState
 		{

代码/System.Model/T_Bus_SMSLog.cs

@@ -0,0 +1,137 @@
+using System;
+namespace System.Model
+{
+	/// <summary>
+	/// 短信发送记录
+	/// </summary>
+	[Serializable]
+	public partial class T_Bus_SMSLog
+	{
+		public T_Bus_SMSLog()
+		{ }
+		#region Model
+		private string _f_id;
+		private int _f_adduser = 0;
+		private string _f_addusername;
+		private string _f_content = "";
+		private int _f_templateid;
+		private int _f_state;
+		private string _f_message = "";
+		private DateTime _f_addtime;
+		private DateTime _f_sendtime;
+		private DateTime _f_plansendtime;
+		private string _f_tel = "";
+		private int _f_type;
+
+		private string _f_name = "";
+
+		/// <summary>
+		/// 本批次名称
+		/// </summary>
+		public string F_Name
+		{
+			set { _f_name = value; }
+			get { return _f_name; }
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public string F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 记录添加人
+		/// </summary>
+		public int F_AddUser
+		{
+			set { _f_adduser = value; }
+			get { return _f_adduser; }
+		}
+		/// <summary>
+		/// 记录添加人姓名/发送人
+		/// </summary>
+		public string F_AddUserName
+		{
+			set { _f_addusername = value; }
+			get { return _f_addusername; }
+		}
+		/// <summary>
+		/// 发送内容
+		/// </summary>
+		public string F_Content
+		{
+			set { _f_content = value; }
+			get { return _f_content; }
+		}
+		/// <summary>
+		/// 模板id
+		/// </summary>
+		public int F_TemplateId
+		{
+			set { _f_templateid = value; }
+			get { return _f_templateid; }
+		}
+		/// <summary>
+		/// 发送状态 0没有获取状态 1成功2失败
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
+		/// <summary>
+		/// 发送状态信息，可不用
+		/// </summary>
+		public string F_Message
+		{
+			set { _f_message = value; }
+			get { return _f_message; }
+		}
+		/// <summary>
+		/// 发送时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 发送时间
+		/// </summary>
+		public DateTime F_SendTime
+		{
+			set { _f_sendtime = value; }
+			get { return _f_sendtime; }
+		}
+		/// <summary>
+		/// 计划发送时间
+		/// </summary>
+		public DateTime F_PlanSendTime
+		{
+			set { _f_plansendtime = value; }
+			get { return _f_plansendtime; }
+		}
+		/// <summary>
+		/// 发送的电话
+		/// </summary>
+		public string F_Tel
+		{
+			set { _f_tel = value; }
+			get { return _f_tel; }
+		}
+		/// <summary>
+		/// 0即时发送（模板），2定时发送（模板），3即时自定义 4定时自定义
+		/// </summary>
+		public int F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/System.Model/T_Bus_SMSTemplate.cs

@@ -0,0 +1,90 @@
+using System;
+namespace System.Model
+{
+	/// <summary>
+	/// 手机短信模板
+	/// </summary>
+	[Serializable]
+	public partial class T_Bus_SMSTemplate
+	{
+		public T_Bus_SMSTemplate()
+		{ }
+		#region Model
+		private int _f_id;
+		private string _f_modelname = "";
+		private string _f_content = "";
+		private int _f_adduser;
+		private string _f_addusername = "";
+		private int _f_sort = 100;
+		private DateTime _f_addtime = DateTime.Now;
+		private string _f_tel = "";
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public int F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 短息模板名称
+		/// </summary>
+		public string F_ModelName
+		{
+			set { _f_modelname = value; }
+			get { return _f_modelname; }
+		}
+		/// <summary>
+		/// 模板内容
+		/// </summary>
+		public string F_Content
+		{
+			set { _f_content = value; }
+			get { return _f_content; }
+		}
+		/// <summary>
+		/// 添加人id
+		/// </summary>
+		public int F_AddUser
+		{
+			set { _f_adduser = value; }
+			get { return _f_adduser; }
+		}
+		/// <summary>
+		/// 添加人
+		/// </summary>
+		public string F_AddUserName
+		{
+			set { _f_addusername = value; }
+			get { return _f_addusername; }
+		}
+		/// <summary>
+		/// 排序
+		/// </summary>
+		public int F_Sort
+		{
+			set { _f_sort = value; }
+			get { return _f_sort; }
+		}
+		/// <summary>
+		/// 添加时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 绑定400电话
+		/// </summary>
+		public string F_Tel
+		{
+			set { _f_tel = value; }
+			get { return _f_tel; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/System.Repositories/Bus_SMSLogRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IRepositories;
+using System.Model;
+using System.Common;
+
+namespace System.Repositories
+{
+    public class Bus_SMSLogRepository : BaseRepository<T_Bus_SMSLog>, IBus_SMSLogRepository
+    {
+    }
+}

代码/System.Repositories/Bus_SMSTemplateRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IRepositories;
+using System.Model;
+using System.Common;
+
+namespace System.Repositories
+{
+    public class Bus_SMSTemplateRepository : BaseRepository<T_Bus_SMSTemplate>, IBus_SMSTemplateRepository
+    {
+    }
+}

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

@@ -475,11 +475,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     var tb = ModelConvertHelper<T_Cus_VipInfo>.ConvertListToDataTable(dtNew);
                     //导出dtnew 
                     NPOIHelper npoi = new NPOIHelper();
-                    //string[] cols = { "姓名", "电话", "出生日期", "性别", "标签", "推荐人", "地址", "鞋码", "创建人", "创建时间" };
-                    //string[] colname = { "F_Name", "F_Phone", "F_Birthday", "F_Sex", "F_Label", "F_Recommender", "F_Address", "F_ShoeSize", "F_CreateBy", "F_CreateOn" };
-                    string[] cols = { "姓名", "生日", "年龄", "性别", "鞋码", "手机号1", "手机号2", "固定电话", "推荐人", "标签", "备注", "昵称", "注册时间", "省份", "城市", "县区", "乡镇", "邮编", "地址", "备用省份", "备用城市", "备用县区", "备用乡镇", "备用邮编", "备用地址", "会员积分", "累计消费", "累计积分", "销售负责人", "最近联系时间", "会员类型" };
-                    string[] colname = { "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_RegTime", "F_Province", "F_City", "F_Area", "F_Town", "F_Postcode", "F_Address", "F_Province", "F_City", "F_Area", "F_Town", "F_Postcode", "F_Address1", "F_Score", "F_Money", "F_TotalScore", "F_Saleperson", "F_Contact", "F_Type" };
-
+                    string dbkeys = _configuration["Import:vipkey"].ToString();
+                    string title = _configuration["Import:vipvalue"].ToString();
+                    string[] cols = dbkeys.Split(",");
+                    string[] colname = title.Split(",");
                     byte[] sm = npoi.ExportToExcel1(tb, cols, colname);
                     if (sm != null)
                     {
@@ -487,10 +486,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     }
                     else
                     {
-                        return Error("导出失败");
+                        return Error("导出失败3");
                     }
                 }
-                return Error("导出失败");
+                return Error("导出失败2");
 
                 //return Success("根据条件获取数据成功", tasklist);
 
@@ -498,7 +497,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             catch (Exception ex)
             {
                 //_logger.LogError(ex, "导出异常");
-                return Error("导出失败");
+                return Error("导出失败1");
             }
             //return Success("导出成功");
         }
@@ -549,7 +548,28 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                     {
                         if (dbcolslist.Contains(item.Name))
                         {
-                            object v = Convert.ChangeType(dr[titlelist[dbcolslist.IndexOf(item.Name)]].ToString(), item.PropertyType);
+                            Type tType = null;
+                            object o = dr[titlelist[dbcolslist.IndexOf(item.Name)]]; 
+                            if (item.PropertyType.FullName.Contains(typeof(DateTime).FullName))
+                            {
+                                tType= typeof(DateTime);
+                            }
+                            else if (item.PropertyType.FullName.Contains(typeof(Int64).FullName))
+                            {
+                                tType = typeof(Int64);
+                            }
+                            else if (item.PropertyType.FullName.Contains(typeof(Int32).FullName))
+                            {
+                                tType = typeof(Int32);
+                            }
+                            else if (item.PropertyType.FullName.Contains(typeof(Decimal).FullName))
+                            {
+                                tType = typeof(Decimal);
+                            }
+                            else { tType = item.PropertyType; }
+                            object v = null;
+                            if (o!=null&&o!=DBNull.Value)
+                             v = Convert.ChangeType(dr[titlelist[dbcolslist.IndexOf(item.Name)]].ToString(), tType);
                             item.SetValue(model, v, null);                            
                         }
                     }

代码/TVShoppingCallCenter_ZLJ/Controllers/IndexCategory/IndexBaseController.cs

@@ -177,6 +177,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.IndexCategory
                     x.F_Remark,
                     x.F_Title,
                     x.F_Score,
+                    x.F_Sort ,
                     x.F_IndexId,
                 });
                 var obj = new
@@ -200,6 +201,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.IndexCategory
                     x.F_Remark ,
                     x.F_Title ,
                     x.F_Score ,
+                    x.F_Sort,
                     x.F_IndexId ,
                 });
                 var obj = new

代码/TVShoppingCallCenter_ZLJ/Controllers/IndexCategory/IndexCategoryController.cs

@@ -136,7 +136,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.IndexCategory
             var model =  _qc_indexcategoryreposytory.GetSingle(x => x.F_CategoryId == id).Result ;
             if (model == null)
                 return Error("该指标不存在");
-            var dt = _qc_indexbasereposytory.GetListALL(x => x.F_CategoryId == model.F_CategoryId && x.F_DeleteFlag != 0).Result ;
+            var dt = _qc_indexbasereposytory.GetListALL(x => x.F_CategoryId == model.F_CategoryId && x.F_DeleteFlag == 0).Result ;
             if (dt!=null )
             {
                 if (dt.Count >0)

代码/TVShoppingCallCenter_ZLJ/Controllers/InternalMessages/InternalMessagesController.cs

@@ -96,12 +96,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.InternalMessages
         [HttpGet("getMsg")]
         public async Task<IActionResult> GetListMark(int istop=-1,int smstype=-1,int isread=-1, int pageindex = 0, int pagesize = 0)
         {
-           // string user = "8000";
+            //string user = "8000";
           string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "SMS_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
-            conModels.Add(new ConditionalModel() { FieldName = "SMS_IsRead", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
             if (smstype > -1)
             {
                 conModels.Add(new ConditionalModel() { FieldName = "SMS_Type", ConditionalType = ConditionalType.Equal, FieldValue = smstype.ToString() });

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

@@ -271,6 +271,118 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
         #endregion
 
+        /// <summary>
+        /// 获取订单分页列表（所有订单都可查，与来电相关）
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getorderlistbypage")]
+        public async Task<IActionResult> GetOrderListByPage(OrderInput input)
+        {
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "6" });
+            
+
+            if (!string.IsNullOrEmpty(input.F_ADFrom))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_ADFrom", ConditionalType = ConditionalType.Equal, FieldValue = input.F_ADFrom });
+            }
+            if (!string.IsNullOrEmpty(input.F_Type))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Type });
+            }
+            if (!string.IsNullOrEmpty(input.F_Id))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Id", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Id });
+            }
+            if (!string.IsNullOrEmpty(input.F_Customer))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Customer", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Customer });
+            }
+            if (!string.IsNullOrEmpty(input.F_CustomerPhone))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_CustomerPhone", ConditionalType = ConditionalType.Equal, FieldValue = input.F_CustomerPhone });
+            }
+            if (!string.IsNullOrEmpty(input.F_TrackingNo))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_TrackingNo", ConditionalType = ConditionalType.Equal, FieldValue = input.F_TrackingNo });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddProvince))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddProvince", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddProvince });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddCity))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddCity", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddCity });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddArea))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddArea", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddArea });
+            }
+            if (!string.IsNullOrEmpty(input.F_AddTown))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTown", ConditionalType = ConditionalType.Equal, FieldValue = input.F_AddTown });
+            }
+            if (!string.IsNullOrEmpty(input.F_Express))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Express", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Express });
+            }
+            if (!string.IsNullOrEmpty(input.F_PayType))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_PayType", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayType });
+            }
+            if (input.F_PayState > -1)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_PayState", ConditionalType = ConditionalType.Equal, FieldValue = input.F_PayState.ToString() });
+            }
+            if (input.SearchEndTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThan, FieldValue = input.SearchEndTime.GetValueOrDefault().ToString("yyyy-MM-dd 23:59:59") });
+            }
+            if (input.SearchStartTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThan, FieldValue = input.SearchStartTime.GetValueOrDefault().ToString("yyyy-MM-dd 00:00:01") });
+            }
+
+
+
+
+            #endregion
+            RefAsync<int> recordCount = 0;
+            PageData<T_Bus_Order> list = await bus_OrderRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = recordCount }, " F_AddTime DESC");
+            PageData<OrderInput> returnobj = new PageData<OrderInput>() { Totals = list.Totals };
+            List<OrderInput> returnlist = new List<OrderInput>();
+            foreach (T_Bus_Order t in list.Rows)
+            {
+                OrderInput m = new OrderInput();
+                ModelConvertHelper<OrderInput, T_Bus_Order>.ModeToModel(m, t);
+
+                List<OrderDetailInput> orderDetailInputs = new List<OrderDetailInput>();
+                #region 遍历订单商品
+                List<T_Bus_OrderDetail> orderDetails = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == t.F_Id);
+                if (orderDetails != null)
+                {
+                    foreach (T_Bus_OrderDetail t1 in orderDetails)
+                    {
+                        OrderDetailInput m1 = new OrderDetailInput();
+                        ModelConvertHelper<OrderDetailInput, T_Bus_OrderDetail>.ModeToModel(m1, t1);
+                        orderDetailInputs.Add(m1);
+                    }
+                }
+                #endregion
+                m.OrderDetailList = orderDetailInputs;
+
+                returnlist.Add(m);
+            }
+            returnobj.Rows = returnlist;
+
+            return Success("成功", returnobj);
+
+        }
+
+
         #region 售后操作
 
         /// <summary>
@@ -418,7 +530,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {
                     if (input.F_CheckStateSH == 1)
                     {
-                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
+                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserCode + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
                         string addResult = await AddOrder(modelAfterSale, modeOrder);
                         if (addResult != "1")
                         {
@@ -656,7 +768,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {
                     if (modelAfterSale.F_CheckStateSH == 1)
                     {
-                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
+                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserCode + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
                         string addResult = await AddOrder(modelAfterSale, modeOrder);
                         if (addResult != "1")
                         {
@@ -1108,7 +1220,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     }
                     else if (modelAfterSale.F_Type == 1)
                     {
-                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
+                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserCode + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
                         string addResult = await AddOrder(modelAfterSale, modeOrder);
                         if (addResult != "1")
                         {

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

@@ -228,7 +228,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             #region 条件筛选
 
 
-            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "-2" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "0" });
 
             //状态
             if (input.F_State > -2)
@@ -748,6 +748,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
                 T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
 
+                if (modelAfterSale.F_State != 0)
+                { return Error("此售后状态不支持退款"); }
                 if (modelAfterSale.F_Type != 2 && modelAfterSale.F_Type != 3 && modelAfterSale.F_Type != 6)
                 {
                     return Error("售后类型不支持退款");

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

@@ -66,9 +66,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             #region 条件筛选
 
 
-            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "3" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "-2" });
 
-            if (input.F_State >= 0)
+            if (input.F_State > -2)
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
 

代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

@@ -151,15 +151,17 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
         [HttpPost("deleteproductclass")]
         public async Task<IActionResult> DeleteProductClass(string ids)
         {
-
-
             if (string.IsNullOrEmpty(ids))
                 return Error("请输入删除id");
-            if (ids.Replace(",", "") == "")
+            ids = ids.Trim(',');
+            if (string.IsNullOrEmpty(ids))
                 return Error("请输入删除id");
-
-            //删除的时候  分类下有商品怎么处理  暂未处理  后续根据需求处理  可以指定规则，分类下没有商品才可以删除
-            if (await _productClassRepository.Delete(a => ids.Contains("," + a.F_ClassId.ToString() + ",")))
+            string[] idsarry = ids.Split(',');
+            if (await _productRepository.GetCount(q => q.F_ClassId == q.F_ClassId) > 0)
+            {
+                return Success("请先删除分类下商品");
+            }
+            if (await _productClassRepository.Delete(a => idsarry.Contains( a.F_ClassId.ToString())))
             {
                 return Success("删除商品分类成功");
             }

代码/TVShoppingCallCenter_ZLJ/Controllers/SMS/SMSController.cs

@@ -0,0 +1,418 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.Common.Helpers;
+using System.IRepositories;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Model;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula.Atp;
+using SqlSugar;
+using TVShoppingCallCenter_ZLJ.Models.Inputs;
+
+namespace TVShoppingCallCenter_ZLJ.Controllers.SMS
+{
+    [Authorize]
+    [Produces("application/json")]
+    [Route("api/[controller]")]
+    public class SMSController : BaseController
+    {
+        [HttpGet("info")]
+        public string Index()
+        {
+            return "Hello World";
+        }
+
+        private readonly IBus_SMSTemplateRepository bus_SMSTemplateRepository;
+        private readonly IBus_SMSLogRepository bus_SMSLogRepository;
+
+       public SMSController(IBus_SMSTemplateRepository _bus_SMSTemplateRepository, IBus_SMSLogRepository _bus_SMSLogRepository)
+        {
+            bus_SMSTemplateRepository = _bus_SMSTemplateRepository;
+            bus_SMSLogRepository = _bus_SMSLogRepository;
+        }
+
+        #region 短信模板
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("addtemplate")]
+        public async Task<IActionResult> AddTemplate(SMSTemplateInput input)
+        {
+
+            #region 验证 参数
+
+
+            if (string.IsNullOrEmpty(input.F_Content))
+                return Error("请输入模板内容");
+            if (string.IsNullOrEmpty(input.F_ModelName))
+                return Error("请输入模板名称");
+            if (string.IsNullOrEmpty(input.F_Tel))
+                return Error("请输入要绑定400电话");
+
+
+            #endregion
+
+            if (await bus_SMSTemplateRepository.GetCount(a => a.F_ModelName == input.F_ModelName) > 0)
+            {
+                return Error("模板名称不能重复");
+            }
+            T_Bus_SMSTemplate ModelAdd = new T_Bus_SMSTemplate();
+            ModelConvertHelper<T_Bus_SMSTemplate, SMSTemplateInput>.ModeToModelDefault(ModelAdd, input);
+            ModelAdd.F_AddUser = UserLogin.UserId.ObjToInt();
+            ModelAdd.F_AddUserName = UserLogin.UserName;
+            ModelAdd.F_AddTime = DateTime.Now;
+
+            if (await bus_SMSTemplateRepository.Add(ModelAdd) > 0)
+            {
+                return Success("新增成功");
+            }
+            else
+            {
+                return Error("新增失败,请重试！");
+            }
+        }
+
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("updatetemplate")]
+        public async Task<IActionResult> UpdateTemplate(SMSTemplateInput input)
+        {
+
+            #region 验证 参数
+
+
+            if (string.IsNullOrEmpty(input.F_Content))
+                return Error("请输入模板内容");
+            if (string.IsNullOrEmpty(input.F_ModelName))
+                return Error("请输入模板名称");
+            if (string.IsNullOrEmpty(input.F_Tel))
+                return Error("请输入要绑定400电话");
+            if (input.F_Id<1)
+                return Error("参数缺失");
+
+            #endregion
+
+            if (await bus_SMSTemplateRepository.GetCount(q => q.F_ModelName == input.F_ModelName&&q.F_Id!= input.F_Id) > 0)
+            {
+                return Error("模板名称不能重复");
+            }
+            input.F_AddTime = DateTime.Now;
+            T_Bus_SMSTemplate ModelAdd = await bus_SMSTemplateRepository.GetSingle(q=>q.F_Id==input.F_Id);
+            ModelConvertHelper<T_Bus_SMSTemplate, SMSTemplateInput>.ModeToModelDefault(ModelAdd, input);
+            ModelAdd.F_AddUser = UserLogin.UserId.ObjToInt();
+            ModelAdd.F_AddUserName = UserLogin.UserName;
+
+            if (await bus_SMSTemplateRepository.Update(ModelAdd))
+            {
+                return Success("保存成功");
+            }
+
+            return Error("保存失败,请重试！");
+            
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids">格式   1,2,3,4</param>
+        /// <returns></returns>
+        [HttpPost("deletetemplate")]
+        public async Task<IActionResult> DeleteTemplate(string ids)
+        {
+            if (string.IsNullOrEmpty(ids))
+                return Error("请输入删除id");
+            ids = ids.Trim(',');
+            if (string.IsNullOrEmpty(ids))
+                return Error("请输入删除id");
+            string[] idsArry = ids.Split(',');
+            if (await bus_SMSTemplateRepository.Delete(q => idsArry.Contains( q.F_Id.ToString())))
+            {
+                return Success("删除成功");
+            }
+            else
+            {
+                return Error("删除失败,请重试！");
+            }
+        }
+
+        /// <summary>
+        /// 分页查询
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("gettemplatebypage")]
+        public async Task<IActionResult> GetTemplateByPage(SMSTemplateInput input)
+        {
+
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+            if (!string.IsNullOrEmpty(input.F_ModelName))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_ModelName", ConditionalType = ConditionalType.Like, FieldValue = input.F_ModelName });
+            }
+            if (!string.IsNullOrEmpty(input.F_Tel))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Tel", ConditionalType = ConditionalType.Like, FieldValue = input.F_Tel });
+            }
+            if (input.F_Id>0)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Id", ConditionalType = ConditionalType.Equal, FieldValue = input.F_Id.ToString() });
+            }
+
+            #endregion
+            RefAsync<int> count = 0;
+            PageData<T_Bus_SMSTemplate> productClasselist = await bus_SMSTemplateRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count });
+
+            return Success("成功", productClasselist);
+        }
+
+
+        #endregion
+
+        #region 短信记录
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("addsmslog")]
+        public async Task<IActionResult> AddSMSLog(SMSLogInput input)
+        {
+
+            #region 验证 参数
+
+
+            if (string.IsNullOrEmpty(input.F_Content))
+                return Error("没有内容");
+            if (string.IsNullOrEmpty(input.F_Name))
+                input.F_Name = DateTime.Now.ToString("yyyyMMddhhmmss");
+            if (input.F_Type == 1 || input.F_Type == 2)
+            { 
+                if(input.F_TemplateId<1)
+                return Error("请选择模板"); 
+
+            }
+            if (input.F_Type == 2 || input.F_Type == 4)
+            {
+                if (input.F_PlanSendTime <= DateTime.Now)
+                { return Error("定时发送时间无效"); }
+            } else
+            {
+                input.F_PlanSendTime = DateTime.Now;
+            }
+            if (string.IsNullOrEmpty(input.F_Tel))
+                return Error("请输入手机号码");
+
+
+            #endregion
+            List<T_Bus_SMSLog> modelAddList = new List<T_Bus_SMSLog>();
+
+            T_Bus_SMSLog ModelAdd = new T_Bus_SMSLog();
+            ModelConvertHelper<T_Bus_SMSLog, SMSLogInput>.ModeToModelDefault(ModelAdd, input);
+            ModelAdd.F_Content = input.F_Content.Replace("{phone}", input.F_Tel).Replace("{name}","");
+            ModelAdd.F_AddUser = UserLogin.UserId.ObjToInt();
+            ModelAdd.F_AddUserName = UserLogin.UserName;
+            ModelAdd.F_AddTime = DateTime.Now;            
+            ModelAdd.F_Id=Guid.NewGuid().ToString().Replace("-","");
+            ModelAdd.F_Message = "";
+            ModelAdd.F_State = 0;
+
+            //ModelAdd.F_Tel = input.F_Tel;
+            //ModelAdd.F_PlanSendTime = input.F_PlanSendTime;
+            //ModelAdd.F_TemplateId = input.F_TemplateId;
+            //ModelAdd.F_Type = input.F_Type;
+            modelAddList.Add(ModelAdd);
+            string retstr =await SendSMSLog(modelAddList);
+            if (retstr.StartsWith("成功"))
+            {
+                return Success(retstr);
+            }
+
+            return Error(retstr);
+            
+        }
+
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("updatesmslog")]
+        public async Task<IActionResult> UpdateSMSLog(SMSLogInput input)
+        {
+
+            #region 验证 参数
+
+
+            if (string.IsNullOrEmpty(input.F_Id))
+                return Error("请输入ID");
+            if (input.F_State<1)
+                return Error("请输入状态");
+
+
+            #endregion
+
+
+            T_Bus_SMSLog ModelAdd = await bus_SMSLogRepository.GetSingle(q => q.F_Id == input.F_Id);
+            ModelAdd.F_State = input.F_State;
+            ModelAdd.F_AddUser = UserLogin.UserId.ObjToInt();
+            ModelAdd.F_AddUserName = UserLogin.UserName;
+
+            if (await bus_SMSLogRepository.Update(ModelAdd))
+            {
+                return Success("保存成功");
+            }
+
+            return Error("保存失败,请重试！");
+
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids">格式   1,2,3,4</param>
+        /// <returns></returns>
+        [HttpPost("deletesmslog")]
+        public async Task<IActionResult> DeleteSMSLog(string ids)
+        {
+            if (string.IsNullOrEmpty(ids))
+                return Error("请输入删除id");
+            ids = ids.Trim(',');
+            if (string.IsNullOrEmpty(ids))
+                return Error("请输入删除id");
+            string[] idsArry = ids.Split(',');
+            if (await bus_SMSLogRepository.Delete(q => idsArry.Contains(q.F_Id.ToString())))
+            {
+                return Success("删除成功");
+            }
+            else
+            {
+                return Error("删除失败,请重试！");
+            }
+        }
+
+        /// <summary>
+        /// 分页查询
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getsmslogbypage")]
+        public async Task<IActionResult> GetSMSLogByPage(SMSLogInput input)
+        {
+
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+            if (!string.IsNullOrEmpty(input.F_Name))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = input.F_Name });
+            }
+            if (!string.IsNullOrEmpty(input.F_Tel))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Tel", ConditionalType = ConditionalType.Like, FieldValue = input.F_Tel });
+            }
+            if (input.SearchEndTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThan, FieldValue = input.SearchEndTime.GetValueOrDefault().ToString("yyyy-MM-dd 23:59:59") });
+            }
+            if (input.F_TemplateId >0)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_TemplateId", ConditionalType = ConditionalType.Equal, FieldValue = input.F_TemplateId.ToString() });
+            }
+            if (input.SearchStartTime != null)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThan, FieldValue = input.SearchStartTime.GetValueOrDefault().ToString("yyyy-MM-dd 00:00:01") });
+            }
+            if (input.F_State > 0)
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
+            }
+
+            #endregion
+            RefAsync<int> count = 0;
+            PageData<T_Bus_SMSLog> productClasselist = await bus_SMSLogRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count });
+
+            return Success("成功", productClasselist);
+        }
+
+
+        #endregion
+
+
+        #region 方法
+
+        private async Task<string> SendSMSLog(List<T_Bus_SMSLog> list)
+        {
+            if (list != null && list.Count > 0)
+            {
+                int n = list.Count;
+                int n1 = 0;
+                int n2 = 0;
+                bool bl = await bus_SMSLogRepository.AddMany(list);
+                //记录短信  可暂时不发 放任务中
+                if (bl)
+                {
+                    List<T_Bus_SMSLog> templist = new List<T_Bus_SMSLog>();
+                    foreach (T_Bus_SMSLog m in list)
+                    {
+
+                        string ret = SendMessage(m.F_Tel, m.F_Content);
+                        m.F_Message = ret;
+                        m.F_SendTime = DateTime.Now;
+                        if (ret == "success")
+                        {
+                            n1++;
+                            m.F_State = 1;
+                        }
+                        else
+                        {
+                            n2++;
+                            m.F_State = 2;
+                        }
+                        templist.Add(m);
+                        if (templist.Count > 10)
+                        {
+                            if (!await bus_SMSLogRepository.UpdateListToColumns(templist, s => new { s.F_State, s.F_SendTime, s.F_Message }))
+                            {
+                                templist = new List<T_Bus_SMSLog>();
+                                return string.Format("失败：全部/成功/失败-{0}/{1}/{2}", n, n1, n2);
+                            }
+                            templist = new List<T_Bus_SMSLog>();
+                        }
+
+                    }
+                    if (templist.Count > 0)
+                    {
+                        await bus_SMSLogRepository.UpdateListToColumns(templist, s => new { s.F_State, s.F_SendTime, s.F_Message });
+                    }
+                    return string.Format("成功：全部/成功/失败-{0}/{1}/{2}", n, n1, n2);
+                }
+                else
+                {
+                    return "失败：短信插入失败";
+                }
+            }
+
+            return "成功：" + 0;
+        }
+
+
+        private string SendMessage(string phone,string content)
+        {
+            return "success";
+        }
+        #endregion
+    }
+}

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

@@ -274,31 +274,55 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
             }
             if (!string.IsNullOrEmpty(tasker))
             {
-                if (_sys_useraccountRepository .GetSingle(x => x.F_UserName  == tasker).Result != null)
+                if (_sys_useraccountRepository .GetListALL(x => x.F_UserName  == tasker&&x.F_DeleteFlag ==0).Result .FirstOrDefault ()!= null)
                 {
-                    conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Like, FieldValue = _sys_useraccountRepository.GetSingle(x => x.F_UserName == tasker).Result.F_UserId .ToString ()  });
+                    conModels.Add(new ConditionalModel() { FieldName = "F_Tasker", ConditionalType = ConditionalType.Equal , FieldValue = _sys_useraccountRepository.GetListALL (x => x.F_UserName == tasker && x.F_DeleteFlag == 0).Result.FirstOrDefault ().F_UserId .ToString ()  });
                 }
                 else
                 {
                     return Error("请输入正确的任务人");
                 }
             }
+            if (string .IsNullOrEmpty (tasker)&& string.IsNullOrEmpty(parentname))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal, FieldValue = parentid.ToString() });
+            }
+           // string user = "8000";
+               string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
+            if (!string.IsNullOrEmpty(deptid))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid });
+            }
+            else
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal, FieldValue = user });
+                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = dept.ToString() });
+                deptid = dept.ToString();
+            }
             if (!string.IsNullOrEmpty(parentname))
             {
-                if (_sys_taskmanagement_Repository.GetSingle (x=>x .F_Name == parentname).Result!=null  )
+                List<IConditionalModel> conModel = new List<IConditionalModel>();
+                conModel.Add(new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal, FieldValue = user });
+                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = deptid.ToString() });
+                conModel.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
+                conModel.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = parentname });
+                var model = _sys_taskmanagement_Repository.GetListALL(conModel, "F_CreateTime desc ").Result.FirstOrDefault();
+                if (model != null  )
                 {
-                    conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Like, FieldValue = _sys_taskmanagement_Repository.GetSingle(x => x.F_Name == parentname).Result.F_ID .ToString ()    });
+                    conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal, FieldValue = model.F_ID .ToString ()    });
                 }
                 else
                 {
                     return Error("请输入正确的父级任务名称");
                 }
             }
+            
             if (type > -1)
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Like, FieldValue = type.ToString() });
             }
-            conModels.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal , FieldValue = parentid.ToString() });
+           
             if (!string.IsNullOrEmpty(keyword))
             {
                 conModels.Add(new ConditionalCollections()
@@ -319,18 +343,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.TaskManagement
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_EndTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = endtime });
             }
-            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
-            var dept = _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result != null ? _sys_useraccountRepository.GetSingle(x => x.F_UserCode == user).Result.F_DeptId : 0;
-            if (!string .IsNullOrEmpty (deptid))
-            {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Equal, FieldValue = deptid });
-            }
-            else
-            {
-                conModels.Add(new ConditionalModel() { FieldName = "F_CreateUser", ConditionalType = ConditionalType.Equal , FieldValue = user  });
-                new KeyValuePair<WhereType, ConditionalModel>(WhereType.Or, new ConditionalModel() { FieldName = "F_Deptid", ConditionalType = ConditionalType.Like, FieldValue = dept.ToString() });
-
-            }
+          
             #endregion
             int recordCount = 0;
             var list = await _sys_taskmanagement_Repository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });

代码/TVShoppingCallCenter_ZLJ/Controllers/hangfire/HangfireController.cs

@@ -188,7 +188,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.hangfire
                         //必填
                         modelOrder.F_ADFrom = "生日单";
                         modelOrder.F_Type = "系统单";
-                        modelOrder.F_Id = "BJ" + modelvip.F_ID + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
+                        modelOrder.F_Id = "BJ" + modelvip.F_Saleperson + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
                         modelOrder.F_VipId = modelvip.F_ID;
                         modelOrder.F_UseActivity = "生日单";
                         //选填 快递属性

代码/TVShoppingCallCenter_ZLJ/Controllers/knowledge/KnowledgeClassController.cs

@@ -110,7 +110,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.knowledge
             var model = _repositorycategoryreposytory.GetSingle(x => x.F_CategoryId == id).Result;
             if (model == null)
                 return Error("该分类不存在");
-            var dt = _repositoryinformationrepository.GetListALL(x => x.F_CategoryId == model.F_CategoryId&&x.F_DeleteFlag !=0).Result;
+            var dt = _repositoryinformationrepository.GetListALL(x => x.F_CategoryId == model.F_CategoryId&&x.F_DeleteFlag ==0).Result;
             if (dt != null)
             {
                 if (dt.Count > 0)

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderInput.cs

@@ -291,7 +291,9 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             get { return _f_usescore; }
         }
 
-
+        /// <summary>
+        ///  0待回款1已支付 2待退款3已退款
+        /// </summary>
         public int F_PayState
         {
             set { _f_paystate = value; }

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/SMSLogInput.cs

@@ -0,0 +1,134 @@
+using System;
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+	/// <summary>
+	/// 短信模板表
+	/// </summary>
+	[Serializable]
+	public partial class SMSLogInput : BaseInput
+	{
+		public SMSLogInput()
+		{ }
+		#region Model
+		private string _f_id;
+		private int _f_adduser = 0;
+		private string _f_addusername;
+		private string _f_content = "";
+		private int _f_templateid;
+		private int _f_state;
+		private string _f_message = "";
+		private DateTime _f_addtime;
+		private DateTime _f_sendtime;
+		private DateTime _f_plansendtime;
+		private string _f_tel = "";
+		private int _f_type;
+		private string _f_name = "";
+		/// <summary>
+		/// 本批次名称
+		/// </summary>
+		public string F_Name
+		{
+			set { _f_name = value; }
+			get { return _f_name; }
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public string F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 记录添加人
+		/// </summary>
+		public int F_AddUser
+		{
+			set { _f_adduser = value; }
+			get { return _f_adduser; }
+		}
+		/// <summary>
+		/// 记录添加人姓名/发送人
+		/// </summary>
+		public string F_AddUserName
+		{
+			set { _f_addusername = value; }
+			get { return _f_addusername; }
+		}
+		/// <summary>
+		/// 发送内容
+		/// </summary>
+		public string F_Content
+		{
+			set { _f_content = value; }
+			get { return _f_content; }
+		}
+		/// <summary>
+		/// 模板id
+		/// </summary>
+		public int F_TemplateId
+		{
+			set { _f_templateid = value; }
+			get { return _f_templateid; }
+		}
+		/// <summary>
+		/// 发送状态 0没有获取状态 1成功2失败
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
+		/// <summary>
+		/// 发送状态信息，可不用
+		/// </summary>
+		public string F_Message
+		{
+			set { _f_message = value; }
+			get { return _f_message; }
+		}
+		/// <summary>
+		/// 发送时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 发送时间
+		/// </summary>
+		public DateTime F_SendTime
+		{
+			set { _f_sendtime = value; }
+			get { return _f_sendtime; }
+		}
+		/// <summary>
+		/// 计划发送时间
+		/// </summary>
+		public DateTime F_PlanSendTime
+		{
+			set { _f_plansendtime = value; }
+			get { return _f_plansendtime; }
+		}
+		/// <summary>
+		/// 发送的手机号
+		/// </summary>
+		public string F_Tel
+		{
+			set { _f_tel = value; }
+			get { return _f_tel; }
+		}
+		/// <summary>
+		/// 1即时发送（模板），2定时发送（模板），3即时自定义 4定时自定义
+		/// </summary>
+		public int F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/SMSTemplateInput.cs

@@ -0,0 +1,89 @@
+using System;
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+	/// <summary>
+	/// 短信模板表
+	/// </summary>
+	[Serializable]
+	public partial class SMSTemplateInput:BaseInput
+	{
+		public SMSTemplateInput()
+		{ }
+		#region Model
+		private int _f_id;
+		private string _f_modelname = "";
+		private string _f_content = "";
+		private int _f_adduser;
+		private string _f_addusername = "";
+		private int _f_sort = 100;
+		private DateTime _f_addtime = DateTime.Now;
+		private string _f_tel = "";
+		/// <summary>
+		/// 
+		/// </summary>
+		public int F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 短息模板名称
+		/// </summary>
+		public string F_ModelName
+		{
+			set { _f_modelname = value; }
+			get { return _f_modelname; }
+		}
+		/// <summary>
+		/// 模板内容
+		/// </summary>
+		public string F_Content
+		{
+			set { _f_content = value; }
+			get { return _f_content; }
+		}
+		/// <summary>
+		/// 添加人id
+		/// </summary>
+		public int F_AddUser
+		{
+			set { _f_adduser = value; }
+			get { return _f_adduser; }
+		}
+		/// <summary>
+		/// 添加人
+		/// </summary>
+		public string F_AddUserName
+		{
+			set { _f_addusername = value; }
+			get { return _f_addusername; }
+		}
+		/// <summary>
+		/// 排序
+		/// </summary>
+		public int F_Sort
+		{
+			set { _f_sort = value; }
+			get { return _f_sort; }
+		}
+		/// <summary>
+		/// 添加时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 绑定400电话
+		/// </summary>
+		public string F_Tel
+		{
+			set { _f_tel = value; }
+			get { return _f_tel; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -46,7 +46,7 @@ namespace TVShoppingCallCenter_ZLJ
             #region Cors 配置
             services.AddCors(options =>
             {
-                options.AddPolicy("Cors",
+                options.AddPolicy("Cors",//CorsPolicy
                 builder => builder.AllowAnyOrigin()//builder.WithOrigins(Configuration["Cors"].Split(','))
                 .AllowAnyMethod()
                 .SetIsOriginAllowed(_=>true)//上线后删除此行 加入域列表 内网可忽略
@@ -139,7 +139,9 @@ namespace TVShoppingCallCenter_ZLJ
             services.AddTransient<IBus_OrderMergeRepository, Bus_OrderMergeRepository>();
             services.AddTransient<IBus_AfterSaleRepository, Bus_AfterSaleRepository>();
             services.AddTransient<IBus_OrderMoneyRepository, Bus_OrderMoneyRepository>();
-            
+            services.AddTransient<IBus_SMSLogRepository, Bus_SMSLogRepository>();
+            services.AddTransient<IBus_SMSTemplateRepository, Bus_SMSTemplateRepository>();
+
             services.AddHangfire(x => x.UseSqlServerStorage(BaseContext.DB_ConnectionString));
 
             services.AddTransient<ICus_VipInfoRepository, Cus_VipInfoRepository>();