Skip to content

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

提交代码

parent 6e6be1d3
Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 50 deletions
Mall.Common/Enum/MiAi/EducationTypeEnum.cs
View file @ 54782cc6
......@@ -23,9 +23,14 @@ namespace Mall.Common.Enum.MiAi
[EnumField("本科")]
Undergraduate = 3,
/// <summary>
/// 高中及以下
/// 硕士
/// </summary>
[EnumField("硕士及以上")]
[EnumField("硕士")]
Master = 4,
/// <summary>
/// 博士
/// </summary>
[EnumField("博士")]
Doctor = 5,
}
}
Mall.Common/Enum/MiAi/MarriageEnum.cs
View file @ 54782cc6
......@@ -15,12 +15,25 @@ namespace Mall.Common.Enum.MiAi
/// <summary>
/// 离异
/// </summary>
[EnumField("离异")]
[EnumField("离异无孩")]
Divorce = 2,
/// <summary>
/// 离异
/// </summary>
[EnumField("离异有孩")]
DivorceAndChildren = 3,
/// <summary>
/// 丧偶
/// </summary>
[EnumField("丧偶")]
Widowed = 3,
Widowed = 4,
/// <summary>
/// 已婚
/// </summary>
[EnumField("已婚")]
Marriage = 5,
}
}
Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs
View file @ 54782cc6
......@@ -265,5 +265,7 @@ namespace Mall.Model.Entity.Miai
get;
set;
}
public int IsFaTie { get; set; }
}
}
Mall.Model/Entity/Miai/RB_Miai_Activity.cs
View file @ 54782cc6
......@@ -124,6 +124,11 @@ namespace Mall.Model.Entity.Miai
/// </summary>
public int WoManNum { get; set; }
/// <summary>
/// 0-区分，1-不区分报名性别
/// </summary>
public int Distinguish { get; set; }
/// <summary>
/// 经纬度（逗号分隔）
/// </summary>
......
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @ 54782cc6
......@@ -263,6 +263,23 @@ namespace Mall.Model.Extend.User
/// 会员等级名称
/// </summary>
public string MemberGradeName { get; set; }
/// <summary>
/// 上级名称
/// </summary>
public string SuperiorName { get; set; }
public int Sex { get; set; }
public string UserIds { get; set; }
/// <summary>
/// 发帖权限1-有
/// </summary>
public int IsFaTie { get; set; }
public int BaseInfoId { get; set; }
}
......
Mall.Module.Education/PointModule.cs
View file @ 54782cc6
......@@ -193,7 +193,7 @@ namespace Mall.Module.Education
/// <returns></returns>
public bool UpdatePointOrder(RB_Point_Order_Extend newModel)
{
//判断订单状态是否是待支付 2020-06-16 Add By:W
var model = pointOrderRepository.GetEntity(newModel.ID);
if (model == null)
......@@ -251,11 +251,11 @@ namespace Mall.Module.Education
UserId = model.UserId,
Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
PonitNum = model.PonitNum + model.GivePoint,
// Description = "在线购买" + model.PonitNum + "点" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint+"点") : ""),
// Description = "在线购买" + model.PonitNum + "点" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint+"点") : ""),
CreateDate = newModel.PaymentTime,
TenantId = model.TenantId,
MallBaseId = model.MallBaseId,
// Remarks = "订单号：" + model.OrderNo + "在线购买支付" + model.Income + "元" + model.PonitNum + "点" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint + "点") : ""),
// Remarks = "订单号：" + model.OrderNo + "在线购买支付" + model.Income + "元" + model.PonitNum + "点" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint + "点") : ""),
PlatformType = model.OrderSource
};
if (model.VersionSource == 2)
......@@ -263,7 +263,8 @@ namespace Mall.Module.Education
memberBalanceModel.Description = "在线购买" + model.PonitNum + "星" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint + "星") : "");
memberBalanceModel.Remarks = "订单号：" + model.OrderNo + "在线购买支付" + model.Income + "元" + model.PonitNum + "星" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint + "星") : "");
}
else {
else
{
memberBalanceModel.Description = "在线购买" + model.PonitNum + "点" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint + "点") : "");
memberBalanceModel.Remarks = "订单号：" + model.OrderNo + "在线购买支付" + model.Income + "元" + model.PonitNum + "点" + (model.GivePoint > 0 ? ("赠送" + model.GivePoint + "点") : "");
}
......@@ -310,6 +311,85 @@ namespace Mall.Module.Education
/// <summary>
///后台充值点数--相亲
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool ManageUpdatePoint(int userId, int pointNum, int isAdd)
{
var umodel = member_UserRepository.GetEntity(userId);
bool flag = false;
if (pointNum > 0)
{
try
{
RB_Member_PointBalance_Extend memberBalanceModel = new RB_Member_PointBalance_Extend
{
UserId = umodel.Id,
Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
PonitNum = pointNum,
CreateDate = System.DateTime.Now,
TenantId = umodel.TenantId,
MallBaseId = umodel.MallBaseId,
PlatformType = umodel.Source
};
memberBalanceModel.Description = "管理员" + (isAdd == 1 ? ("充值" + pointNum + "星") : (isAdd == 2 ? ("扣除" + pointNum + "星") : ""));
memberBalanceModel.Remarks = "管理员" + (isAdd == 1 ? ("充值" + pointNum + "星") : (isAdd == 2 ? ("扣除" + pointNum + "星") : ""));
flag = memberPointBalanceRepository.Insert(memberBalanceModel)>0;
if (flag)
{
int allPoint = isAdd == 1 ? (umodel.PointNum + pointNum) : (umodel.PointNum - pointNum);
IDictionary<string, object> filedsUser = new Dictionary<string, object>
{
{ nameof(Model.Entity.User.RB_Member_User.PointNum),allPoint }
};
IList<WhereHelper> userWhereHelpers = new List<WhereHelper>
{
new WhereHelper()
{
FiledName = nameof(Model.Entity.User.RB_Member_User.Id),
FiledValue = umodel.Id,
OperatorEnum = OperatorEnum.Equal
},
new WhereHelper()
{
FiledName = nameof(Model.Entity.User.RB_Member_User.TenantId),
FiledValue = umodel.TenantId,
OperatorEnum = OperatorEnum.Equal
},
new WhereHelper()
{
FiledName = nameof(Model.Entity.User.RB_Member_User.MallBaseId),
FiledValue = umodel.MallBaseId,
OperatorEnum = OperatorEnum.Equal
}
};
member_UserRepository.Update(filedsUser, userWhereHelpers);
}
}
catch (Exception ex)
{
LogHelper.Write(ex);
}
return flag;
}
else
{
return false;
}
}
/// <summary>
/// 新增/修改点数订单
/// </summary>
......@@ -762,7 +842,7 @@ namespace Mall.Module.Education
};
flag = pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers, trans);
}
if ((model.OrderStaus == Common.Enum.Point.OrderStausEnum.Paid|| model.OrderStaus == Common.Enum.Point.OrderStausEnum.NoClass) && model.TotalPointNum > 0)
if ((model.OrderStaus == Common.Enum.Point.OrderStausEnum.Paid || model.OrderStaus == Common.Enum.Point.OrderStausEnum.NoClass) && model.TotalPointNum > 0)
{
RB_Member_PointBalance_Extend memberBalanceModel = new RB_Member_PointBalance_Extend
{
......@@ -894,10 +974,10 @@ namespace Mall.Module.Education
{
List<string> openidList = new List<string>();
openidList.Add(model.OpenId);
new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName,model.RoomInfo, model.StudyDate.ToString("MM月dd日"));
new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName, model.RoomInfo, model.StudyDate.ToString("MM月dd日"));
}
}
return flag;
}
......@@ -951,7 +1031,7 @@ namespace Mall.Module.Education
{
OrderId = model.ID,
UserId = model.UserId,
CreateDate = System.DateTime.Now,
TenantId = model.TenantId,
MallBaseId = model.MallBaseId,
......@@ -976,7 +1056,7 @@ namespace Mall.Module.Education
}
memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend;
memberBalanceModel.Description = "购买直播课程消费" + (model.ActualPointNum - model.TotalPointNum) + "点";
}
else if (model.ActualPointNum < model.TotalPointNum)
{
......@@ -985,7 +1065,7 @@ namespace Mall.Module.Education
memberBalanceModel.PonitNum = (model.TotalPointNum - model.ActualPointNum);
memberBalanceModel.Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income;
memberBalanceModel.Description = "购买直播课程退费" + (model.TotalPointNum - model.ActualPointNum) + "点";
}
IDictionary<string, object> filedsUser = new Dictionary<string, object>
{
......
Mall.Module.Miai/MiaiModule.cs
View file @ 54782cc6
......@@ -187,10 +187,11 @@ namespace Mall.Module.Miai
{
userIds = string.Join(",", list.Select(x => x.UserId).Distinct());
}
var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds });
var blist = member_UserRepository.GetMiAiList(new Model.Extend.User.RB_Member_MiaiUser_Extend { TenantId = demodel.TenantId, UserIds = userIds });
// var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds });
foreach (var item in list)
{
var bmodel = blist.Where(x => x.UserId == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
var bmodel = blist.Where(x => x.Id == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
item.Name = bmodel?.Name ?? "";
item.Photo = bmodel?.Photo ?? "";
item.Sex = bmodel?.Sex ?? 0;
......@@ -611,6 +612,7 @@ namespace Mall.Module.Miai
model.Id,
model.ActivityTitle,
model.Content,
model.Distinguish,
ImageList = !string.IsNullOrEmpty(model.Images) ? JsonConvert.DeserializeObject<List<string>>(model.Images) : new List<string>() { },
LabelList = !string.IsNullOrEmpty(model.Label) ? JsonConvert.DeserializeObject<List<string>>(model.Label) : new List<string>() { },
model.UserId,
......@@ -1109,20 +1111,29 @@ namespace Mall.Module.Miai
}
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)
if (model.Distinguish == 0)
{
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 "已报满，无法报名"; }
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 "性别未维护，无法报名";
}
}
else
{
return "性别未维护，无法报名";
int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 0);
if (model.ManNum <= ManPeopleNum) { return "已报满，无法报名"; }
}
bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
if (flag)
{
......@@ -1291,6 +1302,28 @@ namespace Mall.Module.Miai
return miai_BaseInfoRepository.GetBaseInfoPageList(pageIndex, pageSize, out rowsCount, where);
}
/// <summary>
/// 更新用户发帖状态
/// </summary>
/// <param name="UserId"></param>
/// <param name="IsFaTie"></param>
/// <returns></returns>
public bool UpdateFaTie(string userIds, int IsFaTie)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_MiAi_BaseInfo_Extend.IsFaTie),IsFaTie}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_MiAi_BaseInfo_Extend.UserId),
FiledValue=userIds,
OperatorEnum=OperatorEnum.IN
}
};
return miai_BaseInfoRepository.Update(keyValues, wheres);
}
/// <summary>
/// 新增用户的基础信息
/// </summary>
......@@ -1338,7 +1371,8 @@ namespace Mall.Module.Miai
{ nameof(RB_MiAi_BaseInfo_Extend.IDCard),model.IDCard},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardBack),model.IDCardBack},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
{ nameof(RB_MiAi_BaseInfo_Extend.ActivityRegion),model.ActivityRegion}
{ nameof(RB_MiAi_BaseInfo_Extend.ActivityRegion),model.ActivityRegion},
{ nameof(RB_MiAi_BaseInfo_Extend.IsFaTie),model.IsFaTie}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
......@@ -1350,6 +1384,22 @@ namespace Mall.Module.Miai
flag = miai_BaseInfoRepository.Update(keyValues, wheres);
}
if (flag)
{
Dictionary<string, object> keyValuesUser = new Dictionary<string, object>() {
{ nameof(Model.Entity.User.RB_Member_User.Name),model.Name},
{ nameof(Model.Entity.User.RB_Member_User.Photo),model.Photo}
};
List<WhereHelper> wheresUser = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(Model.Entity.User.RB_Member_User.Id),
FiledValue=model.UserId,
OperatorEnum=OperatorEnum.Equal
}
};
member_UserRepository.Update(keyValuesUser, wheresUser);
}
return flag;
}
......@@ -1382,7 +1432,7 @@ namespace Mall.Module.Miai
/// <summary>
/// 分页列表
......@@ -1623,7 +1673,7 @@ namespace Mall.Module.Miai
/// <returns></returns>
public List<Model.Extend.User.RB_Member_MiaiUser_Extend> GetMiAiList(Model.Extend.User.RB_Member_MiaiUser_Extend dmodel)
{
var list = member_UserRepository.GetMiAiList( dmodel);
var list = member_UserRepository.GetMiAiList(dmodel);
if (list.Any())
{
List<Model.Extend.User.RB_Member_Grade_Extend> gradeList = new List<Model.Extend.User.RB_Member_Grade_Extend>();
......@@ -1663,6 +1713,8 @@ namespace Mall.Module.Miai
{ nameof(Model.Entity.User.RB_Member_User.AliasName),demodel.AliasName},
{ nameof(Model.Entity.User.RB_Member_User.UpdateDate),demodel.UpdateDate},
{ nameof(Model.Entity.User.RB_Member_User.PostId),demodel.PostId},
{ nameof(Model.Entity.User.RB_Member_User.Name),demodel.Name},
{ nameof(Model.Entity.User.RB_Member_User.Photo),demodel.Photo},
{ nameof(Model.Entity.User.RB_Member_User.Blacklist),demodel.Blacklist},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
......
Mall.Module.User/UserModule.cs
View file @ 54782cc6
......@@ -4799,7 +4799,7 @@ namespace Mall.Module.User
#region 开启离线收益
var customModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId }).FirstOrDefault();
var customModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId }).FirstOrDefault();
int OpenOfflineEarnings = customModel?.OpenOfflineEarnings ?? 0;
#endregion
......@@ -4861,7 +4861,8 @@ namespace Mall.Module.User
Completed = olist.Where(x => x.OrderClassify == 1 && x.OrderStatus == Common.Enum.Goods.OrderStatusEnum.Received).FirstOrDefault()?.OrderNum ?? 0,
},
isShowDistributionCenter = IsShowDistributionCenter,
isAttestation = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? 1 : 0,// 0-未认证，1-已认证
isAttestation = (oldBaseInfo != null && oldBaseInfo.Id > 0 && !string.IsNullOrWhiteSpace(oldBaseInfo.IDCard) && !string.IsNullOrWhiteSpace(oldBaseInfo.IDCardBack)) ? 1 : ((oldBaseInfo != null && oldBaseInfo.Id > 0) ? 2 : 0),// 0-未认证，1-已认证
isFaTie = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.IsFaTie : 0,// 0-没发帖权限，1-有发帖权限
Sex = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.Sex : 0,//0-未认证，1-男-2女
myFollowNum = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.FollowNum : 0,//关注我的
followNum = (myFollowList != null && myFollowList.Any()) ? myFollowList.Count : 0,//我的关注
......
Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs
View file @ 54782cc6
......@@ -421,5 +421,7 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id where a.Status=0 and b.Blacklis
return Get<RB_MiAi_BaseInfo_Extend>(sb.ToString()).ToList();
}
}
}
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ 54782cc6
......@@ -1379,8 +1379,8 @@ FROM
// orderBy = "a.Id asc";
//}
string sql = $@"
SELECT * from (SELECT a.*, b.Album,b.Birthday,b.Height,b.Weight,b.YearMoney,b.EducationType,b.Marriage,b.CarInfo,b.HouseInfo,(YEAR (curdate()) - YEAR (b.Birthday) - 1 + ( DATE_FORMAT(b.Birthday, '%m%d') <= ( DATE_FORMAT(curdate(), '%m%d') ) )) Age
FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId) as t where {where} order by {orderBy}
SELECT * from (SELECT a.*,mu.`Name` as SuperiorName, b.Id as BaseInfoId,b.Album,b.Birthday,b.Height,b.IsFaTie,b.Weight,b.YearMoney,b.EducationType,b.Marriage,b.CarInfo,b.HouseInfo,(YEAR (curdate()) - YEAR (b.Birthday) - 1 + ( DATE_FORMAT(b.Birthday, '%m%d') <= ( DATE_FORMAT(curdate(), '%m%d') ) )) Age
FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId LEFT JOIN rb_member_user as mu on a.SuperiorId=mu.Id) as t where {where} order by {orderBy}
";
return GetPage<RB_Member_MiaiUser_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
......@@ -1410,6 +1410,10 @@ FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId) as
{
where += $@" and t.{nameof(RB_Member_User.Id)}={dmodel.Id}";
}
if (!string.IsNullOrWhiteSpace(dmodel.UserIds))
{
where += $@" and t.{nameof(RB_Member_User.Id)} in ({dmodel.UserIds})";
}
if (!string.IsNullOrEmpty(dmodel.Name))
{
where += $@" and t.{nameof(RB_Member_User.Name)} like '%{dmodel.Name}%'";
......@@ -1527,5 +1531,10 @@ FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId) as
";
return Get<RB_Member_MiaiUser_Extend>(sql).ToList();
}
}
}
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 54782cc6
......@@ -126,8 +126,9 @@ namespace Mall.WebApi.Controllers.MallBase
{
userInfo = new AppletUserInfo
{
UserId = 0,
MallBaseId = RequestParm.MallBaseId
UserId = RequestParm.UserId,
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId
};
}
var obj = miaiModule.GetActivityInfo(ActivityId, userInfo);
......@@ -695,7 +696,8 @@ namespace Mall.WebApi.Controllers.MallBase
x.Photo,
x.Sex,
x.ReplyContent,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm")
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
x.CreateBy
});
return ApiResult.Success("", pagelist);
}
......@@ -1041,9 +1043,11 @@ namespace Mall.WebApi.Controllers.MallBase
{
oldBaseInfo.AlbumList = new List<string>();
}
IsAttestation = 1;//已认证
IsAttestation = 2;//已认证
if (!string.IsNullOrWhiteSpace(oldBaseInfo.IDCard) && !string.IsNullOrWhiteSpace(oldBaseInfo.IDCardBack))
{
IsAttestation = 1;//已认证
}
}
else
{
......@@ -1058,6 +1062,7 @@ namespace Mall.WebApi.Controllers.MallBase
oldUserInfo.Name,
oldUserInfo.Photo,
IsAttestation,
IsFaTie = oldBaseInfo?.IsFaTie ?? 0,
IsFollow = isFollow,
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
......@@ -1488,13 +1493,13 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.Failed("请先实名认证");
}
if (string.IsNullOrWhiteSpace(oldBaseInfo.IDCard)|| string.IsNullOrWhiteSpace(oldBaseInfo.IDCardBack))
if (string.IsNullOrWhiteSpace(oldBaseInfo.IDCard) || string.IsNullOrWhiteSpace(oldBaseInfo.IDCardBack))
{
return ApiResult.Failed("请上传身份证信息");
return ApiResult.Failed("请上传身份证信息");
}
Rb_Education_Dynamic_Extend article = JsonConvert.DeserializeObject<Rb_Education_Dynamic_Extend>(req.msg.ToString());
article.Content = StringHelper.UrlDecode(article.Content);
if (string.IsNullOrWhiteSpace(article.Content) && (article.FileList == null || !article.FileList.Any()))
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 54782cc6
......@@ -743,7 +743,12 @@ namespace Mall.WebApi.Controllers.MallBase
x.PostId,
PostName = (x?.PostId ?? 0) == 1 ? "领队导游" : "",
UserPageTypeStr = x.UserPageType.GetEnumName(),
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.PointNum,
x.IsFaTie,
x.SuperiorName,
x.SuperiorId,
x.BaseInfoId
}); ;
return ApiResult.Success("", pagelist);
}
......@@ -833,13 +838,13 @@ namespace Mall.WebApi.Controllers.MallBase
case 9:
datarow.ExcelRows.Add(new ExcelColumn(value: item.MemberGradeName) { }); break;
case 10:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Age).ToString()+"岁") { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Age).ToString() + "岁") { }); break;
case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Height).ToString()+"CM") { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Height).ToString() + "CM") { }); break;
case 12:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Weight).ToString()+"KG") { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Weight).ToString() + "KG") { }); break;
case 13:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.YearMoney).ToString()+"万") { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item.YearMoney).ToString() + "万") { }); break;
case 14:
datarow.ExcelRows.Add(new ExcelColumn(value: ((item.CarInfo.HasValue && item.CarInfo.Value > 0) ? EnumHelper.GetEnumName(item.CarInfo) : "")) { }); break;
case 15:
......@@ -970,7 +975,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
}
}
return ApiResult.Success("", new
{
......@@ -1033,6 +1038,8 @@ namespace Mall.WebApi.Controllers.MallBase
IDCard = oldBaseInfo.IDCard ?? "",
IDCardNo = oldBaseInfo.IDCardNo ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
BaseInfoId = oldBaseInfo?.Id ?? 0,
IsFaTie = oldBaseInfo?.IsFaTie ?? 0
});
}
......@@ -1131,7 +1138,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed("请上传照片，至少2张");
}
bool flag = miaiModule.SetMemberUserInfoForHT(demodel);
if (flag)
{
......@@ -1146,6 +1153,48 @@ namespace Mall.WebApi.Controllers.MallBase
}
/// <summary>
/// 更新用户的发帖权限
/// </summary>
/// <returns></returns>
public ApiResult UpdateFaTie()
{
var parms = RequestParm;
JObject parm = JObject.Parse(parms.msg.ToString());
// var userInfo = AppletUserInfo;
string userIds = parm.GetStringValue("UserIds");
int IsFaTie = parm.GetInt("IsFaTie");
bool retult = miaiModule.UpdateFaTie(userIds, IsFaTie);
return retult ? ApiResult.Success("发帖权限修改成功") : ApiResult.Failed("发帖权限修改失败");
}
/// <summary>
/// 更新用户的点数
/// </summary>
/// <returns></returns>
public ApiResult UpdatePointNum()
{
var parms = RequestParm;
JObject parm = JObject.Parse(parms.msg.ToString());
// var userInfo = AppletUserInfo;
int userId = parm.GetInt("UserId");
int isAdd = parm.GetInt("IsAdd");//1-新增，2-减少
int ponitNum = parm.GetInt("PonitNum");
if (isAdd == 2)
{
//判断是否够扣除部分
var model = miaiModule.GetMemberUserInfo(userId);
if (model.PointNum < ponitNum)
{
return ApiResult.Failed("当前星星币：" + model.PointNum);
}
}
bool retult = pointModule.ManageUpdatePoint(userId, ponitNum, isAdd);
return retult ? ApiResult.Success("星星币修改成功") : ApiResult.Failed("星星币修改失败");
}
#endregion
......
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