Skip to content

M
mall.oytour.com
Commit b7da5b1b authored by 黄奎's avatar 黄奎
Browse files
Options

新增活动评论

parent 8ef51466
Hide whitespace changes
Inline Side-by-side
Showing with 402 additions and 93 deletions
Mall.Model/Entity/TradePavilion/RB_Commerce_Comment.cs 0 → 100644
View file @ b7da5b1b
using Mall.Common.Enum;
using Mall.Common.Enum.Goods;
using Mall.Common.Enum.User;
using System;
using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// 商会活动评论表实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Commerce_Comment
{
/// <summary>
/// 主键编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 活动编号
/// </summary>
public int ActivityId { get; set; }
/// <summary>
/// 用户编号
/// </summary>
public int UserId { get; set; }
/// <summary>
/// 客人名称
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 用户头像
/// </summary>
public string UserPhoto { get; set; }
/// <summary>
/// 评分 1-5分
/// </summary>
public int CommentScore { get; set; }
/// <summary>
/// 评论类型 1 好评 2中评 3差评
/// </summary>
public GoodsCommentTypeEnum CommentGrade { get; set; }
/// <summary>
/// 评论内容
/// </summary>
public string Content { get; set; }
/// <summary>
/// 评论图片
/// </summary>
public string CommentImage { get; set; }
/// <summary>
/// 回复
/// </summary>
public string Reply { get; set; }
/// <summary>
/// 来源
/// </summary>
public UserSourceEnum PlatformSource { get; set; }
/// <summary>
/// 是否置顶 1是 2否
/// </summary>
public int Is_Top { get; set; }
/// <summary>
/// 是否显示 1是 2否
/// </summary>
public int Is_Show { get; set; }
/// <summary>
/// 是否匿名 1是 2否
/// </summary>
public int Is_Anonymity { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
/// <summary>
/// 商户号
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// CreateDate
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// UpdateDate
/// </summary>
public DateTime UpdateDate { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Commerce_Comment_Extend.cs 0 → 100644
View file @ b7da5b1b
using Mall.Model.Entity.TradePavilion;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Extend.TradePavilion
{
/// <summary>
/// 商会活动评论表扩展实体类
/// </summary>
public class RB_Commerce_Comment_Extend : RB_Commerce_Comment
{
}
}
Mall.Module.TradePavilion/CommerceCommentModule.cs 0 → 100644
View file @ b7da5b1b
using Mall.Common.Enum;
using Mall.Model.Extend.TradePavilion;
using Mall.Repository.TradePavilion;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VT.FW.DB;
namespace Mall.Module.TradePavilion
{
/// <summary>
/// 活动评论处理类
/// </summary>
public class CommerceCommentModule
{
/// <summary>
/// 商会活动评论表仓储层对象
/// </summary>
private readonly RB_Commerce_CommentRepository commerce_CommentRepository = new RB_Commerce_CommentRepository();
/// <summary>
/// 获取活动评论分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Commerce_Comment_Extend> GetCommerceCommentPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Comment_Extend query)
{
return commerce_CommentRepository.GetCommerceCommentPageRepository(pageIndex, pageSize, out rowsCount, query).ToList();
}
/// <summary>
/// 新增活动评论
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetCommerceCommentModule(RB_Commerce_Comment_Extend model)
{
var newId = commerce_CommentRepository.Insert(model);
model.Id = newId;
bool flag = newId > 0;
return flag;
}
/// <summary>
/// 删除活动评论
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool RemoveCommerceCommentModule(int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Commerce_Comment_Extend.Id),(int)DateStateEnum.Delete }
};
return commerce_CommentRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Comment_Extend.Id), Id));
}
}
}
Mall.Repository/TradePavilion/RB_Commerce_CommentRepository.cs 0 → 100644
View file @ b7da5b1b
using Mall.Common.Enum;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// 商会活动评论表仓储层
/// </summary>
public class RB_Commerce_CommentRepository:BaseRepository<RB_Commerce_Comment>
{
/// <summary>
/// 获取活动评论分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Commerce_Comment_Extend> GetCommerceCommentPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Comment_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM rb_commerce_comment
WHERE 1=1
");
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Commerce_Comment_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.Content))
{
builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Comment_Extend.Content));
parameters.Add("Name", "%" + query.Content.Trim() + "%");
}
if (query.ActivityId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Comment_Extend.ActivityId), query.ActivityId);
}
}
return GetPage<RB_Commerce_Comment_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
}
}
\ No newline at end of file
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ b7da5b1b
......@@ -4,6 +4,8 @@ using System.Linq;
using System.Threading.Tasks;
using Mall.CacheManager.User;
using Mall.Common.API;
using Mall.Common.Enum.Goods;
using Mall.Common.Enum.User;
using Mall.Common.Plugin;
using Mall.Model.Extend.TradePavilion;
using Mall.Module.TradePavilion;
......@@ -59,6 +61,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
private readonly CommerceAskModule askModule = new CommerceAskModule();
/// <summary>
/// 活动评论处理类对象
/// </summary>
private readonly CommerceCommentModule commerceCommentModule = new CommerceCommentModule();
#region 公司信息管理
/// <summary>
/// 新增修改公司信息
/// </summary>
......@@ -114,36 +123,64 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: model);
}
#endregion
#region 新闻管理
/// <summary>
/// 获取商会活动类型列表
/// 获取新闻前几条
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceActivityTypeList()
public ApiResult GetNewsPage()
{
var query = new RB_Commerce_ActivityType_Extend();
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Commerce_News_Extend()
{
Title = parms.GetStringValue("Title")
};
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
var list = activityModule.GetCommerceActivityTypeListModule(query);
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName }));
var list = commerceNewsModule.GetCommerceNewsPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取商会活动分页列表
/// 获取新闻信息详情
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceActivityPage()
public ApiResult GetCommerceNews()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var Id = parms.GetInt("Id", 0);
var extModel = commerceNewsModule.GetCommerceNewsModule(Id);
return ApiResult.Success(data: extModel);
}
#endregion
#region 投资采购管理
/// <summary>
/// 获取投资采购分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetInvestmentProcurementPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Commerce_Activity_Extend()
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_InvestmentProcurement_Extend()
{
ActivityType = jObj.GetInt("ActivityType")
CompanyName = parms.GetStringValue("CompanyName"),
Type = parms.GetInt("Type"),
};
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
query.CreateBy = userInfo.UserId;
var list = procurementModule.GetInvestmentProcurementPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
......@@ -197,88 +234,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取商会活动详情
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceActivity()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var Id = parms.GetInt("Id", 0);
var extModel = activityModule.GetCommerceActivityModule(Id);
var userInfo = AppletUserInfo;
if (extModel != null && extModel.CreateBy>0)
{
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.Name ?? "";
var list=consultModule.GetCommerceConsultListModule(new RB_Commerce_Consult_Extend() { ActivityId = Id, UserId = userInfo.UserId });
if (list != null && list.Count > 0)
{
extModel.IsJoinActivity = 1;
}
else
{
extModel.IsJoinActivity = 0;
}
}
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 获取新闻前几条
/// </summary>
/// <returns></returns>
public ApiResult GetNewsPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Commerce_News_Extend()
{
Title = parms.GetStringValue("Title")
};
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
var list = commerceNewsModule.GetCommerceNewsPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取新闻信息详情
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceNews()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var Id = parms.GetInt("Id", 0);
var extModel = commerceNewsModule.GetCommerceNewsModule(Id);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 获取投资采购分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetInvestmentProcurementPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_InvestmentProcurement_Extend()
{
CompanyName = parms.GetStringValue("CompanyName"),
Type = parms.GetInt("Type"),
};
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
query.CreateBy = userInfo.UserId;
var list = procurementModule.GetInvestmentProcurementPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取投资采购详情
/// </summary>
......@@ -291,6 +246,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: extModel);
}
#endregion
#region Fat咨询管理
/// <summary>
/// 新增修改Fat咨询
/// </summary>
......@@ -345,6 +304,72 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: pageModel);
}
#endregion
#region 活动管理
/// <summary>
/// 获取商会活动类型列表
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceActivityTypeList()
{
var query = new RB_Commerce_ActivityType_Extend();
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
var list = activityModule.GetCommerceActivityTypeListModule(query);
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.CoverImage, qitem.TypeName }));
}
/// <summary>
/// 获取商会活动分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceActivityPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Commerce_Activity_Extend()
{
ActivityType = jObj.GetInt("ActivityType")
};
var userInfo = AppletUserInfo;
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0;
var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取商会活动详情
/// </summary>
/// <returns></returns>
public ApiResult GetCommerceActivity()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var Id = parms.GetInt("Id", 0);
var extModel = activityModule.GetCommerceActivityModule(Id);
var userInfo = AppletUserInfo;
if (extModel != null && extModel.CreateBy > 0)
{
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.Name ?? "";
var list = consultModule.GetCommerceConsultListModule(new RB_Commerce_Consult_Extend() { ActivityId = Id, UserId = userInfo.UserId });
if (list != null && list.Count > 0)
{
extModel.IsJoinActivity = 1;
}
else
{
extModel.IsJoinActivity = 0;
}
}
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 获取当前用户参加的活动
/// </summary>
......@@ -403,5 +428,37 @@ namespace Mall.WebApi.Controllers.TradePavilion
var flag = consultModule.CancelCommerceConsultModule(ActivityId, userInfo.UserId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 新增活动评论
/// </summary>
/// <returns></returns>
public ApiResult AddCommerceComment()
{
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_Commerce_Comment_Extend()
{
Id = jObj.GetInt("Id"),
ActivityId = jObj.GetInt("ActivityId"),
CommentScore=jObj.GetInt("CommentScore"),
CommentGrade=(GoodsCommentTypeEnum)jObj.GetInt("CommentGrade"),
CommentImage=jObj.GetStringValue("CommentImage"),
PlatformSource=(UserSourceEnum)jObj.GetInt("PlatformSource"),
Content=jObj.GetStringValue("Content")
};
var userInfo = AppletUserInfo;
extModel.UserName = userInfo.Name;
extModel.UserPhoto = userInfo.Photo;
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = userInfo?.TenantId ?? 0;
extModel.UserId = userInfo?.UserId ?? 0;
extModel.CreateDate = DateTime.Now;
extModel.UpdateDate = DateTime.Now;
var flag = commerceCommentModule.SetCommerceCommentModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment