Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents dce20310 71f15f2e
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 199 deletions
Mall.Module.TradePavilion/CustomFormModule.cs
View file @ 29e0f1b4
......@@ -260,7 +260,7 @@ namespace Mall.Module.TradePavilion
};
if (selectItem.IsMultiple)
{
List<string> valueList = JsonHelper.DeserializeObject<List<string>>(dropdownObj.GetStringValue("OptionValue"));
List<int> valueList = Common.ConvertHelper.StringToList(dropdownObj.GetStringValue("OptionValue").Split(','));
if (valueList != null && valueList.Count > 0)
{
selectItem.OptionValue = string.Join(",", valueList);
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 29e0f1b4
......@@ -1291,153 +1291,160 @@ namespace Mall.WebApi.Controllers.MallBase
};
}
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = RequestParm.TenantId, MallBaseId = RequestParm.MallBaseId });
if (userInfo != null && userInfo.UserId > 0)
if (userId > 0)
{
var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userId, CreateBy = userInfo.UserId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
var oldOtherList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userInfo.UserId, CreateBy = userId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = RequestParm.TenantId, MallBaseId = RequestParm.MallBaseId });
if (userId != userInfo.UserId)
if (userInfo != null && userInfo.UserId > 0)
{
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{
oldBaseInfo.WechatNo = "";
}
oldUserInfo.Moblie = "";
if (oldList != null && oldList.Any() && oldOtherList != null && oldOtherList.Any())
{
isFollow = 3;
MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
}
else if (oldList != null && oldList.Any())
{
isFollow = 1;
MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
}
else if (oldOtherList != null && oldOtherList.Any())
{
isFollow = 2;
OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
}
else
{
isFollow = 0;
}
var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userId, CreateBy = userInfo.UserId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
var oldOtherList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userInfo.UserId, CreateBy = userId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
if (userId != userInfo.UserId)
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.Look,
UserId = userId,
SourceId = userId,
Content = "用户访问了您的自画像",
Status = 0,
TenantId = RequestParm.TenantId,
MallBaseId = RequestParm.MallBaseId,
CreateBy = userInfo.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{
oldBaseInfo.WechatNo = "";
}
oldUserInfo.Moblie = "";
if (oldList != null && oldList.Any() && oldOtherList != null && oldOtherList.Any())
{
isFollow = 3;
MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
}
else if (oldList != null && oldList.Any())
{
isFollow = 1;
MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
}
else if (oldOtherList != null && oldOtherList.Any())
{
isFollow = 2;
OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
}
else
{
isFollow = 0;
}
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
Id = 0,
Type = Common.Enum.MiAi.MessageTypeEnum.Look,
UserId = userId,
SourceId = userId,
Content = "用户访问了您的自画像",
Status = 0,
TenantId = RequestParm.TenantId,
MallBaseId = RequestParm.MallBaseId,
CreateBy = userInfo.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
}
if (oldUserInfo != null && oldUserInfo.Id > 0)
{
int IsAttestation = 0;
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
if (oldUserInfo != null && oldUserInfo.Id > 0)
{
oldBaseInfo.AlbumList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
int IsAttestation = 0;
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
oldBaseInfo.AlbumList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
}
else
{
oldBaseInfo.AlbumList = new List<string>();
}
IsAttestation = 2;//基础信息认证
if (!string.IsNullOrWhiteSpace(oldBaseInfo.IDCardNo) && !string.IsNullOrWhiteSpace(oldBaseInfo.RealName))
{
IsAttestation = 1;//已认证
}
}
else
{
oldBaseInfo.AlbumList = new List<string>();
oldBaseInfo = new RB_MiAi_BaseInfo_Extend();
}
IsAttestation = 2;//基础信息认证
if (!string.IsNullOrWhiteSpace(oldBaseInfo.IDCardNo) && !string.IsNullOrWhiteSpace(oldBaseInfo.RealName))
var result = new
{
IsAttestation = 1;//已认证
}
MyFollowId,
OtherFollowId,
oldUserInfo.Id,
oldUserInfo.Name,
oldUserInfo.Photo,
WechatNo = oldBaseInfo.WechatNo ?? "",
Moblie = oldUserInfo.Moblie ?? "",
IsAttestation,
IsFaTie = oldBaseInfo?.IsFaTie ?? 0,
IsFollow = isFollow,
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
BirthdayYear = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : Convert.ToDateTime(oldBaseInfo.Birthday).Year.ToString(),
Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
EducationType = oldBaseInfo.EducationType ?? 0,
EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo?.YearMoney ?? 0,
CName = oldBaseInfo.CName ?? "",
DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
OtherInfo = oldBaseInfo.OtherInfo ?? "",
HouseInfo = oldBaseInfo.HouseInfo ?? 0,
CarInfo = oldBaseInfo.CarInfo ?? 0,
CarInfoStr = (oldBaseInfo.CarInfo.HasValue && oldBaseInfo.CarInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.CarInfo) : "",
HouseInfoStr = (oldBaseInfo.HouseInfo.HasValue && oldBaseInfo.HouseInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.HouseInfo) : "",
FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
Hobby = oldBaseInfo?.Hobby ?? "",
LikeFood = oldBaseInfo?.LikeFood ?? "",
LikeBook = oldBaseInfo.LikeBook ?? "",
LikeTV = oldBaseInfo.LikeTV ?? "",
LikeSong = oldBaseInfo.LikeSong ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList,
IDCardBack = oldBaseInfo.IDCardBack ?? "",
IDCard = oldBaseInfo.IDCard ?? "",
IDCardNo = oldBaseInfo.IDCardNo ?? "",
RealName = oldBaseInfo.RealName ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
DWCName = oldBaseInfo.DWCName ?? "",
DWDName = oldBaseInfo.DWDName ?? "",
DWPName = oldBaseInfo.DWPName ?? "",
DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0,
};
return ApiResult.Success("", result);
}
else
{
oldBaseInfo = new RB_MiAi_BaseInfo_Extend();
return ApiResult.Failed("用户信息不存在");
}
var result = new
{
MyFollowId,
OtherFollowId,
oldUserInfo.Id,
oldUserInfo.Name,
oldUserInfo.Photo,
WechatNo = oldBaseInfo.WechatNo ?? "",
Moblie = oldUserInfo.Moblie ?? "",
IsAttestation,
IsFaTie = oldBaseInfo?.IsFaTie ?? 0,
IsFollow = isFollow,
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
BirthdayYear = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : Convert.ToDateTime(oldBaseInfo.Birthday).Year.ToString(),
Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
EducationType = oldBaseInfo.EducationType ?? 0,
EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo?.YearMoney ?? 0,
CName = oldBaseInfo.CName ?? "",
DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
OtherInfo = oldBaseInfo.OtherInfo ?? "",
HouseInfo = oldBaseInfo.HouseInfo ?? 0,
CarInfo = oldBaseInfo.CarInfo ?? 0,
CarInfoStr = (oldBaseInfo.CarInfo.HasValue && oldBaseInfo.CarInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.CarInfo) : "",
HouseInfoStr = (oldBaseInfo.HouseInfo.HasValue && oldBaseInfo.HouseInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.HouseInfo) : "",
FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
Hobby = oldBaseInfo?.Hobby ?? "",
LikeFood = oldBaseInfo?.LikeFood ?? "",
LikeBook = oldBaseInfo.LikeBook ?? "",
LikeTV = oldBaseInfo.LikeTV ?? "",
LikeSong = oldBaseInfo.LikeSong ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList,
IDCardBack = oldBaseInfo.IDCardBack ?? "",
IDCard = oldBaseInfo.IDCard ?? "",
IDCardNo = oldBaseInfo.IDCardNo ?? "",
RealName = oldBaseInfo.RealName ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
DWCName = oldBaseInfo.DWCName ?? "",
DWDName = oldBaseInfo.DWDName ?? "",
DWPName = oldBaseInfo.DWPName ?? "",
DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0,
};
return ApiResult.Success("", result);
}
else
{
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 29e0f1b4
......@@ -657,81 +657,88 @@ namespace Mall.WebApi.Controllers.MallBase
JObject parm = JObject.Parse(parms.msg.ToString());
// var userInfo = AppletUserInfo;
int userId = parm.GetInt("UserId");
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = UserInfo.TenantId, MallBaseId = UserInfo.MallBaseId });
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
if (userId > 0)
{
oldBaseInfo.AlbumList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = UserInfo.TenantId, MallBaseId = UserInfo.MallBaseId });
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
}
oldBaseInfo.AlbumList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
{
oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
}
var result = new
var result = new
{
oldUserInfo.Id,
oldUserInfo.Name,
oldUserInfo.Photo,
WechatNo = oldBaseInfo.WechatNo ?? "",
Moblie = oldUserInfo.Moblie ?? "",
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
EducationType = oldBaseInfo.EducationType ?? 0,
EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo?.YearMoney ?? 0,
CName = oldBaseInfo.CName ?? "",
DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
OtherInfo = oldBaseInfo.OtherInfo ?? "",
HouseInfo = oldBaseInfo.HouseInfo ?? 0,
CarInfo = oldBaseInfo.CarInfo ?? 0,
CarInfoStr = (oldBaseInfo.CarInfo.HasValue && oldBaseInfo.CarInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.CarInfo) : "",
HouseInfoStr = (oldBaseInfo.HouseInfo.HasValue && oldBaseInfo.HouseInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.HouseInfo) : "",
FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
Hobby = oldBaseInfo?.Hobby ?? "",
LikeFood = oldBaseInfo?.LikeFood ?? "",
LikeBook = oldBaseInfo.LikeBook ?? "",
LikeTV = oldBaseInfo.LikeTV ?? "",
LikeSong = oldBaseInfo.LikeSong ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList,
IDCardNo = oldBaseInfo.IDCardNo ?? "",
RealName = oldBaseInfo.RealName ?? "",
IDCard = oldBaseInfo.IDCard ?? "",
IDCardBack = oldBaseInfo.IDCardBack ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
DWCName = oldBaseInfo.DWCName ?? "",
DWDName = oldBaseInfo.DWDName ?? "",
DWPName = oldBaseInfo.DWPName ?? "",
DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0,
};
return ApiResult.Success("", result);
}
else
{
oldUserInfo.Id,
oldUserInfo.Name,
oldUserInfo.Photo,
WechatNo = oldBaseInfo.WechatNo ?? "",
Moblie = oldUserInfo.Moblie ?? "",
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
EducationType = oldBaseInfo.EducationType ?? 0,
EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo?.YearMoney ?? 0,
CName = oldBaseInfo.CName ?? "",
DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
OtherInfo = oldBaseInfo.OtherInfo ?? "",
HouseInfo = oldBaseInfo.HouseInfo ?? 0,
CarInfo = oldBaseInfo.CarInfo ?? 0,
CarInfoStr = (oldBaseInfo.CarInfo.HasValue && oldBaseInfo.CarInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.CarInfo) : "",
HouseInfoStr = (oldBaseInfo.HouseInfo.HasValue && oldBaseInfo.HouseInfo.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.HouseInfo) : "",
FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
Hobby = oldBaseInfo?.Hobby ?? "",
LikeFood = oldBaseInfo?.LikeFood ?? "",
LikeBook = oldBaseInfo.LikeBook ?? "",
LikeTV = oldBaseInfo.LikeTV ?? "",
LikeSong = oldBaseInfo.LikeSong ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList,
IDCardNo = oldBaseInfo.IDCardNo ?? "",
RealName = oldBaseInfo.RealName ?? "",
IDCard = oldBaseInfo.IDCard ?? "",
IDCardBack = oldBaseInfo.IDCardBack ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
DWCName = oldBaseInfo.DWCName ?? "",
DWDName = oldBaseInfo.DWDName ?? "",
DWPName = oldBaseInfo.DWPName ?? "",
DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0,
};
return ApiResult.Success("", result);
return ApiResult.Failed("用户暂未认证");
}
}
else
{
return ApiResult.Failed("用户暂未认证");
return ApiResult.Failed("用户信息不存在!");
}
}
......
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @ 29e0f1b4
......@@ -262,8 +262,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
attr_group_name = smodel.Name,
attr_group_id = smodel.Sort,
attr_id = svmodel.Id,
attr_name = svmodel.Name
attr_id = svmodel?.Id ?? 0,
attr_name = svmodel?.Name ?? ""
});
}
decimal price_member = item.SellingPrice ?? 0;//未设会员价格的话 就为销售价格
......
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