Skip to content

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

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

parents 705696ea 48fac8a6
Hide whitespace changes
Inline Side-by-side
Showing with 680 additions and 19 deletions
Mall.Common/Enum/MiAi/MessageTypeEnum.cs 0 → 100644
View file @ 521f2804
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Plugin;
namespace Mall.Common.Enum.MiAi
{
public enum MessageTypeEnum
{
/// <summary>
/// 圈子点赞
/// </summary>
[EnumField("圈子点赞")]
CircleLike = 1,
/// <summary>
/// 圈子评论
/// </summary>
[EnumField("圈子评论")]
CircleComment = 2,
/// <summary>
/// 圈子回复
/// </summary>
[EnumField("圈子回复")]
CircleReply = 3,
/// <summary>
/// 拼拼报名
/// </summary>
[EnumField("拼拼报名")]
SpellEnroll = 4,
/// <summary>
/// 拼拼取消报名
/// </summary>
[EnumField("拼拼取消报名")]
SpellEnrollCancel = 5,
/// <summary>
/// 拼拼评论
/// </summary>
[EnumField("拼拼评论")]
SpellComment = 6,
/// <summary>
/// 谁查看了我
/// </summary>
[EnumField("谁查看了我")]
Look = 7,
}
}
Mall.Model/Entity/Miai/RB_Miai_Activity.cs
View file @ 521f2804
...@@ -98,5 +98,40 @@ namespace Mall.Model.Entity.Miai ...@@ -98,5 +98,40 @@ namespace Mall.Model.Entity.Miai
get; get;
set; set;
} }
/// <summary>
/// 标签
/// </summary>
public string Label { get; set; }
/// <summary>
/// 活动开始时间
/// </summary>
public DateTime StartTime { get; set; }
/// <summary>
/// 活动结束时间
/// </summary>
public DateTime EndTime { get; set; }
/// <summary>
/// 男数量
/// </summary>
public int ManNum { get; set; }
/// <summary>
/// 女数量
/// </summary>
public int WoManNum { get; set; }
/// <summary>
/// 经纬度（逗号分隔）
/// </summary>
public string LonLat { get; set; }
/// <summary>
/// 位置名称
/// </summary>
public string LocationName { get; set; }
} }
} }
Mall.Model/Entity/Miai/RB_Miai_ActivityEnroll.cs
View file @ 521f2804
...@@ -89,5 +89,10 @@ namespace Mall.Model.Entity.Miai ...@@ -89,5 +89,10 @@ namespace Mall.Model.Entity.Miai
/// 备注 /// 备注
/// </summary> /// </summary>
public string Remark { get; set; } public string Remark { get; set; }
/// <summary>
/// 性别 1男 2女
/// </summary>
public int Sex { get; set; }
} }
} }
Mall.Model/Entity/Miai/RB_Miai_Message.cs 0 → 100644
View file @ 521f2804
using VT.FW.DB;
using Mall.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Enum.MiAi;
namespace Mall.Model.Entity.Miai
{
/// <summary>
/// 相亲消息表实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Miai_Message
{
/// <summary>
/// Id
/// </summary>
public int Id
{
get;
set;
}
/// <summary>
/// 来源id
/// </summary>
public int SourceId
{
get;
set;
}
/// <summary>
/// 接收用户id
/// </summary>
public int UserId
{
get;
set;
}
/// <summary>
/// 类型 枚举
/// </summary>
public MessageTypeEnum Type
{
get;
set;
}
/// <summary>
/// 操作内容
/// </summary>
public string Content
{
get;
set;
}
/// <summary>
/// 删除状态
/// </summary>
public int Status { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { 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/Miai/RB_Miai_ActivityEnroll_Extend.cs
View file @ 521f2804
...@@ -23,11 +23,6 @@ namespace Mall.Model.Extend.Miai ...@@ -23,11 +23,6 @@ namespace Mall.Model.Extend.Miai
/// </summary> /// </summary>
public string Photo { get; set; } public string Photo { get; set; }
/// <summary>
/// 性别 1男 2女
/// </summary>
public int Sex { get; set; }
/// <summary> /// <summary>
/// 是否关注 1是 2否 /// 是否关注 1是 2否
/// </summary> /// </summary>
......
Mall.Model/Extend/Miai/RB_Miai_Message_Extend.cs 0 → 100644
View file @ 521f2804
using VT.FW.DB;
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Miai;
namespace Mall.Model.Extend.Miai
{
/// <summary>
/// 相亲消息扩展实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Miai_Message_Extend : RB_Miai_Message
{
}
}
Mall.Module.Miai/MiaiCommonModule.cs 0 → 100644
View file @ 521f2804
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Common;
using Mall.Common.Plugin;
using Newtonsoft.Json;
using Mall.Common.API;
using Newtonsoft.Json.Linq;
using VT.FW.DB;
using Mall.Repository.Miai;
using Mall.Model.Extend.Miai;
namespace Mall.Module.Miai
{
/// <summary>
/// 相亲处理层
/// </summary>
public class MiaiCommonModule
{
/// <summary>
/// 消息
/// </summary>
private readonly RB_Miai_MessageRepository miai_MessageRepository = new RB_Miai_MessageRepository();
#region 消息通知
/// <summary>
/// 获取分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Miai_Message_Extend> GetPageList(int pageIndex, int pageSize, out long count, RB_Miai_Message_Extend dmodel)
{
return miai_MessageRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Miai_Message_Extend> GetList(RB_Miai_Message_Extend dmodel) {
return miai_MessageRepository.GetList(dmodel);
}
/// <summary>
/// 新增消息
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public bool SetMessage(RB_Miai_Message_Extend dmodel)
{
return miai_MessageRepository.Insert(dmodel) > 0;
}
/// <summary>
/// 获取消息数量
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public int GetMessageNum(RB_Miai_Message_Extend dmodel)
{
return miai_MessageRepository.GetMessageNum(dmodel);
}
/// <summary>
/// 删除消息
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool DelMessage(int Id) {
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Miai_Message_Extend.Status),1},
{ nameof(RB_Miai_Message_Extend.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Miai_Message_Extend.Id),
FiledValue=Id,
OperatorEnum=OperatorEnum.Equal
}
};
return miai_MessageRepository.Update(keyValues, wheres);
}
/// <summary>
/// 批量清除
/// </summary>
/// <param name="type"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
internal bool DelMiaiMessageInfoBatch(int type, AppletUserInfo userInfo)
{
return miai_MessageRepository.DelMiaiMessageInfoBatch(type, userInfo.UserId);
}
#endregion
}
}
Mall.Module.Miai/MiaiModule.cs
View file @ 521f2804
...@@ -24,6 +24,10 @@ namespace Mall.Module.Miai ...@@ -24,6 +24,10 @@ namespace Mall.Module.Miai
private readonly RB_Miai_ActivityEnrollRepository miai_ActivityEnrollRepository = new RB_Miai_ActivityEnrollRepository(); private readonly RB_Miai_ActivityEnrollRepository miai_ActivityEnrollRepository = new RB_Miai_ActivityEnrollRepository();
private readonly RB_Miai_ActivityDiscussRepository miai_ActivityDiscussRepository = new RB_Miai_ActivityDiscussRepository(); private readonly RB_Miai_ActivityDiscussRepository miai_ActivityDiscussRepository = new RB_Miai_ActivityDiscussRepository();
private readonly RB_Miai_LogRepository miai_LogRepository = new RB_Miai_LogRepository(); private readonly RB_Miai_LogRepository miai_LogRepository = new RB_Miai_LogRepository();
/// <summary>
/// 通用方法
/// </summary>
private readonly MiaiCommonModule miaiCommonModule = new MiaiCommonModule();
private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository(); private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository();
...@@ -48,6 +52,42 @@ namespace Mall.Module.Miai ...@@ -48,6 +52,42 @@ namespace Mall.Module.Miai
} }
#endregion #endregion
#region 消息通知
/// <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> GetMiaiMessagePageList(int pageIndex, int pageSize, out long count, RB_Miai_Message_Extend demodel)
{
return miaiCommonModule.GetPageList(pageIndex, pageSize, out count, demodel);
}
/// <summary>
/// 删除消息
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool DelMiaiMessageInfo(int Id) {
return miaiCommonModule.DelMessage(Id);
}
/// <summary>
/// 批量清除消息
/// </summary>
/// <param name="type"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool DelMiaiMessageInfoBatch(int type, AppletUserInfo userInfo)
{
return miaiCommonModule.DelMiaiMessageInfoBatch(type, userInfo);
}
#endregion
#region 活动版块 #region 活动版块
/// <summary> /// <summary>
...@@ -199,7 +239,9 @@ namespace Mall.Module.Miai ...@@ -199,7 +239,9 @@ namespace Mall.Module.Miai
var model = miai_ActivityRepository.GetEntity(activityId); var model = miai_ActivityRepository.GetEntity(activityId);
if (model == null) { return ""; } if (model == null) { return ""; }
//获取活动报名人数 //获取活动报名人数
int PeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId); int ManENum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId, 1);
int WoManENum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId, 1);
int PeopleNum = ManENum + WoManENum;
//获取当前用户是否已报名 //获取当前用户是否已报名
bool IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any(); bool IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
//查询活动回复数量 //查询活动回复数量
...@@ -224,6 +266,15 @@ namespace Mall.Module.Miai ...@@ -224,6 +266,15 @@ namespace Mall.Module.Miai
umodel.Photo, umodel.Photo,
Sex, Sex,
model.IsOpenEnroll, model.IsOpenEnroll,
model.Label,
StartTime = model.StartTime.ToString("yyyy-MM-dd HH:mm"),
EndTime = model.EndTime.ToString("yyyy-MM-dd HH:mm"),
model.ManNum,
ManENum,
model.WoManNum,
WoManENum,
model.LonLat,
model.LocationName,
Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "", Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"), CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
PeopleNum, PeopleNum,
...@@ -259,6 +310,13 @@ namespace Mall.Module.Miai ...@@ -259,6 +310,13 @@ namespace Mall.Module.Miai
UserName = umodel.Name, UserName = umodel.Name,
umodel.Photo, umodel.Photo,
model.IsOpenEnroll, model.IsOpenEnroll,
model.Label,
StartTime = model.StartTime.ToString("yyyy-MM-dd HH:mm"),
EndTime = model.EndTime.ToString("yyyy-MM-dd HH:mm"),
model.ManNum,
model.WoManNum,
model.LonLat,
model.LocationName,
Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "", Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"), CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
PeopleNum, PeopleNum,
...@@ -271,19 +329,31 @@ namespace Mall.Module.Miai ...@@ -271,19 +329,31 @@ namespace Mall.Module.Miai
/// </summary> /// </summary>
/// <param name="demodel"></param> /// <param name="demodel"></param>
/// <returns></returns> /// <returns></returns>
public bool SetActivityInfo(RB_Miai_Activity_Extend demodel) public bool SetActivityInfo(RB_Miai_Activity_Extend demodel, out string msg)
{ {
msg = "";
if (demodel.Id > 0) if (demodel.Id > 0)
{ {
var model = miai_ActivityRepository.GetEntity(demodel.Id); var model = miai_ActivityRepository.GetEntity(demodel.Id);
if (model == null || model.Status == 1) { return false; } if (model == null || model.Status == 1) { msg = "活动不存在"; return false; }
if (model.UserId != demodel.UserId) { return false; } if (model.UserId != demodel.UserId) { msg = "无法修改活动"; return false; }
int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 1);
int WoManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 2);
if (demodel.ManNum < ManPeopleNum) { msg = "男已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
if (demodel.WoManNum < WoManPeopleNum) { msg = "女已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Miai_Activity_Extend.ActivityTitle),demodel.ActivityTitle}, { nameof(RB_Miai_Activity_Extend.ActivityTitle),demodel.ActivityTitle},
{ nameof(RB_Miai_Activity_Extend.Content),demodel.Content}, { nameof(RB_Miai_Activity_Extend.Content),demodel.Content},
{ nameof(RB_Miai_Activity_Extend.Images),demodel.Images}, { nameof(RB_Miai_Activity_Extend.Images),demodel.Images},
{ nameof(RB_Miai_Activity_Extend.IsOpenEnroll),demodel.IsOpenEnroll}, { nameof(RB_Miai_Activity_Extend.IsOpenEnroll),demodel.IsOpenEnroll},
{ nameof(RB_Miai_Activity_Extend.Deadline),demodel.Deadline}, { nameof(RB_Miai_Activity_Extend.Deadline),demodel.Deadline},
{ nameof(RB_Miai_Activity_Extend.Label),demodel.Label},
{ nameof(RB_Miai_Activity_Extend.StartTime),demodel.StartTime},
{ nameof(RB_Miai_Activity_Extend.EndTime),demodel.EndTime},
{ nameof(RB_Miai_Activity_Extend.ManNum),demodel.ManNum},
{ nameof(RB_Miai_Activity_Extend.WoManNum),demodel.WoManNum},
{ nameof(RB_Miai_Activity_Extend.LonLat),demodel.LonLat},
{ nameof(RB_Miai_Activity_Extend.LocationName),demodel.LocationName},
{ nameof(RB_Miai_Activity_Extend.UpdateDate),demodel.UpdateDate} { nameof(RB_Miai_Activity_Extend.UpdateDate),demodel.UpdateDate}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
...@@ -471,7 +541,29 @@ namespace Mall.Module.Miai ...@@ -471,7 +541,29 @@ namespace Mall.Module.Miai
} }
else else
{ {
return miai_ActivityDiscussRepository.Insert(demodel) > 0; bool flag = miai_ActivityDiscussRepository.Insert(demodel) > 0;
if (flag) {
var model = miai_ActivityRepository.GetEntity(demodel.ActivityId);
if (model != null && model.UserId != demodel.UserId)
{
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellComment,
UserId = model.UserId,
SourceId = demodel.ActivityId,
Content = "用户评论拼拼plus帖子",
Status = 0,
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
CreateBy = demodel.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
return flag;
} }
} }
...@@ -615,7 +707,42 @@ namespace Mall.Module.Miai ...@@ -615,7 +707,42 @@ namespace Mall.Module.Miai
{ {
return "已过了报名时间，无法报名"; return "已过了报名时间，无法报名";
} }
var bmodel = miai_BaseInfoRepository.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserId = demodel.UserId }).FirstOrDefault();
if (bmodel == null) { return "资料未认证，无法报名"; }
if (bmodel.Sex == 1)
{
int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 1);
if (model.ManNum <= ManPeopleNum) { return "已报满，无法报名"; }
}
else if (bmodel.Sex == 2)
{
int WoManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 2);
if (model.WoManNum <= WoManPeopleNum) { return "已报满，无法报名"; }
}
else {
return "性别未维护，无法报名";
}
bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0; bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
if (flag) {
if (model.UserId != demodel.UserId)
{
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellEnroll,
UserId = model.UserId,
SourceId = demodel.ActivityId,
Content = "新用户报名拼拼plus",
Status = 0,
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
CreateBy = demodel.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
return flag ? "" : "出错了，请联系管理员"; return flag ? "" : "出错了，请联系管理员";
} }
...@@ -650,6 +777,26 @@ namespace Mall.Module.Miai ...@@ -650,6 +777,26 @@ namespace Mall.Module.Miai
}; };
bool flag = miai_ActivityEnrollRepository.Update(keyValues, wheres); bool flag = miai_ActivityEnrollRepository.Update(keyValues, wheres);
if (flag) {
if (amodel.UserId != model.UserId)
{
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.SpellEnroll,
UserId = amodel.UserId,
SourceId = model.ActivityId,
Content = "用户取消报名拼拼plus",
Status = 0,
TenantId = model.TenantId,
MallBaseId = model.MallBaseId,
CreateBy = model.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
return flag ? "" : "出错了，请联系管理员"; return flag ? "" : "出错了，请联系管理员";
} }
...@@ -798,7 +945,7 @@ namespace Mall.Module.Miai ...@@ -798,7 +945,7 @@ namespace Mall.Module.Miai
} }
#endregion #endregion
#region 我的粉丝/我的关注 #region 我的粉丝/我的关注
/// <summary> /// <summary>
/// 新增/修改我关注的会员配置 /// 新增/修改我关注的会员配置
/// </summary> /// </summary>
......
Mall.Module.User/UserModule.cs
View file @ 521f2804
...@@ -197,7 +197,10 @@ namespace Mall.Module.User ...@@ -197,7 +197,10 @@ namespace Mall.Module.User
/// 教师仓储 /// 教师仓储
/// </summary> /// </summary>
private readonly Repository.Education.RB_Education_TeacherRepository educationTeacherRepository = new Repository.Education.RB_Education_TeacherRepository(); private readonly Repository.Education.RB_Education_TeacherRepository educationTeacherRepository = new Repository.Education.RB_Education_TeacherRepository();
/// <summary>
/// 消息
/// </summary>
private readonly RB_Miai_MessageRepository miai_MessageRepository = new RB_Miai_MessageRepository();
private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository(); private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository();
...@@ -4632,7 +4635,8 @@ namespace Mall.Module.User ...@@ -4632,7 +4635,8 @@ namespace Mall.Module.User
//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 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 });//我的关注 var myFollowList = miai_FollowMemberRepository.GetFollowMemberList(new Model.Extend.Miai.RB_MiAi_FollowMember_Extend { Status = 0, CreateBy = umodel.Id, MallBaseId = umodel.MallBaseId, TenantId = umodel.TenantId });//我的关注
//消息数量
int MessageNum = miai_MessageRepository.GetMessageNum(new Model.Extend.Miai.RB_Miai_Message_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UserId = umodel.Id });
objData = new objData = new
{ {
...@@ -4690,7 +4694,7 @@ namespace Mall.Module.User ...@@ -4690,7 +4694,7 @@ namespace Mall.Module.User
Sex = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.Sex : 0,//0-未认证，1-男-2女 Sex = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.Sex : 0,//0-未认证，1-男-2女
myFollowNum = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.FollowNum : 0,//关注我的 myFollowNum = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.FollowNum : 0,//关注我的
followNum = (myFollowList != null && myFollowList.Any()) ? myFollowList.Count : 0,//我的关注 followNum = (myFollowList != null && myFollowList.Any()) ? myFollowList.Count : 0,//我的关注
messageNum = MessageNum
}; };
} }
return objData; return objData;
......
Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs
View file @ 521f2804
...@@ -42,9 +42,8 @@ namespace Mall.Repository.Miai ...@@ -42,9 +42,8 @@ namespace Mall.Repository.Miai
{ {
where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.Id)} ={dmodel.Id}"; where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.Id)} ={dmodel.Id}";
} }
string sql = $@"select e.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_ActivityEnroll e string sql = $@"select e.*,u.Name as UserName,u.Photo from RB_Miai_ActivityEnroll e
left join rb_member_user u on e.UserId = u.Id left join rb_member_user u on e.UserId = u.Id
left join rb_miai_baseinfo b on e.UserId =b.UserId
where {where} order by e.Id desc"; where {where} order by e.Id desc";
return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out rowCount, sql).ToList(); return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
} }
...@@ -82,9 +81,12 @@ where {where} order by e.Id desc"; ...@@ -82,9 +81,12 @@ where {where} order by e.Id desc";
/// </summary> /// </summary>
/// <param name="activityId"></param> /// <param name="activityId"></param>
/// <returns></returns> /// <returns></returns>
public int GetActivityEnrollNum(int activityId) public int GetActivityEnrollNum(int activityId, int sex =0)
{ {
string sql = $@" select count(0) from RB_Miai_ActivityEnroll where Status =0 and ActivityId ={activityId}"; string sql = $@" select count(0) from RB_Miai_ActivityEnroll where Status =0 and ActivityId ={activityId}";
if (sex > 0) {
sql += $@" and Sex ={sex}";
}
var obj = ExecuteScalar(sql); var obj = ExecuteScalar(sql);
return obj == null ? 0 : Convert.ToInt32(obj); return obj == null ? 0 : Convert.ToInt32(obj);
} }
......
Mall.Repository/Miai/RB_Miai_MessageRepository.cs 0 → 100644
View file @ 521f2804
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Miai;
using Mall.Model.Extend.Miai;
using System.Linq;
namespace Mall.Repository.Miai
{
/// <summary>
/// 相亲消息仓储层
/// </summary>
public class RB_Miai_MessageRepository : BaseRepository<RB_Miai_Message>
{
/// <summary>
/// 分页列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="dmodel">查询条件</param>
/// <returns></returns>
public List<RB_Miai_Message_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, 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}";
}
string sql = $@"select * from RB_Miai_Message where {where} order by Id desc";
return GetPage<RB_Miai_Message_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Miai_Message_Extend> GetList(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}";
}
string sql = $@"select * from RB_Miai_Message where {where} order by Id desc";
return Get<RB_Miai_Message_Extend>(sql).ToList();
}
/// <summary>
/// 批量清除
/// </summary>
/// <param name="type"></param>
/// <param name="userId"></param>
/// <returns></returns>
public bool DelMiaiMessageInfoBatch(int type, int userId)
{
string sql = $@"update RB_Miai_Message set Status =1 where UserId ={userId}";
if (type > 0) {
sql += $@" and Type ={type}";
}
return Execute(sql) > 0;
}
/// <summary>
/// 获取消息数量
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public int GetMessageNum(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}";
}
string sql = $@"select count(0) from RB_Miai_Message where {where} ";
var obj = ExecuteScalar(sql);
return obj == null ? 0 : Convert.ToInt32(obj);
}
}
}
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 521f2804
...@@ -91,6 +91,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -91,6 +91,13 @@ namespace Mall.WebApi.Controllers.MallBase
x.ReplyNum, x.ReplyNum,
x.EnrollNum, x.EnrollNum,
x.IsOpenEnroll, x.IsOpenEnroll,
x.Label,
StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm"),
EndTime = x.EndTime.ToString("yyyy-MM-dd HH:mm"),
x.ManNum,
x.WoManNum,
x.LonLat,
x.LocationName,
x.ForumId, x.ForumId,
x.ForumName, x.ForumName,
x.ForumIcon, x.ForumIcon,
...@@ -200,14 +207,14 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -200,14 +207,14 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
demodel.CreateDate = DateTime.Now; demodel.CreateDate = DateTime.Now;
demodel.UpdateDate = DateTime.Now; demodel.UpdateDate = DateTime.Now;
bool flag = miaiModule.SetActivityInfo(demodel); bool flag = miaiModule.SetActivityInfo(demodel, out string msg);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else else
{ {
return ApiResult.Failed(); return ApiResult.Failed(msg);
} }
} }
...@@ -575,6 +582,63 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -575,6 +582,63 @@ namespace Mall.WebApi.Controllers.MallBase
#endregion #endregion
#region 通知消息
/// <summary>
/// 获取消息分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMiaiMessagePageList()
{
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.UserId = userInfo.UserId;
var list = miaiModule.GetMiaiMessagePageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.Id,
x.Type,
TypeName = x.Type.GetEnumName(),
x.SourceId,
x.Content,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 删除单条消息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelMiaiMessageInfo() {
JObject parms = JObject.Parse(RequestParm.msg.ToString());
int MessageId = parms.GetInt("MessageId", 0);
if (MessageId <= 0) {
return ApiResult.Failed();
}
bool flag = miaiModule.DelMiaiMessageInfo(MessageId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
[HttpPost]
public ApiResult DelMiaiMessageInfoBatch()
{
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(RequestParm.msg.ToString());
int Type = parms.GetInt("Type", 0);// 0表示 清除所有的
bool flag = miaiModule.DelMiaiMessageInfoBatch(Type, userInfo);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
#region 基础信息 #region 基础信息
/// <summary> /// <summary>
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 521f2804
...@@ -141,6 +141,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -141,6 +141,13 @@ namespace Mall.WebApi.Controllers.MallBase
x.ReplyNum, x.ReplyNum,
x.EnrollNum, x.EnrollNum,
x.IsOpenEnroll, x.IsOpenEnroll,
x.Label,
StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm"),
EndTime = x.EndTime.ToString("yyyy-MM-dd HH:mm"),
x.ManNum,
x.WoManNum,
x.LonLat,
x.LocationName,
Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "", Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss") CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
}); });
...@@ -320,6 +327,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -320,6 +327,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.Mobile, x.Mobile,
x.PeopleNum, x.PeopleNum,
x.Remark, x.Remark,
x.Sex,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss") CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
......
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