Skip to content

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

提交代码

parent ff2159db
Show whitespace changes
Inline Side-by-side
Showing with 353 additions and 46 deletions
Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs
View file @ dc6a7e7c
...@@ -81,6 +81,87 @@ namespace Mall.Model.Entity.Miai ...@@ -81,6 +81,87 @@ namespace Mall.Model.Entity.Miai
public string IDCardBack { get; set; } public string IDCardBack { get; set; }
/// <summary>
/// 户口
/// </summary>
public string HuKou { get; set; }
/// <summary>
/// 籍贯
/// </summary>
public string NativePlace { get; set; }
/// <summary>
/// 房屋信息
/// </summary>
public string HouseInfo { get; set; }
/// <summary>
/// 学校信息
/// </summary>
public string SchoolInfo { get; set; }
/// <summary>
/// 年收入
/// </summary>
public string YearMoney { get; set; }
/// <summary>
/// 职务
/// </summary>
public string Job { get; set; }
/// <summary>
/// 其他兄弟姐妹
/// </summary>
public string OtherPople { get; set; }
/// <summary>
/// 专业
/// </summary>
public string MajorInfo { get; set; }
/// <summary>
/// 车辆信息
/// </summary>
public string CarInfo { get; set; }
/// <summary>
/// 父亲工作信息
/// </summary>
public string FatherInfo { get; set; }
/// <summary>
/// 母亲工作信息
/// </summary>
public string MotherInfo { get; set; }
/// <summary>
/// 关于
/// </summary>
public string About { get; set; }
/// <summary>
/// 理想爱情
/// </summary>
public string IdealLove { get; set; }
/// <summary>
/// 相册
/// </summary>
public string Album { get; set; }
/// <summary>
/// 浏览数
/// </summary>
public int BrowseNum { get; set; }
/// <summary>
/// 关注数
/// </summary>
public int FollowNum { get; set; }
/// <summary> /// <summary>
/// 商户号Id /// 商户号Id
/// </summary> /// </summary>
......
Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs
View file @ dc6a7e7c
...@@ -5,8 +5,11 @@ using Mall.Model.Entity.Miai; ...@@ -5,8 +5,11 @@ using Mall.Model.Entity.Miai;
namespace Mall.Model.Extend.Miai namespace Mall.Model.Extend.Miai
{ {
public class RB_MiAi_BaseInfo_Extend: RB_MiAi_BaseInfo public class RB_MiAi_BaseInfo_Extend : RB_MiAi_BaseInfo
{ {
/// <summary>
/// 相册
/// </summary>
public List<string> AlbumList { get; set; }
} }
} }
Mall.Module.Miai/MiaiModule.cs
View file @ dc6a7e7c
...@@ -81,7 +81,8 @@ namespace Mall.Module.Miai ...@@ -81,7 +81,8 @@ namespace Mall.Module.Miai
bool flag = miai_ForumRepository.Update(keyValues, wheres); bool flag = miai_ForumRepository.Update(keyValues, wheres);
return flag; return flag;
} }
else { else
{
bool flag = miai_ForumRepository.Insert(demodel) > 0; bool flag = miai_ForumRepository.Insert(demodel) > 0;
return flag; return flag;
} }
...@@ -113,7 +114,8 @@ namespace Mall.Module.Miai ...@@ -113,7 +114,8 @@ namespace Mall.Module.Miai
bool flag = miai_ForumRepository.Update(keyValues, wheres); bool flag = miai_ForumRepository.Update(keyValues, wheres);
return flag; return flag;
} }
else { else
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Miai_Forum_Extend.Status),1}, { nameof(RB_Miai_Forum_Extend.Status),1},
{ nameof(RB_Miai_Forum_Extend.UpdateDate),DateTime.Now}, { nameof(RB_Miai_Forum_Extend.UpdateDate),DateTime.Now},
...@@ -254,7 +256,8 @@ namespace Mall.Module.Miai ...@@ -254,7 +256,8 @@ namespace Mall.Module.Miai
}; };
return miai_ActivityRepository.Update(keyValues, wheres); return miai_ActivityRepository.Update(keyValues, wheres);
} }
else { else
{
return miai_ActivityRepository.Insert(demodel) > 0; return miai_ActivityRepository.Insert(demodel) > 0;
} }
} }
...@@ -282,7 +285,8 @@ namespace Mall.Module.Miai ...@@ -282,7 +285,8 @@ namespace Mall.Module.Miai
} }
}; };
bool flag = miai_ActivityRepository.Update(keyValues, wheres); bool flag = miai_ActivityRepository.Update(keyValues, wheres);
if (flag) { if (flag)
{
miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log() miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log()
{ {
Id = 0, Id = 0,
...@@ -349,20 +353,24 @@ namespace Mall.Module.Miai ...@@ -349,20 +353,24 @@ namespace Mall.Module.Miai
{ {
demodel.ParentId = -1;//查询主评论 demodel.ParentId = -1;//查询主评论
var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel); var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel);
if (list.Any()) { if (list.Any())
{
//查询评论下 前几条回复记录 //查询评论下 前几条回复记录
List<int> PidsList = list.Select(x => x.Id).ToList(); List<int> PidsList = list.Select(x => x.Id).ToList();
var clist = miai_ActivityDiscussRepository.GetActivityDiscussChildList(PidsList, 4); var clist = miai_ActivityDiscussRepository.GetActivityDiscussChildList(PidsList, 4);
//查询评论回复数量 //查询评论回复数量
var rlist = miai_ActivityDiscussRepository.GetDiscussReplyNumList(string.Join(",", PidsList)); var rlist = miai_ActivityDiscussRepository.GetDiscussReplyNumList(string.Join(",", PidsList));
foreach (var item in list) { foreach (var item in list)
{
item.ReplyList = clist.Where(x => x.ParentId == item.Id).OrderBy(x => x.Id).ToList(); item.ReplyList = clist.Where(x => x.ParentId == item.Id).OrderBy(x => x.Id).ToList();
item.ReplyNum = rlist.Where(x => x.ParentId == item.Id).FirstOrDefault()?.ReplyNum ?? 0; item.ReplyNum = rlist.Where(x => x.ParentId == item.Id).FirstOrDefault()?.ReplyNum ?? 0;
item.ImageList = new List<string>(); item.ImageList = new List<string>();
if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]") { if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
{
item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images); item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
} }
foreach (var qitem in item.ReplyList) { foreach (var qitem in item.ReplyList)
{
qitem.ImageList = new List<string>(); qitem.ImageList = new List<string>();
if (!string.IsNullOrEmpty(qitem.Images) && qitem.Images != "[]") if (!string.IsNullOrEmpty(qitem.Images) && qitem.Images != "[]")
{ {
...@@ -475,7 +483,7 @@ namespace Mall.Module.Miai ...@@ -475,7 +483,7 @@ namespace Mall.Module.Miai
/// <param name="discussId"></param> /// <param name="discussId"></param>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public string DelActivityDiscussInfo_V2(int discussId, int empId,int TenantId,int MallBaseId) public string DelActivityDiscussInfo_V2(int discussId, int empId, int TenantId, int MallBaseId)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Miai_ActivityDiscuss_Extend.Status),1}, { nameof(RB_Miai_ActivityDiscuss_Extend.Status),1},
...@@ -531,7 +539,8 @@ namespace Mall.Module.Miai ...@@ -531,7 +539,8 @@ namespace Mall.Module.Miai
if (list.Any()) { return "已存在报名信息"; } if (list.Any()) { return "已存在报名信息"; }
var model = miai_ActivityRepository.GetEntity(demodel.ActivityId); var model = miai_ActivityRepository.GetEntity(demodel.ActivityId);
if (model == null || model.Status == 1) { return "活动不存在"; } if (model == null || model.Status == 1) { return "活动不存在"; }
if (model.Deadline <= DateTime.Now) { if (model.Deadline <= DateTime.Now)
{
return "已过了报名时间，无法报名"; return "已过了报名时间，无法报名";
} }
bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0; bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
...@@ -605,6 +614,42 @@ namespace Mall.Module.Miai ...@@ -605,6 +614,42 @@ namespace Mall.Module.Miai
{ {
flag = miai_BaseInfoRepository.Insert(model) > 0; flag = miai_BaseInfoRepository.Insert(model) > 0;
} }
else {
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_MiAi_BaseInfo_Extend.Sex),model.Sex},
{ nameof(RB_MiAi_BaseInfo_Extend.Birthday),model.Birthday},
{ nameof(RB_MiAi_BaseInfo_Extend.Weight),model.Weight},
{ nameof(RB_MiAi_BaseInfo_Extend.Height),model.Height},
{ nameof(RB_MiAi_BaseInfo_Extend.EducationType),model.EducationType},
{ nameof(RB_MiAi_BaseInfo_Extend.Marriage),model.Marriage},
{ nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCard),model.IDCard},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardBack),model.IDCardBack},
{ nameof(RB_MiAi_BaseInfo_Extend.HuKou),model.HuKou},
{ nameof(RB_MiAi_BaseInfo_Extend.NativePlace),model.NativePlace},
{ nameof(RB_MiAi_BaseInfo_Extend.HouseInfo),model.HouseInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.SchoolInfo),model.SchoolInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.YearMoney),model.YearMoney},
{ nameof(RB_MiAi_BaseInfo_Extend.Job),model.Job},
{ nameof(RB_MiAi_BaseInfo_Extend.OtherPople),model.OtherPople},
{ nameof(RB_MiAi_BaseInfo_Extend.MajorInfo),model.MajorInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.CarInfo),model.CarInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.FatherInfo),model.FatherInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.MotherInfo),model.MotherInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.About),model.About},
{ nameof(RB_MiAi_BaseInfo_Extend.IdealLove),model.IdealLove}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id),
FiledValue=model.Id,
OperatorEnum=OperatorEnum.Equal
}
};
flag = miai_BaseInfoRepository.Update(keyValues, wheres);
}
return flag; return flag;
} }
#endregion #endregion
...@@ -615,15 +660,15 @@ namespace Mall.Module.Miai ...@@ -615,15 +660,15 @@ namespace Mall.Module.Miai
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model) public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model, RB_MiAi_BaseInfo_Extend baseInfo)
{ {
bool flag = false; bool flag = false;
try try
{ {
if (model.ID == 0) if (model.ID == 0)
{ {
flag = miai_FollowMemberRepository.Insert(model) > 0; flag = miai_FollowMemberRepository.Insert(model) > 0;
baseInfo.FollowNum += 1;
} }
else else
{ {
...@@ -638,8 +683,30 @@ namespace Mall.Module.Miai ...@@ -638,8 +683,30 @@ namespace Mall.Module.Miai
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
if (model.Status == 1)//取消关注
{
baseInfo.FollowNum -= 1;
}
else {
baseInfo.FollowNum += 1;
}
flag = miai_FollowMemberRepository.Update(keyValues, wheres); flag = miai_FollowMemberRepository.Update(keyValues, wheres);
} }
if (flag)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_MiAi_BaseInfo_Extend.FollowNum),baseInfo.FollowNum}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id),
FiledValue=baseInfo.Id,
OperatorEnum=OperatorEnum.Equal
}
};
miai_BaseInfoRepository.Update(keyValues, wheres);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ dc6a7e7c
...@@ -59,12 +59,14 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -59,12 +59,14 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetActivityPageList(){ public ApiResult GetActivityPageList()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString()); RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
if (demodel.ForumId <= 0) { if (demodel.ForumId <= 0)
{
return ApiResult.ParamIsNull("请传递版块id"); return ApiResult.ParamIsNull("请传递版块id");
} }
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
...@@ -93,11 +95,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -93,11 +95,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetActivityInfo(){ public ApiResult GetActivityInfo()
{
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var parms = JObject.Parse(RequestParm.msg.ToString()); var parms = JObject.Parse(RequestParm.msg.ToString());
int ActivityId = parms.GetInt("ActivityId", 0); int ActivityId = parms.GetInt("ActivityId", 0);
if (ActivityId <= 0) { if (ActivityId <= 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
...@@ -110,7 +114,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -110,7 +114,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetActivityInfo() { public ApiResult SetActivityInfo()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString()); RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
...@@ -118,13 +123,16 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -118,13 +123,16 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.ParamIsNull("请传递版块id"); return ApiResult.ParamIsNull("请传递版块id");
} }
if (string.IsNullOrEmpty(demodel.ActivityTitle)) { if (string.IsNullOrEmpty(demodel.ActivityTitle))
{
return ApiResult.ParamIsNull("请传递标题名称"); return ApiResult.ParamIsNull("请传递标题名称");
} }
if (string.IsNullOrEmpty(demodel.Content)) { if (string.IsNullOrEmpty(demodel.Content))
{
return ApiResult.ParamIsNull("请传递内容"); return ApiResult.ParamIsNull("请传递内容");
} }
if (demodel.Deadline < DateTime.Now) { if (demodel.Deadline < DateTime.Now)
{
return ApiResult.ParamIsNull("请重新选择报名截止日期"); return ApiResult.ParamIsNull("请重新选择报名截止日期");
} }
demodel.ImageList ??= new List<string>(); demodel.ImageList ??= new List<string>();
...@@ -140,7 +148,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -140,7 +148,8 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
...@@ -150,11 +159,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -150,11 +159,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DelActivityInfo() { public ApiResult DelActivityInfo()
{
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var parms = JObject.Parse(RequestParm.msg.ToString()); var parms = JObject.Parse(RequestParm.msg.ToString());
int ActivityId = parms.GetInt("ActivityId", 0); int ActivityId = parms.GetInt("ActivityId", 0);
if (ActivityId <= 0) { if (ActivityId <= 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
...@@ -163,7 +174,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -163,7 +174,8 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(msg); return ApiResult.Failed(msg);
} }
} }
...@@ -195,7 +207,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -195,7 +207,8 @@ namespace Mall.WebApi.Controllers.MallBase
x.Photo, x.Photo,
x.Content, x.Content,
x.ImageList, x.ImageList,
ReplyList = x.ReplyList.Select(z=>new { ReplyList = x.ReplyList.Select(z => new
{
z.Id, z.Id,
z.UserId, z.UserId,
z.UserName, z.UserName,
...@@ -217,7 +230,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -217,7 +230,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetActivityReplyPageList(){ public ApiResult GetActivityReplyPageList()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -251,7 +265,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -251,7 +265,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SgetActivityDiscussInfo() { public ApiResult SgetActivityDiscussInfo()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString()); RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
...@@ -314,7 +329,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -314,7 +329,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetActivityEnrollPageList() { public ApiResult GetActivityEnrollPageList()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
...@@ -343,7 +359,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -343,7 +359,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetActivityEnrollInfo() { public ApiResult SetActivityEnrollInfo()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_Miai_ActivityEnroll_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityEnroll_Extend>(parms.msg.ToString()); RB_Miai_ActivityEnroll_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityEnroll_Extend>(parms.msg.ToString());
...@@ -374,7 +391,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -374,7 +391,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult CancelActivityEnrollInfo() { public ApiResult CancelActivityEnrollInfo()
{
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var parms = JObject.Parse(RequestParm.msg.ToString()); var parms = JObject.Parse(RequestParm.msg.ToString());
int EnrollId = parms.GetInt("EnrollId", 0); int EnrollId = parms.GetInt("EnrollId", 0);
...@@ -436,10 +454,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -436,10 +454,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Failed("请选择身高"); return ApiResult.Failed("请选择身高");
} }
if (baseInfo.Height == 0)
{
return ApiResult.Failed("请选择身高");
}
if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0) if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
{ {
return ApiResult.Failed("请选择学历"); return ApiResult.Failed("请选择学历");
...@@ -464,9 +479,19 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -464,9 +479,19 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Failed("请上传身份证国徽面"); return ApiResult.Failed("请上传身份证国徽面");
} }
if (baseInfo.AlbumList != null && baseInfo.AlbumList.Any())
{
baseInfo.Album = JsonConvert.SerializeObject(baseInfo.Album);
}
else
{
baseInfo.Album = "";
}
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = baseInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault(); var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = baseInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (oldBaseInfo == null && oldBaseInfo.Id == 0) if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{ {
baseInfo.Id = oldBaseInfo.Id;
}
if (miaiModule.SetMiAiBaseInfo(baseInfo)) if (miaiModule.SetMiAiBaseInfo(baseInfo))
{ {
return ApiResult.Success("基础资料填写成功"); return ApiResult.Success("基础资料填写成功");
...@@ -476,9 +501,126 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -476,9 +501,126 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed("基础资料填写失败"); return ApiResult.Failed("基础资料填写失败");
} }
} }
/// <summary>
/// 年龄
/// </summary>
/// <param name="bornDate"></param>
/// <returns></returns>
private string GetAge(string bornDate)
{
DateTime b = DateTime.Parse(bornDate);
int a2 = DateTime.Now.Year;
int b2 = b.Year;
int a3 = DateTime.Now.Month;
int b3 = b.Month;
int a4 = DateTime.Now.Day;
int b4 = b.Day;
int aa = (a2 - 1900) * 365 + a3 * 30 + a4;
int bb = (b2 - 1900) * 365 + b3 * 30 + b4;
int cc = aa - bb; //天数
int dd = (int)Math.Floor(Convert.ToDouble(cc / 365));
return dd.ToString();
}
/// <summary>
/// 生肖
/// </summary>
/// <param name="birthday"></param>
/// <returns></returns>
public string GetShengXiao(DateTime birthday)
{
System.Globalization.ChineseLunisolarCalendar chinseCaleander = new System.Globalization.ChineseLunisolarCalendar();
string TreeYear = "鼠牛虎兔龙蛇马羊猴鸡狗猪";
int intYear = chinseCaleander.GetSexagenaryYear(birthday);
string Tree = TreeYear.Substring(chinseCaleander.GetTerrestrialBranch(intYear) - 1, 1);
return Tree;
}
/// <summary>
/// 获取星座
/// </summary>
/// <param name="birthday"></param>
/// <returns></returns>
public string GetAtomFromBirthday(DateTime birthday)
{
float birthdayF = 0.00F;
if (birthday.Month == 1 && birthday.Day < 20)
{
birthdayF = float.Parse(string.Format("13.{0}", birthday.Day));
}
else
{
birthdayF = float.Parse(string.Format("{0}.{1}", birthday.Month, birthday.Day));
}
float[] atomBound = { 1.20F, 2.20F, 3.21F, 4.21F, 5.21F, 6.22F, 7.23F, 8.23F, 9.23F, 10.23F, 11.21F, 12.22F, 13.20F };
string[] atoms = { "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座" };
string ret = "靠！外星人啊。";
for (int i = 0; i < atomBound.Length - 1; i++)
{
if (atomBound[i] <= birthdayF && atomBound[i + 1] > birthdayF)
{
ret = atoms[i];
break;
}
}
return ret;
}
public ApiResult GetMiAiBaseIfo()
{
var req = RequestParm;
JObject parm = JObject.Parse(req.msg.ToString());
var userInfo = AppletUserInfo;
int userId = parm.GetInt("UserId");
if (userId == 0)
{
userId = userInfo.UserId;
}
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{
oldBaseInfo.AlbumList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
}
var result = new
{
SexStr = oldBaseInfo.Sex == 1 ? "男" : "女",
oldBaseInfo.Birthday,
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
oldBaseInfo.Height,
oldBaseInfo.Weight,
Marriage = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
EducationType = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
YearMoney = oldBaseInfo.YearMoney ?? "",
HuKou = oldBaseInfo.HuKou ?? "",
NativePlace = oldBaseInfo.NativePlace ?? "",
HouseInfo = oldBaseInfo.HouseInfo ?? "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
MotherInfo = oldBaseInfo.MotherInfo ?? "",
FatherInfo = oldBaseInfo.FatherInfo ?? "",
Job = oldBaseInfo.Job ?? "",
OtherPople = oldBaseInfo.OtherPople ?? "",
MajorInfo = oldBaseInfo.MajorInfo ?? "",
CarInfo = oldBaseInfo.CarInfo ?? "",
About = oldBaseInfo.About ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
oldBaseInfo.AlbumList
};
return ApiResult.Success("", result);
}
else else
{ {
return ApiResult.Failed("请勿重复填写基础资料"); return ApiResult.Failed("用户暂未认证");
} }
} }
...@@ -602,6 +744,20 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -602,6 +744,20 @@ namespace Mall.WebApi.Controllers.MallBase
} }
else else
{ {
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = query.CreateBy, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (oldBaseInfo == null || oldBaseInfo.Id == 0)
{
return ApiResult.Failed("您未实名认证，无法关注");
}
oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = query.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (oldBaseInfo == null || oldBaseInfo.Id == 0)
{
return ApiResult.Failed("会员未实名认证，无法关注");
}
//判断是否已经关注过 //判断是否已经关注过
var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = -1, UserId = query.UserId, CreateBy = query.CreateBy, MallBaseId = query.MallBaseId, TenantId = query.TenantId }); ; var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = -1, UserId = query.UserId, CreateBy = query.CreateBy, MallBaseId = query.MallBaseId, TenantId = query.TenantId }); ;
if (query.ID == 0) if (query.ID == 0)
...@@ -631,7 +787,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -631,7 +787,7 @@ namespace Mall.WebApi.Controllers.MallBase
query.Status = 1; query.Status = 1;
} }
bool result = miaiModule.AddOrUpdateFollowMember(query); bool result = miaiModule.AddOrUpdateFollowMember(query, oldBaseInfo);
if (isUpdate) if (isUpdate)
{ {
if (result) if (result)
......
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