Skip to content

M
mall.oytour.com
Commit 4845b3f9 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

parents f4800265 1e2ad7a7
Show whitespace changes
Inline Side-by-side
Showing with 601 additions and 27 deletions
Mall.Model/Extend/Miai/RB_Miai_Message_Extend.cs
View file @ 4845b3f9
......@@ -17,5 +17,41 @@ namespace Mall.Model.Extend.Miai
/// 查询类型 1圈子 2拼拼plus 3访客 4系统消息
/// </summary>
public int SelectType { get; set; }
/// <summary>
/// 访客类型 1谁看过我 2我看过谁
/// </summary>
public int VsisitorType { get; set; }
/// <summary>
/// 回复字段
/// </summary>
public object ReplyContent { get; set; }
/// <summary>
/// 总数量
/// </summary>
public int TCount { get; set; }
/// <summary>
/// 人数
/// </summary>
public int PeopleNum { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 真实名称
/// </summary>
public string RealName { get; set; }
/// <summary>
/// 头像
/// </summary>
public string Photo { get; set; }
/// <summary>
/// 性别
/// </summary>
public int Sex { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs
View file @ 4845b3f9
......@@ -15,6 +15,11 @@ namespace Mall.Model.Extend.TradePavilion
/// </summary>
public string ActivityTypeName { get; set; }
/// <summary>
/// 活动ids
/// </summary>
public string ActivityIds { get; set; }
/// <summary>
/// 开始时间字符串
/// </summary>
......
Mall.Module.Miai/MiaiCommonModule.cs
View file @ 4845b3f9
......@@ -67,6 +67,16 @@ namespace Mall.Module.Miai
return miai_MessageRepository.GetMessageNum(dmodel);
}
/// <summary>
/// 获取最新的一条记录
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public RB_Miai_Message_Extend GetNewMessageInfo(RB_Miai_Message_Extend dmodel)
{
return miai_MessageRepository.GetNewMessageInfo(dmodel);
}
/// <summary>
/// 删除消息
/// </summary>
......@@ -93,10 +103,22 @@ namespace Mall.Module.Miai
/// <param name="type"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
internal bool DelMiaiMessageInfoBatch(int type, AppletUserInfo userInfo)
internal bool DelMiaiMessageInfoBatch(string type, AppletUserInfo userInfo)
{
return miai_MessageRepository.DelMiaiMessageInfoBatch(type, userInfo.UserId);
}
/// <summary>
/// 获取访客统计
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
internal RB_Miai_Message_Extend GetMiaiMessageVisitorStatistics(int userId, int type, int tenantId, int mallBaseId)
{
return miai_MessageRepository.GetMiaiMessageVisitorStatistics(userId, type, tenantId, mallBaseId);
}
#endregion
}
}
Mall.Module.Miai/MiaiModule.cs
View file @ 4845b3f9
......@@ -11,6 +11,8 @@ using VT.FW.DB;
using Mall.Repository.Miai;
using Mall.Model.Extend.Miai;
using Mall.Model.Entity.Education;
using Mall.Repository.TradePavilion;
using Mall.Repository.Education;
namespace Mall.Module.Miai
{
......@@ -44,6 +46,14 @@ namespace Mall.Module.Miai
/// </summary>
private readonly RB_Miai_DatingRepository miai_DatingRepository = new RB_Miai_DatingRepository();
/// <summary>
/// 星球活动
/// </summary>
private readonly RB_Commerce_ActivityRepository commerce_ActivityRepository = new RB_Commerce_ActivityRepository();
/// <summary>
/// 朋友圈动态
/// </summary>
private readonly Rb_Education_DynamicRepository education_DynamicRepository = new Rb_Education_DynamicRepository();
/// <summary>
/// 通用方法
/// </summary>
private readonly MiaiCommonModule miaiCommonModule = new MiaiCommonModule();
......@@ -74,6 +84,139 @@ namespace Mall.Module.Miai
#endregion
#region 消息通知
/// <summary>
/// 获取消息中心
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public object GetMiaiMessageCenter(int userId, int tenantId, int mallBaseId)
{
//获取四种分类数量
int Num1 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 1 });
var message1 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 1 });
int Num2 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 2 });
var message2 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 2 });
int Num3 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 3 });
var message3 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 3 });
int Num4 = miaiCommonModule.GetMessageNum(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 4 });
var message4 = miaiCommonModule.GetNewMessageInfo(new RB_Miai_Message_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, SelectType = 4 });
return new
{
CircleModel = new
{
Num = Num1,
Title = "圈子",
Description = GetMiaiMessageDescription(message1),
Time = message1 != null ? message1.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
},
SystemModel = new
{
Num = Num2,
Title = "系统消息",
Description = GetMiaiMessageDescription(message2),
Time = message2 != null ? message2.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
},
PPPlusModel = new
{
Num = Num3,
Title = "拼拼Plus",
Description = GetMiaiMessageDescription(message3),
Time = message3 != null ? message3.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
},
VisitorModel = new
{
Num = Num4,
Title = "拼拼Plus",
Description = GetMiaiMessageDescription(message4),
Time = message4 != null ? message4.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
}
};
}
/// <summary>
/// 获取访客数据统计
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public object GetMiaiMessageVisitorStatistics(int userId, int type, int tenantId, int mallBaseId)
{
var model = miaiCommonModule.GetMiaiMessageVisitorStatistics(userId, type, tenantId, mallBaseId);
return new
{
model.TCount,
model.PeopleNum
};
}
/// <summary>
/// 获取访客分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Miai_Message_Extend> GetMiaiMessageVisitorPageList(int pageIndex, int pageSize, out long count, RB_Miai_Message_Extend demodel)
{
var list = miaiCommonModule.GetPageList(pageIndex, pageSize, out count, demodel);
if (list.Any())
{
string userIds = "";
if (demodel.VsisitorType == 1)
{
userIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
}
else {
userIds = string.Join(",", list.Select(x => x.UserId).Distinct());
}
var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds });
foreach (var item in list)
{
var bmodel = blist.Where(x => x.UserId == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
item.Name = bmodel?.Name ?? "";
item.RealName = bmodel?.RealName ?? "";
item.Photo = bmodel?.Photo ?? "";
item.Sex = bmodel?.Sex ?? 0;
}
}
return list;
}
/// <summary>
/// 获取消息描述
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public string GetMiaiMessageDescription(RB_Miai_Message_Extend model) {
if (model == null) { return ""; }
switch (model.Type) {
case Common.Enum.MiAi.MessageTypeEnum.CircleLike:
return "有新用户给你点赞";
case Common.Enum.MiAi.MessageTypeEnum.CircleReply:
return "有新消息回复";
case Common.Enum.MiAi.MessageTypeEnum.Look:
return "有新用户查看了你";
case Common.Enum.MiAi.MessageTypeEnum.SpellComment:
return "有新消息评论";
case Common.Enum.MiAi.MessageTypeEnum.SpellReply:
return "有新消息回复";
case Common.Enum.MiAi.MessageTypeEnum.SpellEnroll:
return "有新用户报名";
case Common.Enum.MiAi.MessageTypeEnum.SpellEnrollCancel:
return "有用户取消报名";
case Common.Enum.MiAi.MessageTypeEnum.ViolationNotice:
return "有新违规通知";
case Common.Enum.MiAi.MessageTypeEnum.ActivityCancel:
return "有活动报名被取消";
default:
return "";
}
}
/// <summary>
/// 获取消息通知
......@@ -89,14 +232,78 @@ namespace Mall.Module.Miai
if (list.Any())
{
//每种类型 额外返回数据
#region 拼拼活动
var activityList = list.Where(x => x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnroll || x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnrollCancel
|| x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellComment || x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellReply).ToList();
if (activityList.Any())
{
List<RB_Miai_Activity_Extend> ActivityList = new List<RB_Miai_Activity_Extend>();
if (activityList.Any()) {
string ActivityIds = string.Join(",", activityList.Select(x => x.SourceId).Distinct());
ActivityList = miai_ActivityRepository.GetList(new RB_Miai_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
}
#endregion
#region 星球活动
var commerceList = list.Where(x => x.Type == Common.Enum.MiAi.MessageTypeEnum.ActivityCancel).ToList();
List<Model.Extend.TradePavilion.RB_Commerce_Activity_Extend> CommerceList = new List<Model.Extend.TradePavilion.RB_Commerce_Activity_Extend>();
if (commerceList.Any()) {
string ActivityIds = string.Join(",", commerceList.Select(x => x.SourceId).Distinct());
CommerceList = commerce_ActivityRepository.GetList(new Model.Extend.TradePavilion.RB_Commerce_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
}
#endregion
#region 圈子
var circleList = list.Where(x => x.Type == Common.Enum.MiAi.MessageTypeEnum.CircleLike || x.Type == Common.Enum.MiAi.MessageTypeEnum.CircleReply).ToList();
List<Model.Extend.Education.Rb_Education_Dynamic_Extend> CircleList = new List<Model.Extend.Education.Rb_Education_Dynamic_Extend>();
if (circleList.Any()) {
string CircleIds = string.Join(",", circleList.Select(x => x.SourceId).Distinct());
CircleList = education_DynamicRepository.GetMiAiAllDynamicList(new Model.Extend.Education.Rb_Education_Dynamic_Extend() { TenantId = demodel.TenantId, Ids = CircleIds });
}
#endregion
#region 查询创建人
string UserIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = UserIds });
#endregion
foreach (var item in list) {
if (item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnroll || item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnrollCancel
|| item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellComment || item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellReply) {
item.ReplyContent = ActivityList.Where(x => x.Id == item.SourceId).Select(x => new
{
x.Id,
x.ActivityTitle,
x.Label,
x.UserName,
x.Photo,
x.Sex,
ImageList = !string.IsNullOrEmpty(x.Images) && x.Images != "[]" ? JsonConvert.DeserializeObject<List<string>>(x.Images) : new List<string>()
});
}
if (item.Type == Common.Enum.MiAi.MessageTypeEnum.ActivityCancel)
{
item.ReplyContent = CommerceList.Where(x => x.Id == item.SourceId).Select(x => new
{
x.Id,
x.ActivityName,
x.CoverImg
});
}
if (item.Type == Common.Enum.MiAi.MessageTypeEnum.CircleLike || item.Type == Common.Enum.MiAi.MessageTypeEnum.CircleReply) {
item.ReplyContent = CircleList.Where(x => x.Id == item.SourceId).Select(x => new
{
x.Id,
x.Content,
x.Files,
x.CreateTime,
x.CoverPhoto,
x.FileType,
x.Seconds,
x.CreateByName,
x.CrearteByPhoto
});
}
var alist = miai_ActivityRepository.GetList(new RB_Miai_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
var bmodel = blist.Where(x => x.UserId == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
item.Name = bmodel?.Name ?? "";
item.RealName = bmodel?.RealName ?? "";
item.Photo = bmodel?.Photo ?? "";
item.Sex = bmodel?.Sex ?? 0;
}
}
return list;
......@@ -118,7 +325,7 @@ namespace Mall.Module.Miai
/// <param name="type"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool DelMiaiMessageInfoBatch(int type, AppletUserInfo userInfo)
public bool DelMiaiMessageInfoBatch(string type, AppletUserInfo userInfo)
{
return miaiCommonModule.DelMiaiMessageInfoBatch(type, userInfo);
}
......@@ -653,6 +860,8 @@ namespace Mall.Module.Miai
{
var model = miai_ActivityRepository.GetEntity(demodel.ActivityId);
if (model != null && model.UserId != demodel.UserId)
{
if (demodel.ReplyUserId == 0)
{
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
......@@ -661,7 +870,7 @@ namespace Mall.Module.Miai
Type = Common.Enum.MiAi.MessageTypeEnum.SpellComment,
UserId = model.UserId,
SourceId = demodel.ActivityId,
Content = "用户评论拼拼plus帖子",
Content = demodel.Content,
Status = 0,
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
......@@ -670,6 +879,38 @@ namespace Mall.Module.Miai
UpdateDate = DateTime.Now
});
}
else {
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellReply,
UserId = model.UserId,
SourceId = demodel.ActivityId,
Content = demodel.Content,
Status = 0,
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
CreateBy = demodel.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellReply,
UserId = demodel.ReplyUserId,
SourceId = demodel.ActivityId,
Content = demodel.Content,
Status = 0,
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
CreateBy = demodel.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
}
return flag;
}
......@@ -895,7 +1136,7 @@ namespace Mall.Module.Miai
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellEnroll,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellEnrollCancel,
UserId = amodel.UserId,
SourceId = model.ActivityId,
Content = "用户取消报名拼拼plus",
......
Mall.Module.TradePavilion/CommerceConsultModule.cs
View file @ 4845b3f9
......@@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.Text;
using System.Linq;
using VT.FW.DB;
using Mall.Repository.Miai;
namespace Mall.Module.TradePavilion
{
......@@ -32,6 +33,12 @@ namespace Mall.Module.TradePavilion
/// 用户
/// </summary>
private readonly RB_Member_UserRepository member_UserRepository = new RB_Member_UserRepository();
/// <summary>
/// 相亲消息
/// </summary>
private readonly RB_Miai_MessageRepository miai_MessageRepository = new RB_Miai_MessageRepository();
/// <summary>
/// 获取商会活动报名分页列表
......@@ -185,6 +192,23 @@ namespace Mall.Module.TradePavilion
{nameof(RB_Commerce_Consult_Extend.Status),Status },
};
bool flag = consultRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), Id));
if (flag) {
var model = consultRepository.GetEntity(Id);
miai_MessageRepository.Insert(new Model.Extend.Miai.RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.ActivityCancel,
UserId = 0,
SourceId = model.ActivityId,
Content = "取消用户活动报名",
Status = 0,
TenantId = model.TenantId,
MallBaseId = model.MallBaseId,
CreateBy = 0,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
return flag;
}
......@@ -255,6 +279,22 @@ namespace Mall.Module.TradePavilion
Remarks = "取消活动报名，退回使用点数：" + cmodel.Money,
});
}
if (flag) {
miai_MessageRepository.Insert(new Model.Extend.Miai.RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.ActivityCancel,
UserId = userId,
SourceId = activityId,
Content = "用户取消活动报名",
Status = 0,
TenantId = amodel.TenantId,
MallBaseId = amodel.MallBaseId,
CreateBy = userId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
return flag;
}
......@@ -315,6 +355,22 @@ namespace Mall.Module.TradePavilion
Remarks = "取消活动报名，退回使用点数：" + model.Money,
});
}
if (Status == 1) {
miai_MessageRepository.Insert(new Model.Extend.Miai.RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.ActivityCancel,
UserId = model.UserId,
SourceId = model.ActivityId,
Content = "同意取消活动报名",
Status = 0,
TenantId = model.TenantId,
MallBaseId = model.MallBaseId,
CreateBy = 0,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
return flag;
}
......
Mall.Module.User/UserModule.cs
View file @ 4845b3f9
......@@ -4631,7 +4631,6 @@ namespace Mall.Module.User
//2021-02-25 add by :w
var oldBaseInfo = miai_BaseInfoRepository.GetBaseInfoList(new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend { UserId = umodel.Id, TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId }).FirstOrDefault();
//var oldFollowList = miai_FollowMemberRepository.GetFollowMemberList(new Model.Extend.Miai.RB_MiAi_FollowMember_Extend { Status =0, UserId = umodel.Id, MallBaseId = umodel.MallBaseId, TenantId = umodel.TenantId });//我的粉丝
var myFollowList = miai_FollowMemberRepository.GetFollowMemberList(new Model.Extend.Miai.RB_MiAi_FollowMember_Extend { Status = 0, CreateBy = umodel.Id, MallBaseId = umodel.MallBaseId, TenantId = umodel.TenantId });//我的关注
......
Mall.Repository/Miai/RB_Miai_MessageRepository.cs
View file @ 4845b3f9
......@@ -39,6 +39,10 @@ namespace Mall.Repository.Miai
{
where += $@" and {nameof(RB_Miai_Message_Extend.UserId)} ={dmodel.UserId}";
}
if (dmodel.CreateBy > 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.CreateBy)} ={dmodel.CreateBy}";
}
if (dmodel.Type > 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.Type)} ={(int)dmodel.Type}";
......@@ -105,15 +109,41 @@ namespace Mall.Repository.Miai
/// <param name="type"></param>
/// <param name="userId"></param>
/// <returns></returns>
public bool DelMiaiMessageInfoBatch(int type, int userId)
public bool DelMiaiMessageInfoBatch(string type, int userId)
{
string sql = $@"update RB_Miai_Message set Status =1 where UserId ={userId}";
if (type > 0) {
sql += $@" and Type ={type}";
if (!string.IsNullOrEmpty(type)) {
sql += $@" and Type in({type})";
}
return Execute(sql) > 0;
}
/// <summary>
/// 获取访客统计
/// </summary>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public RB_Miai_Message_Extend GetMiaiMessageVisitorStatistics(int userId, int type, int tenantId, int mallBaseId)
{
if (type == 1)
{
//谁看过我的
string sql = $@" SELECT
(SELECT COUNT(0) FROM rb_miai_message WHERE `Status` =0 and UserId = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59') AS TCount,
(SELECT COUNT(CreateBy) FROM rb_miai_message WHERE `Status` =0 and UserId = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' GROUP BY CreateBy) AS PeopleNum ";
return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
}
else {
//我看过谁的
string sql = $@" SELECT
(SELECT COUNT(0) FROM rb_miai_message WHERE `Status` =0 and CreateBy = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59') AS TCount,
(SELECT COUNT(UserId) FROM rb_miai_message WHERE `Status` =0 and CreateBy = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' GROUP BY UserId) AS PeopleNum ";
return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
}
}
/// <summary>
/// 获取消息数量
/// </summary>
......@@ -165,5 +195,55 @@ namespace Mall.Repository.Miai
var obj = ExecuteScalar(sql);
return obj == null ? 0 : Convert.ToInt32(obj);
}
/// <summary>
/// 获取最新的一条记录
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public RB_Miai_Message_Extend GetNewMessageInfo(RB_Miai_Message_Extend dmodel) {
string where = $" 1=1 ";
if (dmodel.Status >= 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.Status)}={dmodel.Status}";
}
if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.UserId > 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.UserId)} ={dmodel.UserId}";
}
if (dmodel.Type > 0)
{
where += $@" and {nameof(RB_Miai_Message_Extend.Type)} ={(int)dmodel.Type}";
}
if (dmodel.SelectType > 0)
{
switch (dmodel.SelectType)
{
case 1:
where += $@" and Type in (1,2)";
break;
case 2:
where += $@" and Type in (3,4,5,6)";
break;
case 3:
where += $@" and Type in (7)";
break;
case 4:
where += $@" and Type in (8,9)";
break;
}
}
string sql = $@"select * from RB_Miai_Message where {where} order by Id desc limit 1";
return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
}
}
}
Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs
View file @ 4845b3f9
......@@ -114,5 +114,44 @@ WHERE 1=1
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Commerce_Activity_Extend.Id));
return GetPage<RB_Commerce_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Commerce_Activity_Extend> GetList(RB_Commerce_Activity_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.* FROM rb_commerce_activity AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Commerce_Activity_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
}
if (query.ActivityType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.ActivityType), query.ActivityType);
}
if (!string.IsNullOrEmpty(query.ActivityIds))
{
builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Commerce_Activity_Extend.Id), query.ActivityIds);
}
}
return Get<RB_Commerce_Activity_Extend>(builder.ToString()).ToList();
}
}
}
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 4845b3f9
......@@ -194,6 +194,20 @@ namespace Mall.WebApi.Controllers.MallBase
programMsgModule.UpdateUserBlacklist(userInfo.TenantId, userInfo.MallBaseId, userInfo.UserId);
}
programMsgModule.SetEducationViolationLog(new RB_Education_ViolationLog { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId, ViolationType = 3, CreateDate = System.DateTime.Now });
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.ViolationNotice,
UserId = userInfo.UserId,
SourceId = 0,
Content = "拼拼Plus发帖内容存在违规，若多次发布违规内容将被拉黑",
Status = 0,
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
CreateBy = userInfo.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
return ApiResult.Failed("评论存在违规内容，若多次发布违规内容将被拉黑");
}
}
......@@ -381,6 +395,20 @@ namespace Mall.WebApi.Controllers.MallBase
programMsgModule.UpdateUserBlacklist(userInfo.TenantId, userInfo.MallBaseId, userInfo.UserId);
}
programMsgModule.SetEducationViolationLog(new RB_Education_ViolationLog { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId, ViolationType = 3, CreateDate = System.DateTime.Now });
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.ViolationNotice,
UserId = userInfo.UserId,
SourceId = 0,
Content = "拼拼Puls评论内容存在违规，若多次发布违规内容将被拉黑",
Status = 0,
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
CreateBy = userInfo.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
return ApiResult.Failed("评论存在违规内容，若多次发布违规内容将被拉黑");
}
}
......@@ -612,7 +640,74 @@ namespace Mall.WebApi.Controllers.MallBase
TypeName = x.Type.GetEnumName(),
x.SourceId,
x.Content,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
x.Name,
x.RealName,
x.Photo,
x.Sex,
x.ReplyContent,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm")
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取消息中心
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiaiMessageCenter()
{
var userInfo = AppletUserInfo;
var list = miaiModule.GetMiaiMessageCenter(userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
return ApiResult.Success("", list);
}
/// <summary>
/// 获取访客统计
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiaiMessageVisitorStatistics() {
var userInfo = AppletUserInfo;
var parms = JObject.Parse(RequestParm.msg.ToString());
int Type = parms.GetInt("Type", 1);// 类型 1谁看过我 2我看过谁
var list = miaiModule.GetMiaiMessageVisitorStatistics(userInfo.UserId, Type, userInfo.TenantId, userInfo.MallBaseId);
return ApiResult.Success("", list);
}
/// <summary>
/// 获取访客分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiaiMessageVisitorPageList() {
var parms = RequestParm;
var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Miai_Message_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Message_Extend>(parms.msg.ToString());
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.SelectType = 3;
if (demodel.VsisitorType == 1)
{
demodel.UserId = userInfo.UserId;
}
else {
demodel.CreateBy = userInfo.UserId;
}
var list = miaiModule.GetMiaiMessageVisitorPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.Id,
UserId = demodel.VsisitorType == 1 ? x.CreateBy : x.UserId,
UserName = x.Name,
x.RealName,
x.Photo,
x.Sex,
x.Status,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm")
});
return ApiResult.Success("", pagelist);
}
......@@ -643,7 +738,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(RequestParm.msg.ToString());
int Type = parms.GetInt("Type", 0);// 0表示 清除所有的
string Type = parms.GetStringValue("TypeIds");// 0表示 清除所有的
if (string.IsNullOrEmpty(Type)) { return ApiResult.ParamIsNull(); }
bool flag = miaiModule.DelMiaiMessageInfoBatch(Type, userInfo);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
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