提交代码

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -355,7 +355,7 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult SgetActivityDiscussInfo()
         {
             var parms = RequestParm;
-           
+
             RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
             if (demodel.ActivityId <= 0)
             {
@@ -365,7 +365,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请输入用户名称");
             }
-           
+
             if (string.IsNullOrEmpty(demodel.Content))
             {
                 return ApiResult.ParamIsNull("请传递内容");
@@ -375,7 +375,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             demodel.Status = 0;
-           // demodel.CreateDate = DateTime.Now;
+            // demodel.CreateDate = DateTime.Now;
             demodel.UpdateDate = DateTime.Now;
             bool flag = miaiModule.SetActivityDiscussInfo(demodel);
             if (flag)
@@ -1043,7 +1043,20 @@ namespace Mall.WebApi.Controllers.MallBase
             }));
         }
 
-
+        /// <summary>
+        /// 获取年收入枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetYearMoneyTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.MiAi.YearMoneyTypeEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
 
 
         /// <summary>
@@ -1126,6 +1139,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 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) : "",
+                YearMoneyTypeStr = (oldBaseInfo.YearMoneyType.HasValue && oldBaseInfo.YearMoneyType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.YearMoneyType) : "",
+                Industry = oldBaseInfo.Industry ?? "",
+                YearMoneyType = oldBaseInfo.YearMoneyType ?? 0,
                 Marriage = oldBaseInfo.Marriage ?? 0,
                 Job = oldBaseInfo.Job ?? "",
                 WorkUnit = oldBaseInfo?.WorkUnit ?? "",
@@ -1236,10 +1252,10 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Failed("请选择定位省市区");
             }
-            if (baseInfo.YearMoney == 0)
-            {
-                return ApiResult.Failed("请输入年收入");
-            }
+            //if (baseInfo.YearMoney == 0)
+            //{
+            //    return ApiResult.Failed("请输入年收入");
+            //}
             if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
             {
                 return ApiResult.Failed("请选择学历");

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -543,10 +543,10 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.Failed("请选择身高");
             }
-            if (baseInfo.YearMoney == 0)
-            {
-                return ApiResult.Failed("请输入年收入");
-            }
+            //if (baseInfo.YearMoney == 0)
+            //{
+            //    return ApiResult.Failed("请输入年收入");
+            //}
             if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
             {
                 return ApiResult.Failed("请选择学历");