Skip to content

M
mall.oytour.com
Commit 5a0e5d3f authored by liudong1993's avatar liudong1993
Browse files
Options

报名调整

parent ff2159db
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 15 deletions
Mall.Model/Entity/Miai/RB_Miai_ActivityEnroll.cs
View file @ 5a0e5d3f
......@@ -69,5 +69,25 @@ namespace Mall.Model.Entity.Miai
get;
set;
}
/// <summary>
/// 姓名
/// </summary>
public string Name { get; set; }
/// <summary>
/// 手机号码
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 报名人数
/// </summary>
public int PeopleNum { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}
Mall.Model/Extend/Miai/RB_Miai_ActivityDiscuss_Extend.cs
View file @ 5a0e5d3f
......@@ -28,6 +28,11 @@ namespace Mall.Model.Extend.Miai
/// </summary>
public string Photo { get; set; }
/// <summary>
/// 性别 1男 2女
/// </summary>
public int Sex { get; set; }
/// <summary>
/// 回复某人
/// </summary>
......
Mall.Model/Extend/Miai/RB_Miai_ActivityEnroll_Extend.cs
View file @ 5a0e5d3f
......@@ -23,9 +23,24 @@ namespace Mall.Model.Extend.Miai
/// </summary>
public string Photo { get; set; }
/// <summary>
/// 性别 1男 2女
/// </summary>
public int Sex { get; set; }
/// <summary>
/// 是否关注 1是 2否
/// </summary>
public int IsFocus { get; set; }
/// <summary>
/// 数量
/// </summary>
public int Number { get; set; }
/// <summary>
/// 活动
/// </summary>
public RB_Miai_Activity_Extend ActivityModel { get; set; }
}
}
Mall.Model/Extend/Miai/RB_Miai_Activity_Extend.cs
View file @ 5a0e5d3f
......@@ -23,6 +23,11 @@ namespace Mall.Model.Extend.Miai
/// </summary>
public string Photo { get; set; }
/// <summary>
/// 性别 1男 2女
/// </summary>
public int Sex { get; set; }
/// <summary>
/// 图片列表
/// </summary>
......@@ -37,5 +42,10 @@ namespace Mall.Model.Extend.Miai
/// 报名数量
/// </summary>
public int EnrollNum { get; set; }
/// <summary>
/// 活动ids
/// </summary>
public string ActivityIds { get; set; }
}
}
Mall.Module.Miai/MiaiModule.cs
View file @ 5a0e5d3f
......@@ -179,6 +179,10 @@ namespace Mall.Module.Miai
//查询活动回复数量
var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(activityId.ToString());
var umodel = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(model.UserId);
//查询用户性别
int Sex = miai_BaseInfoRepository.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = userInfo.TenantId, UserId = model.UserId }).FirstOrDefault()?.Sex ?? 0;
//查询当前用户是否已关注
bool IsFocus = miai_FollowMemberRepository.GetFollowMemberList(new RB_MiAi_FollowMember_Extend() { TenantId = userInfo.TenantId, UserId = model.UserId, CreateBy = userInfo.UserId }).Any();
return new
{
model.Id,
......@@ -188,10 +192,12 @@ namespace Mall.Module.Miai
model.UserId,
UserName = umodel.Name,
umodel.Photo,
Sex,
Deadline = model.Deadline.ToString("yyyy-MM-dd"),
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
PeopleNum,
IsEnroll,
IsFocus,
ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0
};
}
......@@ -372,7 +378,7 @@ namespace Mall.Module.Miai
}
}
return list;
}
}
/// <summary>
/// 获取评论回复分页列表
......@@ -515,7 +521,29 @@ namespace Mall.Module.Miai
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Miai_ActivityEnroll_Extend> GetActivityEnrollPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend demodel)
public List<RB_Miai_ActivityEnroll_Extend> GetActivityEnrollPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend demodel, AppletUserInfo userInfo)
{
var list = miai_ActivityEnrollRepository.GetPageList(pageIndex, pageSize, out count, demodel);
if (list.Any()) {
string UserIds = string.Join(",", list.Select(x => x.UserId).Distinct());
//查询当前用户是否已关注
var flist = miai_FollowMemberRepository.GetFollowMemberList(new RB_MiAi_FollowMember_Extend() { TenantId = userInfo.TenantId, UserIds= UserIds, CreateBy = userInfo.UserId });
foreach (var item in list) {
item.IsFocus = flist.Where(x => x.UserId == item.UserId).Any() ? 1 : 2;
}
}
return list;
}
/// <summary>
/// 获取报名分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Miai_ActivityEnroll_Extend> GetActivityEnrollPageList_V2(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend demodel)
{
return miai_ActivityEnrollRepository.GetPageList(pageIndex, pageSize, out count, demodel);
}
......@@ -564,6 +592,39 @@ namespace Mall.Module.Miai
bool flag = miai_ActivityEnrollRepository.Update(keyValues, wheres);
return flag ? "" : "出错了，请联系管理员";
}
/// <summary>
/// 获取招募贴我的报名记录
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Miai_ActivityEnroll_Extend> GetMyEnrollPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend demodel)
{
var list = miai_ActivityEnrollRepository.GetMyEnrollPageList(pageIndex, pageSize, out count, demodel);
if (list.Any()) {
string ActivityIds = string.Join(",", list.Select(x => x.ActivityId).Distinct());
//查询活动帖子
var alist = miai_ActivityRepository.GetList(new RB_Miai_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds }, true);
//查询活动报名数量
var elist = miai_ActivityEnrollRepository.GetActivityEnrollNumList(ActivityIds);
foreach (var item in alist)
{
item.ImageList = new List<string>();
if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
{
item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
}
item.EnrollNum = elist.Where(x => x.ActivityId == item.Id).FirstOrDefault()?.Number ?? 0;
}
foreach (var item in list) {
item.ActivityModel = alist.Where(x => x.Id == item.ActivityId).FirstOrDefault();
}
}
return list;
}
#endregion
#region 会员基础信息
......
Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs
View file @ 5a0e5d3f
......@@ -46,9 +46,10 @@ namespace Mall.Repository.Miai
{
where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} =0";
}
string sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
string sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,b.Sex from RB_Miai_ActivityDiscuss d
left join rb_member_user u on d.UserId = u.Id
left join rb_member_user u1 on d.ReplyUserId = u1.Id
left join rb_miai_baseinfo b on d.UserId =b.UserId
where {where} order by d.Id asc";
return GetPage<RB_Miai_ActivityDiscuss_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
......
Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs
View file @ 5a0e5d3f
......@@ -38,8 +38,9 @@ namespace Mall.Repository.Miai
{
where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
}
string sql = $@"select e.*,u.Name as UserName,u.Photo from RB_Miai_ActivityEnroll e
string sql = $@"select e.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_ActivityEnroll e
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";
return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
......@@ -94,5 +95,36 @@ where {where} order by e.Id desc";
string sql = $@" select ActivityId,count(0) as Number from RB_Miai_ActivityEnroll where Status =0 and ActivityId in({activityIds}) group by ActivityId";
return Get<RB_Miai_ActivityEnroll_Extend>(sql).ToList();
}
/// <summary>
/// 获取招募贴我的报名记录
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Miai_ActivityEnroll_Extend> GetMyEnrollPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend dmodel)
{
string where = $" 1=1 and {nameof(RB_Miai_ActivityEnroll_Extend.Status)}=0 ";
if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.ActivityId > 0)
{
where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.ActivityId)} ={dmodel.ActivityId}";
}
if (dmodel.UserId > 0)
{
where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
}
string sql = $@"select * from RB_Miai_ActivityEnroll where {where} order by Id desc";
return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
}
}
Mall.Repository/Miai/RB_Miai_ActivityRepository.cs
View file @ 5a0e5d3f
......@@ -41,8 +41,9 @@ namespace Mall.Repository.Miai
{
where += $@" and a.{nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
}
string sql = $@"select a.*,u.Name as UserName,u.Photo from RB_Miai_Activity a
string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_Activity a
left join rb_member_user u on a.UserId =u.Id
left join rb_miai_baseinfo b on a.UserId =b.UserId
where {where} order by a.Id desc";
return GetPage<RB_Miai_Activity_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
......@@ -52,30 +53,38 @@ where {where} order by a.Id desc";
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Miai_Activity_Extend> GetList(RB_Miai_Activity_Extend dmodel)
public List<RB_Miai_Activity_Extend> GetList(RB_Miai_Activity_Extend dmodel,bool IsAll = false)
{
string where = $" 1=1 and {nameof(RB_Miai_Activity_Extend.Status)}=0 ";
string where = $" 1=1 and a.{nameof(RB_Miai_Activity_Extend.Status)}=0 ";
if (IsAll) { where = " 1=1"; }
if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Miai_Activity_Extend.TenantId)}={dmodel.TenantId}";
where += $@" and a.{nameof(RB_Miai_Activity_Extend.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Miai_Activity_Extend.MallBaseId)}={dmodel.MallBaseId}";
where += $@" and a.{nameof(RB_Miai_Activity_Extend.MallBaseId)}={dmodel.MallBaseId}";
}
if (!string.IsNullOrEmpty(dmodel.ActivityIds))
{
where += $@" and a.{nameof(RB_Miai_Activity_Extend.Id)} in({dmodel.ActivityIds})";
}
if (!string.IsNullOrEmpty(dmodel.ActivityTitle))
{
where += $@" and {nameof(RB_Miai_Activity_Extend.ActivityTitle)} like '%{dmodel.ActivityTitle}%'";
where += $@" and a.{nameof(RB_Miai_Activity_Extend.ActivityTitle)} like '%{dmodel.ActivityTitle}%'";
}
if (dmodel.ForumId > 0)
{
where += $@" and {nameof(RB_Miai_Activity_Extend.ForumId)} ={dmodel.ForumId}";
where += $@" and a.{nameof(RB_Miai_Activity_Extend.ForumId)} ={dmodel.ForumId}";
}
if (dmodel.UserId > 0)
{
where += $@" and {nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
where += $@" and a.{nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
}
string sql = $@"select * from RB_Miai_Activity where {where} order by Id desc";
string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_Activity a
left join rb_member_user u on a.UserId =u.Id
left join rb_miai_baseinfo b on a.UserId =b.UserId
where {where} order by a.Id desc";
return Get<RB_Miai_Activity_Extend>(sql).ToList();
}
}
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 5a0e5d3f
......@@ -78,6 +78,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.UserId,
x.UserName,
x.Photo,
x.Sex,
x.Content,
x.ImageList,
x.ReplyNum,
......@@ -193,6 +194,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.UserId,
x.UserName,
x.Photo,
x.Sex,
x.Content,
x.ImageList,
ReplyList = x.ReplyList.Select(z=>new {
......@@ -325,7 +327,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
var list = miaiModule.GetActivityEnrollPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = miaiModule.GetActivityEnrollPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel, userInfo);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
......@@ -333,6 +335,12 @@ namespace Mall.WebApi.Controllers.MallBase
x.UserId,
x.UserName,
x.Photo,
x.Sex,
x.Name,
x.Mobile,
x.PeopleNum,
x.Remark,
x.IsFocus,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
});
return ApiResult.Success("", pagelist);
......@@ -351,6 +359,13 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull("请传递活动id");
}
if (string.IsNullOrEmpty(demodel.Name))
{
return ApiResult.ParamIsNull("请传递姓名");
}
if (string.IsNullOrEmpty(demodel.Mobile)) {
return ApiResult.ParamIsNull("请传递手机号码");
}
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
......@@ -394,6 +409,47 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
/// <summary>
/// 获取我的帖子报名列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMyEnrollPageList() {
var parms = RequestParm;
var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Miai_ActivityEnroll_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityEnroll_Extend>(parms.msg.ToString());
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId;
var list = miaiModule.GetMyEnrollPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.Id,
x.UserId,
x.Name,
x.Mobile,
x.PeopleNum,
x.Remark,
ActivityModel = new {
x.ActivityModel?.Id,
x.ActivityModel?.ActivityTitle,
x.ActivityModel?.UserId,
x.ActivityModel?.UserName,
x.ActivityModel?.Photo,
x.ActivityModel?.Sex,
x.ActivityModel?.Content,
x.ActivityModel?.ImageList,
x.ActivityModel?.EnrollNum,
Deadline = x.ActivityModel?.Deadline.ToString("yyyy-MM-dd"),
x.ActivityModel?.Status
},
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
});
return ApiResult.Success("", pagelist);
}
#endregion
#region 基础信息
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 5a0e5d3f
......@@ -301,7 +301,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
var list = miaiModule.GetActivityEnrollPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = miaiModule.GetActivityEnrollPageList_V2(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
......@@ -309,6 +309,10 @@ namespace Mall.WebApi.Controllers.MallBase
x.UserId,
x.UserName,
x.Photo,
x.Name,
x.Mobile,
x.PeopleNum,
x.Remark,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
});
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