提交代码

Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs

@@ -101,7 +101,10 @@ namespace Mall.Model.Entity.Miai
         /// 年收入
         /// </summary>
         public decimal YearMoney { get; set; }
-
+        /// <summary>
+        /// 年收入
+        /// </summary>
+        public YearMoneyTypeEnum? YearMoneyType { get; set; }
 
         /// <summary>
         /// 国家
@@ -302,5 +305,10 @@ namespace Mall.Model.Entity.Miai
         }
 
         public int IsFaTie { get; set; }
+
+        /// <summary>
+        /// 行业
+        /// </summary>
+        public string Industry { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -3660,6 +3660,12 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string Education { get; set; }
 
+
+        /// <summary>
+        /// 行业
+        /// </summary>
+        public string Industry { get; set; }
+
         /// <summary>
         /// 婚姻状态
         /// </summary>
@@ -3670,6 +3676,22 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int Score { get; set; }
 
+        /// <summary>
+        /// 是否已认证，0-未认证，1-已认证
+        /// </summary>
+        public int Authentication { get; set; }
+
+        /// <summary>
+        /// 年收入
+        /// </summary>
+        public string YearMoneyTypeStr { get; set; }
+
+        public string IDCardNo { get; set; }
+
+        /// <summary>
+        /// 身高
+        /// </summary>
+        public decimal Height { get; set; }
         /// <summary>
         /// 相册
         /// </summary>

Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs

@@ -12,7 +12,7 @@ namespace Mall.Model.Extend.Miai
         /// </summary>
         public List<string> AlbumList { get; set; }
 
-     
+
         public string Name { get; set; }
 
 
@@ -81,6 +81,13 @@ namespace Mall.Model.Extend.Miai
         /// 车
         /// </summary>
         public string CarInfoStr { get; set; }
+        /// <summary>
+        /// 年收入信息
+        /// </summary>
+        public string YearMoneyTypeStr { get; set; }
+
+
+
 
         /// <summary>
         /// 房信息

Mall.Module.Miai/MiaiModule.cs

@@ -1618,6 +1618,8 @@ namespace Mall.Module.Miai
                               { nameof(RB_MiAi_BaseInfo_Extend.DWCity),model.DWCity},
                         { nameof(RB_MiAi_BaseInfo_Extend.DWProvince),model.DWProvince},
                         { nameof(RB_MiAi_BaseInfo_Extend.DWDistrict),model.DWDistrict},
+                         { nameof(RB_MiAi_BaseInfo_Extend.Industry),model.Industry},
+                        { nameof(RB_MiAi_BaseInfo_Extend.YearMoneyType),model.YearMoneyType},
                     };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
                         new WhereHelper(){

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -45,7 +45,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetForumList()
         {
             var req = base.RequestParm;
@@ -69,7 +70,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetActivityPageList()
         {
             var parms = RequestParm;
@@ -132,7 +134,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetActivityInfo()
         {
             var userInfo = AppletUserInfo;
@@ -334,7 +337,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetSimpleActivityPageList()
         {
             var parms = RequestParm;
@@ -573,7 +577,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetActivityDiscussPageList()
         {
             var parms = RequestParm;
@@ -598,7 +603,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 x.Id,
                 x.UserId,
-                UserName= !string.IsNullOrWhiteSpace(x.CreateByUserName) ? x.CreateByUserName : x.UserName,
+                UserName = !string.IsNullOrWhiteSpace(x.CreateByUserName) ? x.CreateByUserName : x.UserName,
                 x.Photo,
                 x.Sex,
                 x.Content,
@@ -634,7 +639,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetActivityDiscussCount()
         {
             var parms = RequestParm;
@@ -669,7 +675,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetActivityReplyPageList()
         {
             var parms = RequestParm;
@@ -1223,10 +1230,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("请选择学历");
@@ -1270,7 +1277,8 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         [HttpPost]
         public ApiResult GetMiAiBaseIfo()
         {
@@ -1399,6 +1407,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) : "",
+                        YearMoneyType = oldBaseInfo.YearMoneyType ?? 0,
+                        Industry = oldBaseInfo.Industry ?? "",
                         Marriage = oldBaseInfo.Marriage ?? 0,
                         Job = oldBaseInfo.Job ?? "",
                         WorkUnit = oldBaseInfo?.WorkUnit ?? "",
@@ -1460,7 +1471,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// 获取会员基础信息
         /// </summary>
         /// <returns></returns>
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         [HttpPost]
         public ApiResult GetBaseInfoPageList()
         {
@@ -1532,6 +1544,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     lastItem.Age = tempGood.Age.ToString();
                     lastItem.Marriage = (tempGood.Marriage.HasValue && tempGood.Marriage.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.Marriage) : "";
                     lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
+                    lastItem.YearMoneyTypeStr = (tempGood.YearMoneyType.HasValue && tempGood.YearMoneyType.Value > 0) ? EnumHelper.GetEnumName(tempGood.YearMoneyType) : "";
+                    lastItem.Industry = tempGood.Industry ?? "";
                     lastItem.Score = 0;
                     lastItem.Album = tempGood.Album;
                     if (!string.IsNullOrWhiteSpace(lastItem.Album))
@@ -1552,7 +1566,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// 获取会员基础信息
         /// </summary>
         /// <returns></returns>
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         [HttpPost]
         public ApiResult GetBaseInfoQueryList()
         {
@@ -1641,12 +1656,27 @@ namespace Mall.WebApi.Controllers.MallBase
                 Id = Convert.ToInt32(x.Value)
             }));
         }
+        /// <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>
         /// 获取每日随机信息
         /// </summary>
         /// <returns></returns>
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         [HttpPost]
         public ApiResult GetDailyRandomList()
         {
@@ -1724,6 +1754,20 @@ namespace Mall.WebApi.Controllers.MallBase
                     lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
                     lastItem.Score = 0;
                     lastItem.Album = tempGood.Album;
+                    lastItem.Height = tempGood.Height;
+                    lastItem.Industry = tempGood.Industry;
+                    if (!string.IsNullOrWhiteSpace(tempGood.IDCardNo))
+                    {
+                        lastItem.Authentication = 1;
+                        if (tempGood.IDCardNo.Length == 18)
+                        {
+                            lastItem.IDCardNo = tempGood.IDCardNo.Substring(8, 2);
+                        }
+                        else if (tempGood.IDCardNo.Length == 15)
+                        {
+                            lastItem.IDCardNo = tempGood.IDCardNo.Substring(6, 2);
+                        }
+                    }
                     if (!string.IsNullOrWhiteSpace(lastItem.Album))
                     {
                         lastItem.AlbumList = JsonConvert.DeserializeObject<List<string>>(lastItem.Album);

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -689,6 +689,9 @@ namespace Mall.WebApi.Controllers.MallBase
                         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,
+                        YearMoneyTypeStr = (oldBaseInfo.YearMoneyType.HasValue && oldBaseInfo.YearMoneyType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.YearMoneyType) : "",
+                        YearMoneyType = oldBaseInfo.YearMoneyType ?? 0,
+                        Industry = oldBaseInfo.Industry ?? "",
                         Job = oldBaseInfo.Job ?? "",
                         WorkUnit = oldBaseInfo?.WorkUnit ?? "",
                         YearMoney = oldBaseInfo?.YearMoney ?? 0,