1

Mall.Model/Entity/Miai/RB_Miai_Log.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Miai
+{
+    /// <summary>
+    /// 相亲修改日志信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miai_Log
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 来源id
+        /// </summary>        
+        public int? SourceId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id/分销商id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型   1操作招募贴   2操作贴评论
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作内容
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作员工
+        /// </summary>
+        public int? EmpId { get; set; }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Module.Miai/MiaiModule.cs

@@ -23,6 +23,7 @@ namespace Mall.Module.Miai
         private readonly RB_Miai_ActivityRepository miai_ActivityRepository = new RB_Miai_ActivityRepository();
         private readonly RB_Miai_ActivityEnrollRepository miai_ActivityEnrollRepository = new RB_Miai_ActivityEnrollRepository();
         private readonly RB_Miai_ActivityDiscussRepository miai_ActivityDiscussRepository = new RB_Miai_ActivityDiscussRepository();
+        private readonly RB_Miai_LogRepository miai_LogRepository = new RB_Miai_LogRepository();
 
 
         private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository();
@@ -278,6 +279,20 @@ namespace Mall.Module.Miai
                 }
             };
             bool flag = miai_ActivityRepository.Update(keyValues, wheres);
+            if (flag) {
+                miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log()
+                {
+                    Id = 0,
+                    Type = 1,
+                    SourceId = activityId,
+                    UserId = userInfo.UserId,
+                    Content = "用户自行删除招募贴",
+                    EmpId = 0,
+                    TenantId = userInfo.TenantId,
+                    MallBaseId = userInfo.MallBaseId,
+                    CreateDate = DateTime.Now
+                });
+            }
             return flag ? "" : "出错了，请联系管理员";
         }
 
@@ -287,7 +302,7 @@ namespace Mall.Module.Miai
         /// <param name="activityId"></param>
         /// <param name="empId"></param>
         /// <returns></returns>
-        public string DelActivityInfo_V2(int activityId, int empId)
+        public string DelActivityInfo_V2(int activityId, int empId, int TenantId, int MallBaseId)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Miai_Activity_Extend.Status),1},
@@ -301,6 +316,21 @@ namespace Mall.Module.Miai
                 }
             };
             bool flag = miai_ActivityRepository.Update(keyValues, wheres);
+            if (flag)
+            {
+                miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log()
+                {
+                    Id = 0,
+                    Type = 1,
+                    SourceId = activityId,
+                    UserId = 0,
+                    Content = "后台删除招募贴",
+                    EmpId = empId,
+                    TenantId = TenantId,
+                    MallBaseId = MallBaseId,
+                    CreateDate = DateTime.Now
+                });
+            }
             return flag ? "" : "出错了，请联系管理员";
         }
 
@@ -418,6 +448,21 @@ namespace Mall.Module.Miai
                 }
             };
             bool flag = miai_ActivityDiscussRepository.Update(keyValues, wheres);
+            if (flag)
+            {
+                miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log()
+                {
+                    Id = 0,
+                    Type = 2,
+                    SourceId = discussId,
+                    UserId = userInfo.UserId,
+                    Content = "用户自行删除评论",
+                    EmpId = 0,
+                    TenantId = userInfo.TenantId,
+                    MallBaseId = userInfo.MallBaseId,
+                    CreateDate = DateTime.Now
+                });
+            }
             return flag ? "" : "出错了，请联系管理员";
         }
 
@@ -427,7 +472,7 @@ namespace Mall.Module.Miai
         /// <param name="discussId"></param>
         /// <param name="empId"></param>
         /// <returns></returns>
-        public string DelActivityDiscussInfo_V2(int discussId, int empId)
+        public string DelActivityDiscussInfo_V2(int discussId, int empId,int TenantId,int MallBaseId)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Miai_ActivityDiscuss_Extend.Status),1},
@@ -441,6 +486,21 @@ namespace Mall.Module.Miai
                 }
             };
             bool flag = miai_ActivityDiscussRepository.Update(keyValues, wheres);
+            if (flag)
+            {
+                miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log()
+                {
+                    Id = 0,
+                    Type = 2,
+                    SourceId = discussId,
+                    UserId = 0,
+                    Content = "用户自行删除评论",
+                    EmpId = empId,
+                    TenantId = TenantId,
+                    MallBaseId = MallBaseId,
+                    CreateDate = DateTime.Now
+                });
+            }
             return flag ? "" : "出错了，请联系管理员";
         }
 

Mall.Repository/Miai/RB_Miai_LogRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Miai;
+using Mall.Model.Extend.Miai;
+using System.Linq;
+
+namespace Mall.Repository.Miai
+{
+    /// <summary>
+    /// 相亲日志仓储层
+    /// </summary>
+    public class RB_Miai_LogRepository : BaseRepository<RB_Miai_Log>
+    {
+
+    }
+}

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -119,10 +119,6 @@ namespace Mall.WebApi.Controllers.MallBase
             var parms = RequestParm;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
-            if (demodel.ForumId <= 0)
-            {
-                return ApiResult.ParamIsNull("请传递版块id");
-            }
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
@@ -175,7 +171,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull();
             }
 
-            string msg = miaiModule.DelActivityInfo_V2(ActivityId, RequestParm.EmpId);
+            string msg = miaiModule.DelActivityInfo_V2(ActivityId, RequestParm.EmpId, RequestParm.TenantId, RequestParm.MallBaseId);
             if (msg == "")
             {
                 return ApiResult.Success();
@@ -276,7 +272,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull();
             }
 
-            string msg = miaiModule.DelActivityDiscussInfo_V2(DiscussId, RequestParm.EmpId);
+            string msg = miaiModule.DelActivityDiscussInfo_V2(DiscussId, RequestParm.EmpId, RequestParm.TenantId, RequestParm.MallBaseId);
             if (msg == "")
             {
                 return ApiResult.Success();