帖子功能调整

Mall.Model/Entity/Miai/RB_Miai_Activity.cs

@@ -98,5 +98,40 @@ namespace Mall.Model.Entity.Miai
             get;
             set;
         }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string Label { get; set; }
+
+        /// <summary>
+        /// 活动开始时间
+        /// </summary>
+        public DateTime StartTime { get; set; }
+
+        /// <summary>
+        /// 活动结束时间
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 男数量
+        /// </summary>
+        public int ManNum { get; set; }
+
+        /// <summary>
+        /// 女数量
+        /// </summary>
+        public int WoManNum { get; set; }
+
+        /// <summary>
+        /// 经纬度（逗号分隔）
+        /// </summary>
+        public string LonLat { get; set; }
+
+        /// <summary>
+        /// 位置名称
+        /// </summary>
+        public string LocationName { get; set; }
     }
 }

Mall.Model/Entity/Miai/RB_Miai_ActivityEnroll.cs

@@ -89,5 +89,10 @@ namespace Mall.Model.Entity.Miai
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 性别  1男  2女
+        /// </summary>
+        public int Sex { get; set; }
     }
 }

Mall.Model/Extend/Miai/RB_Miai_ActivityEnroll_Extend.cs

@@ -23,11 +23,6 @@ namespace Mall.Model.Extend.Miai
         /// </summary>
         public string Photo { get; set; }
 
-        /// <summary>
-        /// 性别  1男   2女
-        /// </summary>
-        public int Sex { get; set; }
-
         /// <summary>
         /// 是否关注  1是  2否
         /// </summary>

Mall.Module.Miai/MiaiModule.cs

@@ -199,7 +199,9 @@ namespace Mall.Module.Miai
             var model = miai_ActivityRepository.GetEntity(activityId);
             if (model == null) { return ""; }
             //获取活动报名人数
-            int PeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId);
+            int ManENum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId, 1);
+            int WoManENum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId, 1);
+            int PeopleNum = ManENum + WoManENum;
             //获取当前用户是否已报名
             bool IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
             //查询活动回复数量
@@ -224,6 +226,15 @@ namespace Mall.Module.Miai
                 umodel.Photo,
                 Sex,
                 model.IsOpenEnroll,
+                model.Label,
+                StartTime = model.StartTime.ToString("yyyy-MM-dd HH:mm"),
+                EndTime = model.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                model.ManNum,
+                ManENum,
+                model.WoManNum,
+                WoManENum,
+                model.LonLat,
+                model.LocationName,
                 Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 PeopleNum,
@@ -259,6 +270,13 @@ namespace Mall.Module.Miai
                 UserName = umodel.Name,
                 umodel.Photo,
                 model.IsOpenEnroll,
+                model.Label,
+                StartTime = model.StartTime.ToString("yyyy-MM-dd HH:mm"),
+                EndTime = model.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                model.ManNum,
+                model.WoManNum,
+                model.LonLat,
+                model.LocationName,
                 Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 PeopleNum,
@@ -271,19 +289,31 @@ namespace Mall.Module.Miai
         /// </summary>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public bool SetActivityInfo(RB_Miai_Activity_Extend demodel)
+        public bool SetActivityInfo(RB_Miai_Activity_Extend demodel, out string msg)
         {
+            msg = "";
             if (demodel.Id > 0)
             {
                 var model = miai_ActivityRepository.GetEntity(demodel.Id);
-                if (model == null || model.Status == 1) { return false; }
-                if (model.UserId != demodel.UserId) { return false; }
+                if (model == null || model.Status == 1) { msg = "活动不存在"; return false; }
+                if (model.UserId != demodel.UserId) { msg = "无法修改活动"; return false; }
+                int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 1);
+                int WoManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 2);
+                if (demodel.ManNum < ManPeopleNum) { msg = "男已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
+                if (demodel.WoManNum < WoManPeopleNum) { msg = "女已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Miai_Activity_Extend.ActivityTitle),demodel.ActivityTitle},
                     { nameof(RB_Miai_Activity_Extend.Content),demodel.Content},
                     { nameof(RB_Miai_Activity_Extend.Images),demodel.Images},
                     { nameof(RB_Miai_Activity_Extend.IsOpenEnroll),demodel.IsOpenEnroll},
                     { nameof(RB_Miai_Activity_Extend.Deadline),demodel.Deadline},
+                    { nameof(RB_Miai_Activity_Extend.Label),demodel.Label},
+                    { nameof(RB_Miai_Activity_Extend.StartTime),demodel.StartTime},
+                    { nameof(RB_Miai_Activity_Extend.EndTime),demodel.EndTime},
+                    { nameof(RB_Miai_Activity_Extend.ManNum),demodel.ManNum},
+                    { nameof(RB_Miai_Activity_Extend.WoManNum),demodel.WoManNum},
+                    { nameof(RB_Miai_Activity_Extend.LonLat),demodel.LonLat},
+                    { nameof(RB_Miai_Activity_Extend.LocationName),demodel.LocationName},
                     { nameof(RB_Miai_Activity_Extend.UpdateDate),demodel.UpdateDate}
                 };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -615,6 +645,21 @@ namespace Mall.Module.Miai
             {
                 return "已过了报名时间，无法报名";
             }
+            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)
+            {
+                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 "性别未维护，无法报名";
+            }
             bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
             return flag ? "" : "出错了，请联系管理员";
         }

Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs

@@ -42,9 +42,8 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.Id)} ={dmodel.Id}";
             }
-            string sql = $@"select e.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_ActivityEnroll e
+            string sql = $@"select e.*,u.Name as UserName,u.Photo from RB_Miai_ActivityEnroll e
 left join rb_member_user u on e.UserId = u.Id
-left join rb_miai_baseinfo b on e.UserId =b.UserId
 where {where} order by e.Id desc";
             return GetPage<RB_Miai_ActivityEnroll_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
@@ -82,9 +81,12 @@ where {where} order by e.Id desc";
         /// </summary>
         /// <param name="activityId"></param>
         /// <returns></returns>
-        public int GetActivityEnrollNum(int activityId)
+        public int GetActivityEnrollNum(int activityId, int sex =0)
         {
             string sql = $@" select count(0) from RB_Miai_ActivityEnroll where Status =0 and ActivityId ={activityId}";
+            if (sex > 0) {
+                sql += $@" and Sex ={sex}";
+            }
             var obj = ExecuteScalar(sql);
             return obj == null ? 0 : Convert.ToInt32(obj);
         }

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -91,6 +91,13 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ReplyNum,
                 x.EnrollNum,
                 x.IsOpenEnroll,
+                x.Label,
+                StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm"),
+                EndTime = x.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                x.ManNum,
+                x.WoManNum,
+                x.LonLat,
+                x.LocationName,
                 x.ForumId,
                 x.ForumName,
                 x.ForumIcon,
@@ -200,14 +207,14 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UserId = userInfo.UserId;
             demodel.CreateDate = DateTime.Now;
             demodel.UpdateDate = DateTime.Now;
-            bool flag = miaiModule.SetActivityInfo(demodel);
+            bool flag = miaiModule.SetActivityInfo(demodel, out string msg);
             if (flag)
             {
                 return ApiResult.Success();
             }
             else
             {
-                return ApiResult.Failed();
+                return ApiResult.Failed(msg);
             }
         }
 

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -141,6 +141,13 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ReplyNum,
                 x.EnrollNum,
                 x.IsOpenEnroll,
+                x.Label,
+                StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm"),
+                EndTime = x.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                x.ManNum,
+                x.WoManNum,
+                x.LonLat,
+                x.LocationName,
                 Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
@@ -320,6 +327,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.Mobile,
                 x.PeopleNum,
                 x.Remark,
+                x.Sex,
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pagelist);