Commit 4e4c4895 authored by 吴春's avatar 吴春

提交代码

parent 35bce0c6
......@@ -1329,7 +1329,6 @@ namespace Mall.WebApi.Controllers
TenantId = TenantId,
MallBaseId = MallBaseId,
UserIds = Ids,
Sex = Sex,
UserId = UserId
});
List<miaiUserDetail> newGoodsList = new List<miaiUserDetail>();
......
......@@ -375,16 +375,20 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetMiaiDatingInfo() {
public ApiResult SetMiaiDatingInfo()
{
var req = base.RequestParm;
RB_Miai_Dating_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Dating_Extend>(req.msg.ToString());
if (demodel.ManId <= 0) {
if (demodel.ManId <= 0)
{
return ApiResult.ParamIsNull("请选择男方");
}
if (demodel.WoManId <= 0) {
if (demodel.WoManId <= 0)
{
return ApiResult.ParamIsNull("请选择女方");
}
if (string.IsNullOrEmpty(demodel.Address)) {
if (string.IsNullOrEmpty(demodel.Address))
{
return ApiResult.ParamIsNull("请输入约见地址");
}
......@@ -410,11 +414,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelMiaiDatingInfo() {
public ApiResult DelMiaiDatingInfo()
{
var req = base.RequestParm;
var parms = JObject.Parse(req.msg.ToString());
int DatingId = parms.GetInt("DatingId", 0);
if (DatingId <= 0) {
if (DatingId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -634,7 +640,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.Height,
x.Weight,
EducationType = EnumHelper.GetEnumName(x.EducationType),
Marriage = EnumHelper.GetEnumName(x.Marriage)
Marriage = EnumHelper.GetEnumName(x.Marriage),
x.Album,
AlbumList = string.IsNullOrWhiteSpace(x.Album) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.Album)
});
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