Commit 616242af authored by liudong1993's avatar liudong1993

调整

parent b5627356
...@@ -213,6 +213,8 @@ namespace Mall.Module.Miai ...@@ -213,6 +213,8 @@ namespace Mall.Module.Miai
return "有新违规通知"; return "有新违规通知";
case Common.Enum.MiAi.MessageTypeEnum.ActivityCancel: case Common.Enum.MiAi.MessageTypeEnum.ActivityCancel:
return "有活动报名被取消"; return "有活动报名被取消";
case Common.Enum.MiAi.MessageTypeEnum.FollowMember:
return "有新用户关注了你";
default: default:
return ""; return "";
} }
......
...@@ -542,7 +542,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -542,7 +542,6 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId, miniProgram); var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId, miniProgram);
user_info = memberModel; user_info = memberModel;
} }
var data = new object(); var data = new object();
......
...@@ -695,6 +695,30 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -695,6 +695,30 @@ namespace Mall.WebApi.Controllers.MallBase
} }
var list = miaiModule.GetMiaiMessageVisitorPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = miaiModule.GetMiaiMessageVisitorPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
//根据日期分组
//List<string> DateList = list.Select(x => x.CreateDate.ToString("yyyy-MM-dd")).Distinct().ToList();
//List<object> RList = new List<object>();
//foreach (var item in DateList) {
// RList.Add(new
// {
// DateStr = item,
// List = list.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == item).Select(x => new
// {
// x.Id,
// x.Type,
// TypeName = x.Type.GetEnumName(),
// 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"),
// CreateDateDay = x.CreateDate.ToString("yyyy-MM-dd"),
// CreateDateHour = x.CreateDate.ToString("HH:mm")
// })
// });
//}
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
{ {
x.Id, x.Id,
...@@ -706,7 +730,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -706,7 +730,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.Photo, x.Photo,
x.Sex, x.Sex,
x.Status, x.Status,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm") CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
CreateDateDay = x.CreateDate.ToString("yyyy-MM-dd"),
CreateDateHour = x.CreateDate.ToString("HH:mm")
}); });
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