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

代码/System.IRepositories/IBus_TagRepository.cs

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

代码/System.Model/T_Bus_Tag.cs

@@ -0,0 +1,84 @@
+using System;
+namespace System.Model
+{
+	/// <summary>
+	/// 标签管理表
+	/// </summary>
+	[Serializable]
+	public partial class T_Bus_Tag
+	{
+		public T_Bus_Tag()
+		{ }
+		#region Model
+		private string _f_tagname="";
+		private int _f_type=0;
+		private int _f_class=1;
+		private int _f_userid;
+		private string _f_username="";
+		private int _f_sort = 100;
+		private DateTime _f_updatetime = DateTime.Now;
+
+
+
+		
+		/// <summary>
+		/// 上次更新时间
+		/// </summary>
+		public DateTime F_UpdateTime
+		{
+			set { _f_updatetime = value; }
+			get { return _f_updatetime; }
+		}
+		/// <summary>
+		/// 标签名称
+		/// </summary>
+		public string F_TagName
+		{
+			set { _f_tagname = value; }
+			get { return _f_tagname; }
+		}
+		/// <summary>
+		/// 标签类型 0产品 1会员(暂不启用)
+		/// </summary>
+		public int F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		/// <summary>
+		/// 标签分组 1系统标签 不能更改 2基础标签 3活动标签
+		/// </summary>
+		public int F_CLass
+		{
+			set { _f_class = value; }
+			get { return _f_class; }
+		}
+		/// <summary>
+		/// 操作人id
+		/// </summary>
+		public int F_UserId
+		{
+			set { _f_userid = value; }
+			get { return _f_userid; }
+		}
+		/// <summary>
+		/// 操作人名称
+		/// </summary>
+		public string F_UserName
+		{
+			set { _f_username = value; }
+			get { return _f_username; }
+		}
+		/// <summary>
+		/// 排序 正序
+		/// </summary>
+		public int F_Sort
+		{
+			set { _f_sort = value; }
+			get { return _f_sort; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/System.Model/T_Cus_VipInfo.cs

@@ -58,7 +58,7 @@ namespace System.Model
             get { return _f_birthday; }
         }
         /// <summary>
-        /// 手机号
+        /// 固定电话
         /// </summary>
         public string F_Phone
         {
@@ -170,6 +170,51 @@ namespace System.Model
         /// 删除工号
         /// </summary>
         public string F_DeleteBy { get; set; }
+        /// <summary>
+		/// 年龄
+        /// </summary>				
+        public int F_Age { get; set; }
+        /// <summary>
+        /// 手机号1
+        /// </summary>				
+        public string F_Mobile { get; set; }
+        /// <summary>
+        /// 手机号2
+        /// </summary>				
+        public string F_Mobile1 { get; set; }
+        /// <summary>
+        /// 省
+        /// </summary>				
+        public string F_Province { get; set; }
+        /// <summary>
+        /// 县、区
+        /// </summary>				
+        public string F_Area { get; set; }
+        /// <summary>
+        /// 乡镇
+        /// </summary>				
+        public string F_Town { get; set; }
+        /// <summary>
+        /// 邮编
+        /// </summary>				
+        public string F_Postcode { get; set; }
+        /// <summary>
+        /// 鞋码
+        /// </summary>				
+        public int F_ShoeSize { get; set; }
+        /// <summary>
+        /// 会员积分
+        /// </summary>				
+        public decimal F_Score { get; set; }
+        /// <summary>
+        /// 累计消费金额
+        /// </summary>				
+        public decimal F_Money { get; set; }
+        /// <summary>
+        /// 累计积分
+        /// </summary>				
+        public decimal F_TotalScore { get; set; }
+
         #endregion Model
     }
 }

代码/System.Repositories/Bus_TagRepository.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_TagRepository : BaseRepository<T_Bus_Tag>, IBus_TagRepository
+    {
+    }
+}

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

@@ -48,9 +48,16 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
 
             if (!string.IsNullOrEmpty(keyword))
-            {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword });
-            }
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Phone", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or, new ConditionalModel() { FieldName = "F_VIPCode", ConditionalType = ConditionalType.Like, FieldValue = keyword })
+                       
+                    }
+                });
             #endregion
             int recordCount = 0;
             var list = await _cus_vip_infoRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });

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

@@ -51,6 +51,16 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword });
             }
+            if (!string.IsNullOrEmpty(keyword))
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Like, FieldValue = keyword })
+
+                    }
+                });
             #endregion
             int recordCount = 0;
             var list = await _cus_vip_labelinfoRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
@@ -177,5 +187,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             else
                 return Error("请选择要删除的记录");
         }
+
+
     }
 }

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

@@ -26,11 +26,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
     {
 
         private readonly IBus_ProductRepository _productRepository;
-        private readonly IBus_ProductClassRepository _productClassRepository;
-        public ProductController(IBus_ProductRepository productRepository, IBus_ProductClassRepository productClassRepository)
+        private readonly IBus_ProductClassRepository _productClassRepository; 
+        private readonly IBus_TagRepository _tagRepository;
+        public ProductController(IBus_ProductRepository productRepository, IBus_ProductClassRepository productClassRepository, IBus_TagRepository tagRepository)
         {
             _productRepository = productRepository;
             _productClassRepository = productClassRepository;
+            _tagRepository = tagRepository;
         }
         [AllowAnonymous]
         [HttpGet("/api/test")]
@@ -658,6 +660,167 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
         #endregion
 
+
+
+        #region 标签操作
+
+        /// <summary>
+        /// 新增标签
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("addtag")]
+        public async Task<IActionResult> AddTag(TagInput input)
+        {
+
+            #region 验证 参数
+
+
+            if (string.IsNullOrEmpty(input.TagName))
+                return Error("请输入分类名称");
+            if (input.CLass<1)
+                return Error("请输入标签分类");
+            if (input.Type < 0)
+                input.Type = 1;
+
+            #endregion
+            Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_TagName == input.TagName;
+
+            if (await _tagRepository.GetCount(eq.And(b => b.F_Type == input.Type)) > 0)
+            {
+                return Error("标签名称重复");
+            }
+            T_Bus_Tag T_Bus_TagModel = new T_Bus_Tag();
+
+            T_Bus_TagModel.F_Type = input.Type;
+            T_Bus_TagModel.F_TagName = input.TagName;
+            T_Bus_TagModel.F_Sort = 100;
+            T_Bus_TagModel.F_CLass = input.CLass;
+            T_Bus_TagModel.F_UserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
+            T_Bus_TagModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
+            T_Bus_TagModel.F_UpdateTime = DateTime.Now;
+
+            if (await _tagRepository.Add(T_Bus_TagModel) > 0)
+            {
+                return Success("新增标签成功");
+            }
+            else
+            {
+                return Error("标签重复或失败,请重试！");
+            }
+        }
+
+
+        /// <summary>
+        /// 更新标签
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("updatetag")]
+        public async Task<IActionResult> UpdateTag(TagInput input)
+        {
+
+            #region 验证 参数
+
+
+            if (string.IsNullOrEmpty(input.TagName))
+                return Error("请输入原标签名称");
+            if (string.IsNullOrEmpty(input.NewTagName))
+                return Error("请输入标签名称");
+            if (input.Type < 0)
+                input.Type = 1;
+            if (input.Sort <1)
+                return Error("请输入标签排序序号");
+
+            #endregion
+
+            Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_TagName == input.TagName;
+
+            T_Bus_Tag T_Bus_TagModel = await _tagRepository.GetSingle(eq.And(b=>b.F_Type== input.Type));
+            //除非某固定权限 定之后再加
+            if (T_Bus_TagModel.F_CLass == 1)
+            {
+                return Error("系统标签不能更改");
+            }
+            T_Bus_TagModel.F_TagName = input.NewTagName;
+            T_Bus_TagModel.F_Sort = input.Sort;
+
+
+            T_Bus_TagModel.F_UserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
+            T_Bus_TagModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
+            T_Bus_TagModel.F_UpdateTime = DateTime.Now;
+
+            if (await _tagRepository.Update(T_Bus_TagModel))
+            {
+                return Success("更新标签成功");
+            }
+            else
+            {
+                return Error("标签重复或失败,请重试！");
+            }
+        }
+
+        /// <summary>
+        /// 删除标签
+        /// </summary>
+        /// <param name="tagName"></param>
+        /// <returns></returns>
+        [HttpPost("deletetag")]
+        public async Task<IActionResult> DeleteTag(TagInput input)
+        {
+
+
+            if (string.IsNullOrEmpty(input.TagName))
+                return Error("请选择标签");
+            if (input.CLass<2)
+                return Error("系统标签不能删除");
+
+
+            Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_TagName == input.TagName;
+            //非系统标签可以随意删除，与商品没有关联
+            if (await _tagRepository.Delete(eq.And(b=>b.F_Type==input.Type)))
+            {
+                return Success("删除标签成功");
+            }
+            else
+            {
+                return Error("删除标签失败,请重试！");
+            }
+        }
+
+        /// <summary>
+        /// 查询符合条件所有标签
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("gettagall")]
+        public async Task<IActionResult> GetTagAll(TagInput input)
+        {
+
+
+            #region  拼接条件
+
+            Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_Type == 1;
+
+            //if (input.Type > 0)
+            //    eq = eq.And(a => a.F_Type == input.Type);
+            if (input.CLass > 0)
+            {
+                eq = eq.And(a => a.F_CLass == input.CLass);
+            }
+
+
+            #endregion
+
+
+            List<T_Bus_Tag> list = await _tagRepository.GetListALL(eq,c=>c.F_Sort,OrderByType.Asc);
+
+            return Success("成功", list);
+
+        }
+
+        #endregion
+
         #region 库存对接
 
         /// <summary>

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

@@ -0,0 +1,65 @@
+using System;
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+	/// <summary>
+	/// 标签管理表
+	/// </summary>
+	[Serializable]
+	public partial class TagInput
+	{
+		public TagInput()
+		{ }
+		#region Model
+		private string _f_tagname="";
+		private string _newtagname = "";
+		private int _f_type=0;
+		private int _f_class=1;
+		private int _f_userid;
+		private string _f_username="";
+		private int _f_sort = 100;
+		/// <summary>
+		/// 新标签名称
+		/// </summary>
+		public string NewTagName
+		{
+			set { _newtagname = value; }
+			get { return _newtagname; }
+		}
+		/// <summary>
+		/// 标签名称
+		/// </summary>
+		public string TagName
+		{
+			set { _f_tagname = value; }
+			get { return _f_tagname; }
+		}
+		/// <summary>
+		/// 标签类型 1产品 2会员(暂不启用)
+		/// </summary>
+		public int Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		/// <summary>
+		/// 标签分组 1系统标签 不能更改 2基础标签 3活动标签
+		/// </summary>
+		public int CLass
+		{
+			set { _f_class = value; }
+			get { return _f_class; }
+		}
+
+		/// <summary>
+		/// 排序 正序
+		/// </summary>
+		public int Sort
+		{
+			set { _f_sort = value; }
+			get { return _f_sort; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -118,6 +118,7 @@ namespace TVShoppingCallCenter_ZLJ
 
             services.AddTransient<IBus_ProductClassRepository, Bus_ProductClassRepository>();
             services.AddTransient<IBus_ProductRepository, Bus_ProductRepository>();
+            services.AddTransient<IBus_TagRepository, Bus_TagRepository>();
 
             services.AddTransient<ICus_VipInfoRepository, Cus_VipInfoRepository>();
             services.AddTransient<ICus_VipLabelInfoRepository, Cus_VipLabelInfoRepository>();