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

代码/System.Model/T_Bus_ProductClass.cs

@@ -30,7 +30,7 @@ namespace System.Model
 		/// <summary>
 		/// 上级分类 0顶级
 		/// </summary>
-		public int? F_parentId
+		public int? F_ParentId
 		{
 			set { _f_parentid = value; }
 			get { return _f_parentid; }

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

@@ -55,24 +55,25 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             #region 验证 参数
 
 
-            if (string.IsNullOrEmpty(input.F_ClassName))
+            if (string.IsNullOrEmpty(input.ClassName))
                 return Error("请输入分类名称");
-            if (string.IsNullOrEmpty(input.F_ClassShortName))
+            if (string.IsNullOrEmpty(input.ClassShortName))
                 return Error("请输入分类简写");
 
             #endregion
-            Expression<Func<T_Bus_ProductClass, bool>> eq = a => a.F_ClassName == input.F_ClassName;
-            if (await _productClassRepository.GetCount(eq.Or(b => b.F_ClassShortName == input.F_ClassShortName)) > 0)
+            Expression<Func<T_Bus_ProductClass, bool>> eq = a => a.F_ClassName == input.ClassName;
+            if (await _productClassRepository.GetCount(eq.Or(b => b.F_ClassShortName == input.ClassShortName)) > 0)
             {
                 return Error("分类/简写名称重复");
             }
             T_Bus_ProductClass T_Bus_ProductClassModel = new T_Bus_ProductClass();
-            if (input.F_ClassId != 0)
-                T_Bus_ProductClassModel.F_ClassId = input.F_ClassId;
+            if (input.ClassId != 0)
+                T_Bus_ProductClassModel.F_ClassId = input.ClassId;
 
-            T_Bus_ProductClassModel.F_ClassShortName = input.F_ClassShortName;
-            T_Bus_ProductClassModel.F_parentId = input.F_parentId;
-            T_Bus_ProductClassModel.F_ClassName = input.F_ClassName;
+            T_Bus_ProductClassModel.F_ClassShortName = input.ClassShortName;
+            T_Bus_ProductClassModel.F_ParentId = input.ParentId;
+            T_Bus_ProductClassModel.F_Sort = 10000;
+            T_Bus_ProductClassModel.F_ClassName = input.ClassName;
             T_Bus_ProductClassModel.F_UserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
             T_Bus_ProductClassModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
 
@@ -100,18 +101,18 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             #region 验证 参数
 
 
-            if (string.IsNullOrEmpty(input.F_ClassName))
+            if (string.IsNullOrEmpty(input.ClassName))
                 return Error("请输入分类名称");
-            if (string.IsNullOrEmpty(input.F_ClassShortName))
+            if (string.IsNullOrEmpty(input.ClassShortName))
                 return Error("请输入分类简写");
-            if (input.F_ClassId <= 0)
+            if (input.ClassId <= 0)
                 return Error("缺少参数");
             #endregion
-            T_Bus_ProductClass T_Bus_ProductClassModel = await _productClassRepository.GetSingle(a => a.F_ClassId == input.F_ClassId);
+            T_Bus_ProductClass T_Bus_ProductClassModel = await _productClassRepository.GetSingle(a => a.F_ClassId == input.ClassId);
+
+            T_Bus_ProductClassModel.F_ClassName = input.ClassName;
+            T_Bus_ProductClassModel.F_ClassShortName = input.ClassShortName;
 
-            T_Bus_ProductClassModel.F_ClassName = input.F_ClassName;
-            T_Bus_ProductClassModel.F_ClassShortName = input.F_ClassShortName;
-            T_Bus_ProductClassModel.F_parentId = input.F_parentId;
 
             T_Bus_ProductClassModel.F_UserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
             T_Bus_ProductClassModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
@@ -119,11 +120,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
             if (await _productClassRepository.Update(T_Bus_ProductClassModel))
             {
-                return Success("新增商品分类成功");
+                return Success("保存商品分类成功");
             }
             else
             {
-                return Error("新增分类失败,请重试！");
+                return Error("保存分类失败,请重试！");
             }
         }
 
@@ -162,33 +163,28 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
         public async Task<IActionResult> ProductClassList(ProductClassInput input)
         {
 
-            #region 验证 参数
-
-            if (input.F_ClassId <= 0)
-                return Error("缺少参数");
-            #endregion
 
 
             #region  拼接条件
 
             Expression<Func<T_Bus_ProductClass, bool>> eq = a => a.F_ClassId > 0;
 
-            if (input.F_ClassId > 0)
-                eq = eq.And(a => a.F_ClassId == input.F_ClassId);
-            if (!string.IsNullOrEmpty(input.F_ClassName))
+            if (input.ClassId > 0)
+                eq = eq.And(a => a.F_ClassId == input.ClassId);
+            if (!string.IsNullOrEmpty(input.ClassName))
             {
-                eq = eq.And(a => a.F_ClassName.Contains(input.F_ClassName));
-                // eq.Or(a => a.F_ClassShortName.Contains(input.F_ClassName));
+                eq = eq.And(a => a.F_ClassName.Contains(input.ClassName));
             }
-            if (input.F_parentId > 0)
+            if (!string.IsNullOrEmpty(input.ClassShortName))
             {
-                eq = eq.And(a => a.F_parentId == input.F_parentId);
+                eq = eq.And(a => a.F_ClassShortName.Contains(input.ClassShortName));
             }
-            if (input.F_parentId == -1)
+            if (input.ParentId >= 0)
             {
-                eq = eq.And(a => a.F_parentId == 0);
+                eq = eq.And(a => a.F_ParentId == input.ParentId);
             }
 
+
             #endregion
 
 
@@ -436,7 +432,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
         {
 
             #region  拼接条件
-
+            if (input.Limit <= 0)
+            {
+                input.Limit = 100000;
+            }
             Expression<Func<T_Bus_Product, bool>> eq = a => a.F_IsDelete == 1;
 
             if (input.ClassId > 0)
@@ -486,7 +485,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             #endregion
 
             RefAsync<int> count = 0;
-            var list = await _productRepository.GetListByPage(eq, new MyPageModel() { PageIndex = 1, PageSize = 20, PageCount = count });
+            var list = await _productRepository.GetListByPage(eq, new MyPageModel() { PageIndex = 1, PageSize = input.Limit, PageCount = count });
 
             return Success("成功", list);
 
@@ -558,14 +557,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             #endregion
             int recordCount =0;
             var list = await _productRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
-            var obj = new
-            {
-                state = "success",
-                message = "成功",
-                rows = list,
-                total=  recordCount
-            };
-            return Content(obj.ToJson());
+
+             return Success("成功", list);
         }
 
 
@@ -591,8 +584,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             foreach (ProductInput m in input)
             {
                 // return Success(m.F_ProductId.ToString() + ":" + m.F_Stock.ToString());
-                if (!string.IsNullOrEmpty(m.ProductName))
-                    return Error("参数缺失产品名称");
+                //if (!string.IsNullOrEmpty(m.ProductName))
+                //    return Error("参数缺失产品名称");
                 if (m.ProductId <= 0)
                     return Error("参数缺失产品id");
                 if (m.Stock < 0)
@@ -606,7 +599,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             }
 
             #endregion
-            //此字段更新单独字段优先
+            //此字段更新单独字段
             if (await _productRepository.UpdateListToColumns(listmodel, it => new { it.F_Stock }))
                 return Success("更新库存成功");
             else

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

@@ -21,7 +21,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 产品分类编号
 		/// </summary>
-		public int F_ClassId
+		public int ClassId
 		{
 			set { _f_classid = value; }
 			get { return _f_classid; }
@@ -29,7 +29,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 上级分类 0顶级
 		/// </summary>
-		public int? F_parentId
+		public int? ParentId
 		{
 			set { _f_parentid = value; }
 			get { return _f_parentid; }
@@ -37,7 +37,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 产品分类名称
 		/// </summary>
-		public string F_ClassName
+		public string ClassName
 		{
 			set { _f_classname = value; }
 			get { return _f_classname; }
@@ -45,7 +45,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 产品分类简称/代码
 		/// </summary>
-		public string F_ClassShortName
+		public string ClassShortName
 		{
 			set { _f_classshortname = value; }
 			get { return _f_classshortname; }
@@ -53,7 +53,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 添加时间
 		/// </summary>
-		public DateTime? F_Addtime
+		public DateTime? Addtime
 		{
 			set { _f_addtime = value; }
 			get { return _f_addtime; }
@@ -61,7 +61,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 操作员
 		/// </summary>
-		public string F_UserName
+		public string UserName
 		{
 			set { _f_username = value; }
 			get { return _f_username; }
@@ -69,7 +69,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 最后更新时间
 		/// </summary>
-		public DateTime? F_UpdateTime
+		public DateTime? UpdateTime
 		{
 			set { _f_updatetime = value; }
 			get { return _f_updatetime; }
@@ -77,7 +77,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 操作员id
 		/// </summary>
-		public int? F_UserId
+		public int? UserId
 		{
 			set { _f_userid = value; }
 			get { return _f_userid; }
@@ -85,7 +85,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 排序
 		/// </summary>
-		public int? F_Sort
+		public int? Sort
 		{
 			set { _f_sort = value; }
 			get { return _f_sort; }

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

@@ -41,7 +41,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private int _f_sort;
         private DateTime? _f_laststockupdate;
         private int _f_stock = 0;
-
+        private int _limit = 0;
         /// <summary>
         /// 产品编号ID
         /// </summary>
@@ -50,8 +50,11 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             set { _f_productid = value; }
             get { return _f_productid; }
         }
-        public int Top
-        { set; get; }
+        public int Limit
+        {
+            set { _limit = value; }
+            get { return _limit; }
+        }
         /// <summary>
         /// 产品条形码
         /// </summary>