Skip to content

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

提交代码

parent 47cc8cad
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 17 deletions
Mall.Model/Entity/Miai/RB_Miai_Activity.cs
View file @ 3f77dd2c
......@@ -57,6 +57,11 @@ namespace Mall.Model.Entity.Miai
/// </summary>
public int IsOpenEnroll { get; set; }
/// <summary>
/// 0-活动，1-帖子
/// </summary>
public int IsTieZi { get; set; }
/// <summary>
/// 报名截止日期
/// </summary>
......
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ 3f77dd2c
......@@ -3473,6 +3473,12 @@ namespace Mall.Model.Extend.MarketingCenter
/// 是否点赞0-否，1-是
/// </summary>
public int IsDianZan { get; set; }
/// <summary>
/// 是否是帖子，0-活动，1-帖子
/// </summary>
public int IsTieZi { get; set; }
}
/// <summary>
......
Mall.Module.Miai/MiaiModule.cs
View file @ 3f77dd2c
......@@ -707,7 +707,7 @@ namespace Mall.Module.Miai
int PeopleNum = ManENum + WoManENum;
//获取当前用户是否已报名
bool IsEnroll = false;
if (userInfo.UserId > 0)
{
IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
......@@ -729,11 +729,11 @@ namespace Mall.Module.Miai
//查询是否已关注我
IsFocus2 = otherFollowList.Any();
}
int IsTieZi = 0;
if (model.IsOpenEnroll == 2 && model.ManNum == 0 && model.WoManNum == 0 && model.Distinguish == 1 && !model.StartTime.HasValue && !model.EndTime.HasValue)
{
IsTieZi = 1;
}
//int IsTieZi = 0;
//if (model.IsOpenEnroll == 2 && model.ManNum == 0 && model.WoManNum == 0 && model.Distinguish == 1 && !model.StartTime.HasValue && !model.EndTime.HasValue)
//{
// IsTieZi = 1;
//}
return new
{
model.ForumId,
......@@ -765,7 +765,7 @@ namespace Mall.Module.Miai
ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0,
MyFollowId = (myFollowList != null && myFollowList.Any()) ? myFollowList.FirstOrDefault()?.ID : 0,
OtherFollowId = (otherFollowList != null && otherFollowList.Any()) ? otherFollowList.FirstOrDefault()?.ID : 0,
IsTieZi
model.IsTieZi
};
}
......@@ -783,11 +783,6 @@ namespace Mall.Module.Miai
//查询活动回复数量
var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(activityId.ToString());
var umodel = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(model.UserId);
int IsTieZi = 0;
if (model.IsOpenEnroll == 2 && model.ManNum == 0 && model.WoManNum == 0 && model.Distinguish == 1 && !model.StartTime.HasValue && !model.EndTime.HasValue)
{
IsTieZi = 1;
}
return new
{
model.Id,
......@@ -808,7 +803,7 @@ namespace Mall.Module.Miai
Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
PeopleNum,
IsTieZi,
model.IsTieZi,
ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0,
model.Distinguish
};
......
Mall.Repository/Miai/RB_Miai_ActivityRepository.cs
View file @ 3f77dd2c
......@@ -57,9 +57,10 @@ namespace Mall.Repository.Miai
{
orderBy = " a.CreateDate DESC";
}
string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_Activity a
string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex,IFNULL(d.DianZanNum,0) as DianZanNum 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
LEFT JOIN (SELECT ActivityId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId=0 GROUP BY ActivityId) as d on d.ActivityId=a.Id
where {where} order by {orderBy}";
return GetPage<RB_Miai_Activity_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 3f77dd2c
......@@ -1618,6 +1618,7 @@ namespace Mall.WebApi.Controllers
CreateBy = gItem.UserName,
CreateByIco = gItem.Photo,
IsDianZan = dianZanCount,
IsTieZi=gItem.IsTieZi,
DianZanNum = gItem.DianZanNum//先默认0
});
}
......@@ -1662,6 +1663,7 @@ namespace Mall.WebApi.Controllers
CreateBy = gItem.UserName,
CreateById = gItem.UserId,
CreateByIco = gItem.Photo,
IsTieZi = gItem.IsTieZi,
IsDianZan = dianZanCount,
DianZanNum = gItem.DianZanNum//先默认0
});
......@@ -1708,6 +1710,7 @@ namespace Mall.WebApi.Controllers
lastItem.picUrl = (tempGood.ImageList != null && tempGood.ImageList.Any()) ? tempGood.ImageList.FirstOrDefault() : "";
lastItem.CreateBy = tempGood.UserName;
lastItem.IsDianZan = dianZanCount;
lastItem.IsTieZi = tempGood.IsTieZi;
lastItem.CreateById = tempGood.UserId;
lastItem.DianZanNum = tempGood.DianZanNum;//先默认0
newGoodsList.Add(lastItem);
......@@ -1760,6 +1763,7 @@ namespace Mall.WebApi.Controllers
lastItem.CreateByIco = tempGood.Photo;
lastItem.IsDianZan = dianZanCount;
lastItem.CreateById = tempGood.UserId;
lastItem. IsTieZi = tempGood.IsTieZi;
lastItem.DianZanNum = tempGood.DianZanNum;//先默认0
newGoodsList.Add(lastItem);
}
......@@ -1805,6 +1809,7 @@ namespace Mall.WebApi.Controllers
CreateByIco = gItem.Photo,
IsDianZan = dianZanCount,
CreateById = gItem.UserId,
IsTieZi = gItem.IsTieZi,
DianZanNum = gItem.DianZanNum//先默认0
});
}
......@@ -1855,6 +1860,7 @@ namespace Mall.WebApi.Controllers
CreateByIco = gItem.Photo,
IsDianZan = dianZanCount,
CreateById = gItem.UserId,
IsTieZi = gItem.IsTieZi,
DianZanNum = gItem.DianZanNum//先默认0
});
}
......@@ -1900,6 +1906,7 @@ namespace Mall.WebApi.Controllers
childItem.CreateByIco = tempGood.Photo;
childItem.IsDianZan = dianZanCount;
childItem.CreateById = tempGood.UserId;
childItem.IsTieZi = tempGood.IsTieZi;
childItem.DianZanNum = tempGood.DianZanNum;//先默认0
newGoodsList.Add(childItem);
}
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 3f77dd2c
......@@ -95,7 +95,6 @@ namespace Mall.WebApi.Controllers.MallBase
LabelList = string.IsNullOrWhiteSpace(x.Label) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.Label),
StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
IsTieZi = (x.IsOpenEnroll == 2 && x.ManNum == 0 && x.WoManNum == 0 && x.Distinguish == 1 && !x.StartTime.HasValue && !x.EndTime.HasValue) ? 1 : 0,
x.ManNum,
x.WoManNum,
x.LonLat,
......@@ -103,6 +102,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.ForumId,
x.ForumName,
x.ForumIcon,
x.IsTieZi,
Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
});
......@@ -293,6 +293,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.UserId = userInfo.UserId;
demodel.CreateDate = DateTime.Now;
demodel.UpdateDate = DateTime.Now;
demodel.IsTieZi = 0;
bool flag = miaiModule.SetActivityInfo(demodel, out string msg);
if (flag)
{
......@@ -505,6 +506,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.UserId = userInfo.UserId;
demodel.CreateDate = DateTime.Now;
demodel.UpdateDate = DateTime.Now;
demodel.IsTieZi = 1;
bool flag = miaiModule.SetSimpleActivityInfo(demodel, out string msg);
if (flag)
{
......@@ -637,7 +639,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
totalCount = list.Count(),
ActivityCount = dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId == 0).Count(),
ActivityDiscussCount = dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId > 0).Count(),
DianZanId = parms.UserId > 0 ? (dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId == 0 && x.CreateBy == parms.UserId).FirstOrDefault()?.ID ?? 0) : 0,
ActivityList = dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId == 0).Select(x => new { x.ID, x.CreateBy, x.UserName, x.Photo, IsOwn = parms.UserId > 0 ? (x.CreateBy == parms.UserId) ? 1 : 0 : 0 })
});
}
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 3f77dd2c
......@@ -146,9 +146,10 @@ namespace Mall.WebApi.Controllers.MallBase
x.Label,
StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
IsTieZi = (x.IsOpenEnroll == 2 && x.ManNum == 0 && x.WoManNum == 0 && x.Distinguish == 1 && !x.StartTime.HasValue && !x.EndTime.HasValue) ? 1 : 0,
x.IsTieZi,
x.ManNum,
x.WoManNum,
x.DianZanNum,
x.LonLat,
x.LocationName,
Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
......
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