新增评论标签表

Mall.Model/Entity/Product/RB_Goods_Comment.cs

@@ -200,5 +200,10 @@ namespace Mall.Model.Entity.Product
         /// 门店id
         /// </summary>
         public int StoreId { get; set; }
+
+        /// <summary>
+        /// 评论标签Id
+        /// </summary>
+        public int LabelId { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_DistributionCommission.cs

-using VT.FW.DB;
-using Mall.Common.Enum.User;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
+using VT.FW.DB;
 
 namespace Mall.Model.Entity.Product
 {

Mall.Model/Extend/Product/RB_Goods_Specification_Extend.cs

@@ -23,4 +23,17 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public List<RB_Goods_SpecificationValue_Extend> SpecificationValueList { get; set; }
     }
+
+    public class DateItem
+    {
+
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int YearStr { get; set; }
+
+        public string MonthStr { get; set; }
+
+        public string DayStr { get; set; }
+    }
 }

Mall.Module.Product/OrderModule.cs

@@ -25,6 +25,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using VT.FW.DB;
 
@@ -402,6 +403,11 @@ namespace Mall.Module.Product
         private readonly Repository.TradePavilion.RB_Custom_FormRepository custom_FormRepository = new Repository.TradePavilion.RB_Custom_FormRepository();
 
 
+        /// <summary>
+        /// 评论标签仓储层对象
+        /// </summary>
+        private readonly RB_Comment_LabelRepository comment_LabelRepository = new RB_Comment_LabelRepository();
+
         #region 购物车
 
         /// <summary>
@@ -9266,5 +9272,87 @@ namespace Mall.Module.Product
             }
             return list;
         }
+
+        #region  评论标签管理
+
+        /// <summary>
+        /// 获取评论标签分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Comment_Label_Extend> GetCommentLabelPageModule(int pageIndex, int pageSize, out long totalCount, RB_Comment_Label_Extend query)
+        {
+            var list = comment_LabelRepository.GetCommentLabelPageRepository(pageIndex, pageSize, out totalCount, query);
+            return list;
+        }
+
+
+        /// <summary>
+        /// 获取评论标签列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Comment_Label_Extend> GetCommentLabelListModule(RB_Comment_Label_Extend query)
+        {
+            var list = comment_LabelRepository.GetCommentLabelListRepository(query);
+            return list;
+        }
+
+        /// <summary>
+        /// 新增修改评论标签
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetCommentLabelModule(RB_Comment_Label_Extend model)
+        {
+            bool flag = false;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Comment_Label_Extend.Name),model.Name },
+                    {nameof(RB_Comment_Label_Extend.UpdateDate),model.UpdateDate },
+                };
+                flag = comment_LabelRepository.Update(fileds, new WhereHelper(nameof(RB_Comment_Label_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = comment_LabelRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取频率标签
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Comment_Label_Extend GetCommentLabelModule(int Id)
+        {
+            var extModel = comment_LabelRepository.GetEntity<RB_Comment_Label_Extend>(Id);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 根据编号删除评论标签
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveCommentLabelModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Comment_Label_Extend.Status),1 },
+                {nameof(RB_Comment_Label_Extend.UpdateDate),DateTime.Now },
+            };
+            var flag = comment_LabelRepository.Update(fileds, new WhereHelper(nameof(RB_Comment_Label_Extend.Id), Id));
+            return flag;
+        }
+        #endregion
     }
 }

Mall.Repository/Product/RB_Goods_CommentRepository.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-using Mall.Model.Entity.Product;
+using Mall.Model.Entity.Product;
 using Mall.Model.Extend.Product;
+using System.Collections.Generic;
 using System.Linq;
-using Mall.Model.Entity.User;
 
 namespace Mall.Repository.Product
 {

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -20,6 +20,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Json;
 using Mall.AOP;
+using Consul;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -711,18 +712,19 @@ namespace Mall.WebApi.Controllers.MallBase
                 List<object> result = new List<object>();
                 foreach (var item in list)
                 {
-                    if (item.Value=="1"|| item.Value == "5"|| item.Value == "6"|| item.Value == "7")
+                    if (item.Value == "1" || item.Value == "5" || item.Value == "6" || item.Value == "7")
                     {
                         result.Add(new { Id = Convert.ToInt32(item.Value), Name = item.Key });
                     }
                     else if (item.Value == "3")
                     {
-                        result.Add(new { Id = Convert.ToInt32(item.Value), Name ="待出团"});
+                        result.Add(new { Id = Convert.ToInt32(item.Value), Name = "待出团" });
                     }
                 }
                 return ApiResult.Success("", result);
             }
-            else {
+            else
+            {
                 return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
                 {
                     Name = x.Key,
@@ -3467,7 +3469,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success("");
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }
@@ -4775,11 +4778,13 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #region 教育资产商品
         [HttpPost]
-        public ApiResult SetEduGoodsFreightCostFinance() {
+        public ApiResult SetEduGoodsFreightCostFinance()
+        {
             var userInfo = base.UserInfo;
             var parm = JObject.Parse(base.RequestParm.msg.ToString());
             int OrderId = parm.GetInt("OrderId", 0);
-            if (OrderId <= 0) {
+            if (OrderId <= 0)
+            {
                 return ApiResult.ParamIsNull();
             }
 
@@ -4788,11 +4793,110 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }
 
         #endregion
+
+        #region 评论标签管理
+
+        /// <summary>
+        /// 新增修改评论标签
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetCommentLabel()
+        {
+            var userInfo = base.UserInfo;
+            var parm = JObject.Parse(base.RequestParm.msg.ToString());
+            RB_Comment_Label_Extend extModel = new RB_Comment_Label_Extend()
+            {
+                Id = parm.GetInt("Id"),
+                Name = parm.GetStringValue("Name"),
+                Status = 0,
+                TenantId = userInfo.TenantId,
+                MallBaseId = userInfo.MallBaseId,
+            };
+            if (extModel.Id > 0)
+            {
+                extModel.UpdateDate = DateTime.Now;
+            }
+            else
+            {
+                extModel.CreateDate = DateTime.Now;
+            }
+            bool flag = orderModule.SetCommentLabelModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+        /// <summary>
+        /// 根据编号获取评论标签
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCommentLabel()
+        {
+            var parm = JObject.Parse(base.RequestParm.msg.ToString());
+            int Id = parm.GetInt("Id");
+            var extModel = orderModule.GetCommentLabelModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 根据编号删除评论标签
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveCommentLabel()
+        {
+            var parm = JObject.Parse(base.RequestParm.msg.ToString());
+            int Id = parm.GetInt("Id");
+            var flag = orderModule.RemoveCommentLabelModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取评论标签分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCommentLabelPage()
+        {
+            var parm = JObject.Parse(base.RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                pageIndex=parm.GetInt("pageIndex"),
+                pageSize=parm.GetInt("pageSize"),
+            };
+            var query = new RB_Comment_Label_Extend()
+            {
+                Name=parm.GetStringValue("Name"),
+            };
+            var dataList = orderModule.GetCommentLabelPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = dataList;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取评论标签列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCommentLabelList()
+        {
+            var parm = JObject.Parse(base.RequestParm.msg.ToString());
+            var query = new RB_Comment_Label_Extend()
+            {
+                Name = parm.GetStringValue("Name"),
+            };
+            var dataList = orderModule.GetCommentLabelListModule( query);
+            return ApiResult.Success(data: dataList);
+        }
+        #endregion
     }
 }
\ No newline at end of file