提交代码

Mall.Model/Entity/Miai/RB_MiAi_DianZan.cs

+using Mall.Common.Enum.GuideCar;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 评论/拼拼plus的点赞
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiAi_DianZan
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+
+        /// <summary>
+        /// 拼拼plusId
+        /// </summary>
+        public int ActivityId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 拼拼plus评论的id
+        /// </summary>
+        public int ActivityDiscussId { get; set; }
+
+    }
+}

Mall.Model/Entity/Miai/RB_Miai_Activity.cs

@@ -107,12 +107,12 @@ namespace Mall.Model.Entity.Miai
         /// <summary>
         /// 活动开始时间
         /// </summary>
-        public DateTime StartTime { get; set; }
+        public DateTime? StartTime { get; set; }
 
         /// <summary>
         /// 活动结束时间
         /// </summary>
-        public DateTime EndTime { get; set; }
+        public DateTime? EndTime { get; set; }
 
         /// <summary>
         /// 男数量

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -92,6 +92,13 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public MallShopStyleEnum MallShopStyle { get; set; }
 
+
+        /// <summary>
+        /// 相亲拼拼plus风格 1-卡片，2-列表
+        /// </summary>
+        public int MiaiPPPlusStyle { get; set; }
+
+
         /// <summary>
         /// 顶部标题文件颜色类型(0-白色，1-黑色)
         /// </summary>
@@ -112,6 +119,12 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string BottomNavBgColor { get; set; }
 
+
+        /// <summary>
+        /// 底部导航栏是否显示图标0-否，1-是
+        /// </summary>
+        public int IsShowIcon { get; set; }
+
         /// <summary>
         /// 导航底部是否开启阴影效果(0-未开启，1-开启)
         /// </summary>

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -3335,7 +3335,7 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class MiAiActivityTypeCusModel
     {
-       
+
 
         /// <summary>
         /// 标题
@@ -3372,6 +3372,154 @@ namespace Mall.Model.Extend.MarketingCenter
 
 
 
+    /// <summary>
+    /// 相亲ppplus (招募贴)插件
+    /// </summary>
+    public class blindDatePPPlusItem
+    {
+        /// <summary>
+        /// 显示分类
+        /// </summary>
+        public bool showCat { get; set; }
+
+        /// <summary>
+        /// 分类栏位置
+        /// </summary>
+        public string catPosition { get; set; }
+
+        /// <summary>
+        /// 分类样式
+        /// </summary>
+        public int catStyle { get; set; }
+
+        /// <summary>
+        /// ppplus添加方式【0-自动添加,1-手动添加】
+        /// </summary>
+        public int addActivityType { get; set; }
+
+        /// <summary>
+        /// ppplus数量
+        /// </summary>
+        public int activityLength { get; set; }
+
+        /// <summary>
+        /// 列表样式[-1-瀑布流模式,0-卡片,]
+        /// </summary>
+        public int listStyle { get; set; }
+
+
+
+        /// <summary>
+        /// 展示样式
+        /// </summary>
+        public int activityStyle { get; set; }
+
+
+
+        /// <summary>
+        /// 分类列表
+        /// </summary>
+        public List<catActivityItem> catList { get; set; }
+
+        /// <summary>
+        /// 商品列表
+        /// </summary>
+        public List<ActivityDetailsItem> list { get; set; }
+    }
+
+    /// <summary>
+    ///相亲ppplus (招募贴)详情项
+    /// </summary>
+    public class ActivityDetailsItem
+    {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+
+        public string name { get; set; }
+
+        /// <summary>
+        /// 商品图片
+        /// </summary>
+        public string picUrl { get; set; }
+
+        /// <summary>
+        /// 发帖人
+        /// </summary>
+        public string CreateBy { get; set; }
+
+
+        /// <summary>
+        /// 发帖人
+        /// </summary>
+        public int CreateById { get; set; }
+
+        /// <summary>
+        /// 发帖人
+        /// </summary>
+        public string CreateByIco { get; set; }
+
+        /// <summary>
+        /// 点赞数
+        /// </summary>
+        public int DianZanNum { get; set; }
+
+        /// <summary>
+        /// 是否点赞0-否，1-是
+        /// </summary>
+        public int IsDianZan { get; set; }
+    }
+
+    /// <summary>
+    /// 相亲ppplus (招募贴)分类
+    /// </summary>
+    public class catActivityItem
+    {
+        /// <summary>
+        /// 分类编号
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 是否自定义分类0-否，1-是
+        /// </summary>
+        public int isCustom { get; set; }
+
+        /// <summary>
+        /// 帖子范围，1-全部帖子，2-用户关注，3-手动关联，1-2只需要填写帖子数量，3-要手动指定活动
+        /// </summary>
+        public int range { get; set; }
+
+        /// <summary>
+        /// 商品分类
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 菜单名称
+        /// </summary>
+        public string menuName { get; set; }
+
+        /// <summary>
+        /// 商品数量
+        /// </summary>
+        public int goodsNum { get; set; }
+
+        /// <summary>
+        /// 是否显示自定义商品
+        /// </summary>
+        public bool staticGoods { get; set; }
+
+        /// <summary>
+        /// 商品列表
+        /// </summary>
+        public List<ActivityDetailsItem> goodsList { get; set; }
+    }
 
     #endregion
 }
\ No newline at end of file

Mall.Model/Extend/Miai/RB_MiAi_DianZan_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Miai
+{
+    /// <summary>
+    /// 拼拼plus的点赞
+    /// </summary>
+    public class RB_MiAi_DianZan_Extend : RB_MiAi_DianZan
+    {
+        /// <summary>
+        /// 0-全部，1-拼拼plus的点赞，2-拼拼plus评论的点赞
+        /// </summary>
+        public int IsSelectActivity { get; set; }
+
+        public string UserName { get; set; }
+
+
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 活动ids
+        /// </summary>
+        public string ActivityIds { get; set; }
+
+
+        /// <summary>
+        /// 评价ids
+        /// </summary>
+        public string ActivityDiscussIds { get; set; }
+    }
+}

Mall.Model/Extend/Miai/RB_Miai_ActivityDiscuss_Extend.cs

@@ -48,9 +48,19 @@ namespace Mall.Model.Extend.Miai
         /// </summary>
         public int ReplyNum { get; set; }
 
+        /// <summary>
+        /// 点赞数
+        /// </summary>
+        public int DianZanNum { get; set; }
+
         /// <summary>
         /// 图片列表
         /// </summary>
         public List<string> ImageList { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int OrderBy { get; set; }
     }
 }

Mall.Model/Extend/Miai/RB_Miai_Activity_Extend.cs

@@ -43,11 +43,22 @@ namespace Mall.Model.Extend.Miai
         /// </summary>
         public int EnrollNum { get; set; }
 
+        /// <summary>
+        /// 点赞数
+        /// </summary>
+        public int DianZanNum { get; set; }
+
         /// <summary>
         /// 只看可报名   1是
         /// </summary>
         public int IsSelectEnroll { get; set; }
 
+
+        /// <summary>
+        /// 是否关注 0-否，1-是
+        /// </summary>
+        public int IsFollow { get; set; }
+
         /// <summary>
         /// 排序  0默认最新  1报名人数倒序  2回复数量倒序
         /// </summary>
@@ -72,5 +83,32 @@ namespace Mall.Model.Extend.Miai
         /// 标签
         /// </summary>
         public List<string> LabelList { get; set; }
+
+        /// <summary>
+        /// 热评
+        /// </summary>
+        public List<HotComment> HotCommentList { get; set; }
+    }
+
+    /// <summary>
+    /// 热评
+    /// </summary>
+    public class HotComment
+    {
+        /// <summary>
+        /// 点赞数
+        /// </summary>
+        public int DianZanNum { get; set; }
+
+        /// <summary>
+        /// 评论内容
+        /// </summary>
+        public string Comment { get; set; }
+
+        /// <summary>
+        /// 评论id
+        /// </summary>
+        public int CommentId { get; set; }
+
     }
 }

Mall.Model/Extend/User/RB_Supplier_Extend.cs

@@ -32,6 +32,8 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string TenantName { get; set; }
 
+      
+
         public List<RB_SupplierCommission> SupplierCommissionList { get; set; }
     }
 }

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -932,6 +932,8 @@ namespace Mall.Module.MarketingCenter
                     }
                     item.data = miAiActivityTypeCustomItem;
                     break;
+                //相亲ppplus (招募贴)插件
+                case "blindDatePPPlus": item.data = JsonHelper.DeserializeObject<blindDatePPPlusItem>(item.data.ToString()); break;
                 //导航-页面
                 case "nav-page": item.data = JsonHelper.DeserializeObject<navPageItem>(item.data.ToString()); break;
 

Mall.Module.Miai/MiaiModule.cs

@@ -83,6 +83,10 @@ namespace Mall.Module.Miai
 
         private readonly RB_MiAi_BaseInfoQueryRepository miAiBaseInfoQueryRepository = new RB_MiAi_BaseInfoQueryRepository();
         private readonly RB_MiAi_BaseInfoDayQueryRepository miAiBaseInfoDayQueryRepository = new RB_MiAi_BaseInfoDayQueryRepository();
+        /// <summary>
+        /// 点赞仓储层
+        /// </summary>
+        private readonly RB_MiAi_DianZanRepository miAiDianZanRepository = new RB_MiAi_DianZanRepository();
 
 
         #region 会员信息
@@ -550,6 +554,10 @@ namespace Mall.Module.Miai
                 string ActivityIds = string.Join(",", list.Select(x => x.Id));
                 //查询活动回复数量
                 var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(ActivityIds);
+
+                //查询活动评论
+                var rDiscusslist = miai_ActivityDiscussRepository.GetList(new RB_Miai_ActivityDiscuss_Extend { ActivityIds = ActivityIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+
                 //查询活动报名数量
                 var elist = miai_ActivityEnrollRepository.GetActivityEnrollNumList(ActivityIds);
                 //查询版本信息
@@ -567,11 +575,122 @@ namespace Mall.Module.Miai
                     var fmodel = flist.Where(x => x.Id == item.ForumId).FirstOrDefault();
                     item.ForumName = fmodel?.Name ?? "";
                     item.ForumIcon = fmodel?.Icon ?? "";
+                    item.HotCommentList = new List<HotComment>();
+                    var commentList = rDiscusslist.Where(x => x.ActivityId == item.Id && !string.IsNullOrEmpty(x.Content)).OrderByDescending(x => x.DianZanNum).OrderByDescending(x => x.CreateDate).Take(2);
+                    if (commentList != null && commentList.Any())
+                    {
+                        foreach (var itemComment in commentList)
+                        {
+                            HotComment commentModel = new HotComment()
+                            {
+                                DianZanNum = itemComment.DianZanNum,
+                                Comment = itemComment.Content,
+                                CommentId = itemComment.Id
+                            };
+                            item.HotCommentList.Add(commentModel);
+                        }
+                    }
+
+                }
+            }
+            return list;
+        }
+
+
+
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetSimpleActivityPageList(int pageIndex, int pageSize, out long count, RB_Miai_Activity_Extend demodel)
+        {
+            var list = miai_ActivityRepository.GetPageList(pageIndex, pageSize, out count, demodel);
+            if (list.Any())
+            {
+                string ActivityIds = string.Join(",", list.Select(x => x.Id));
+                //查询活动回复数量
+                var rlist = miai_ActivityDiscussRepository.GetList(new RB_Miai_ActivityDiscuss_Extend { ActivityIds = ActivityIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+                //查询活动报名数量
+                // var elist = miai_ActivityEnrollRepository.GetActivityEnrollNumList(ActivityIds);
+                //查询版本信息
+                string ForumIds = string.Join(",", list.Select(x => x.ForumId).Distinct());
+                var flist = miai_ForumRepository.GetList(new RB_Miai_Forum_Extend() { ForumIds = ForumIds });
+                foreach (var item in list)
+                {
+                    item.ImageList = new List<string>();
+                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
+                    {
+                        item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
+                    }
+                    item.HotCommentList = new List<HotComment>();
+                    var commentList = rlist.Where(x => x.ActivityId == item.Id && !string.IsNullOrEmpty(x.Content)).OrderByDescending(x => x.DianZanNum).OrderByDescending(x => x.CreateDate).Take(2);
+                    if (commentList != null && commentList.Any())
+                    {
+                        foreach (var itemComment in commentList)
+                        {
+                            HotComment commentModel = new HotComment()
+                            {
+                                DianZanNum = itemComment.DianZanNum,
+                                Comment = itemComment.Content,
+                                CommentId = itemComment.Id
+                            };
+                            item.HotCommentList.Add(commentModel);
+                        }
+                    }
+                    var fmodel = flist.Where(x => x.Id == item.ForumId).FirstOrDefault();
+                    item.ForumName = fmodel?.Name ?? "";
+                    item.ForumIcon = fmodel?.Icon ?? "";
                 }
             }
             return list;
         }
 
+
+
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetActivityPageList_V3(int pageIndex, int pageSize, out long count, RB_Miai_Activity_Extend demodel)
+        {
+            var list = miai_ActivityRepository.GetPageList_V3(pageIndex, pageSize, out count, demodel);
+            if (list.Any())
+            {
+                foreach (var item in list)
+                {
+                    item.ImageList = new List<string>();
+                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
+                    {
+                        item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
+                    }
+
+
+                }
+            }
+            return list;
+        }
+
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetMiaiActivityList(RB_Miai_Activity_Extend dmodel, bool IsAll = false)
+        {
+            var list = miai_ActivityRepository.GetList(dmodel, IsAll: false);
+            return list;
+        }
+
         /// <summary>
         /// 获取活动信息
         /// </summary>
@@ -588,6 +707,7 @@ namespace Mall.Module.Miai
             int PeopleNum = ManENum + WoManENum;
             //获取当前用户是否已报名
             bool IsEnroll = false;
+          
             if (userInfo.UserId > 0)
             {
                 IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
@@ -609,6 +729,11 @@ namespace Mall.Module.Miai
                 //查询是否已关注我
                 IsFocus2 = otherFollowList.Any();
             }
+            int IsTieZi = 0;
+            if (model.IsOpenEnroll == 2 && model.ManNum == 0 && model.WoManNum == 0 && model.Distinguish == 1 && !model.StartTime.HasValue && !model.EndTime.HasValue)
+            {
+                IsTieZi = 1;
+            }
             return new
             {
                 model.ForumId,
@@ -624,8 +749,8 @@ namespace Mall.Module.Miai
                 Sex,
                 model.IsOpenEnroll,
                 model.Label,
-                StartTime = model.StartTime.ToString("yyyy-MM-dd HH:mm"),
-                EndTime = model.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                StartTime = model.StartTime.HasValue ? model.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                EndTime = model.EndTime.HasValue ? model.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 model.ManNum,
                 ManENum,
                 model.WoManNum,
@@ -639,7 +764,8 @@ namespace Mall.Module.Miai
                 IsFocus = IsFocus == true && IsFocus2 == true ? 2 : IsFocus == true ? 1 : 0,
                 ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0,
                 MyFollowId = (myFollowList != null && myFollowList.Any()) ? myFollowList.FirstOrDefault()?.ID : 0,
-                OtherFollowId = (otherFollowList != null && otherFollowList.Any()) ? otherFollowList.FirstOrDefault()?.ID : 0
+                OtherFollowId = (otherFollowList != null && otherFollowList.Any()) ? otherFollowList.FirstOrDefault()?.ID : 0,
+                IsTieZi
             };
         }
 
@@ -657,6 +783,11 @@ namespace Mall.Module.Miai
             //查询活动回复数量
             var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(activityId.ToString());
             var umodel = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(model.UserId);
+            int IsTieZi = 0;
+            if (model.IsOpenEnroll == 2 && model.ManNum == 0 && model.WoManNum == 0 && model.Distinguish == 1 && !model.StartTime.HasValue && !model.EndTime.HasValue)
+            {
+                IsTieZi = 1;
+            }
             return new
             {
                 model.Id,
@@ -668,8 +799,8 @@ namespace Mall.Module.Miai
                 umodel.Photo,
                 model.IsOpenEnroll,
                 model.Label,
-                StartTime = model.StartTime.ToString("yyyy-MM-dd HH:mm"),
-                EndTime = model.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                StartTime = model.StartTime.HasValue ? model.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                EndTime = model.EndTime.HasValue ? model.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 model.ManNum,
                 model.WoManNum,
                 model.LonLat,
@@ -677,6 +808,7 @@ namespace Mall.Module.Miai
                 Deadline = model.IsOpenEnroll == 1 ? model.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 PeopleNum,
+                IsTieZi,
                 ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0,
                 model.Distinguish
             };
@@ -739,6 +871,40 @@ namespace Mall.Module.Miai
                 return miai_ActivityRepository.Insert(demodel) > 0;
             }
         }
+        /// <summary>
+        /// 发帖招募
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public bool SetSimpleActivityInfo(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) { msg = "活动不存在"; return false; }
+                if (model.UserId != demodel.UserId) { msg = "无法修改活动"; 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.UpdateDate),demodel.UpdateDate}
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Miai_Activity_Extend.Id),
+                          FiledValue=demodel.Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+                return miai_ActivityRepository.Update(keyValues, wheres);
+            }
+            else
+            {
+                return miai_ActivityRepository.Insert(demodel) > 0;
+            }
+        }
 
         /// <summary>
         /// 删除招募贴
@@ -1357,7 +1523,8 @@ namespace Mall.Module.Miai
             {
                 flag = miai_BaseInfoRepository.Insert(model) > 0;
             }
-            else {
+            else
+            {
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                         { nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
                           { nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName}
@@ -1369,7 +1536,7 @@ namespace Mall.Module.Miai
                                OperatorEnum=OperatorEnum.Equal
                         }
                     };
-                flag= miai_BaseInfoRepository.Update(keyValues, wheres);
+                flag = miai_BaseInfoRepository.Update(keyValues, wheres);
             }
             return flag;
         }
@@ -1900,5 +2067,60 @@ namespace Mall.Module.Miai
         }
 
         #endregion
+
+
+        #region 点赞信息
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_MiAi_DianZan_Extend> GetDianZanList(RB_MiAi_DianZan_Extend where)
+        {
+            return miAiDianZanRepository.GetDianZanList(where);
+        }
+
+        /// <summary>
+        /// 新增/修改我点赞的拼拼plus
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AddOrUpdateDianZan(RB_MiAi_DianZan_Extend model)
+        {
+            bool flag = false;
+            try
+            {
+                int Id = 0;
+                if (model.ID == 0)
+                {
+                    Id = miAiDianZanRepository.Insert(model);
+                    flag = Id > 0;
+                }
+                else
+                {
+                    Id = model.ID;
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        { nameof(RB_MiAi_DianZan_Extend.UpdateDate),System.DateTime.Now},
+                        { nameof(RB_MiAi_DianZan_Extend.Status),model.Status}
+                    };
+                    List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_MiAi_DianZan_Extend.ID),
+                              FiledValue=model.ID,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                    flag = miAiDianZanRepository.Update(keyValues, wheres);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "AddOrUpdateDianZan");
+                return false;
+            }
+            return flag;
+        }
+
+        #endregion
     }
 }

Mall.Module.User/MiniProgramModule.cs

@@ -379,6 +379,8 @@ namespace Mall.Module.User
                         { nameof(RB_MiniProgram_Extend.TopNavBgColor),extModel.TopNavBgColor},
                         { nameof(RB_MiniProgram_Extend.BottomNavBgColor),extModel.BottomNavBgColor},
                         { nameof(RB_MiniProgram_Extend.BottomNavIsShadow),extModel.BottomNavIsShadow},
+                          { nameof(RB_MiniProgram_Extend.IsShowIcon),extModel.IsShowIcon},
+                        
                     };
                     flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
                 }
@@ -600,6 +602,24 @@ namespace Mall.Module.User
             }
             return flag;
         }
+        /// <summary>
+        /// 更新相亲拼拼plus风格
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiaiPPPlusStyle(RB_MiniProgram_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.MallBaseId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_Extend.MiaiPPPlusStyle),extModel.MiaiPPPlusStyle},
+                };
+                flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
+            }
+            return flag;
+        }
 
         /// <summary>
         /// 修改小程序首页布局

Mall.Repository/Miai/RB_MiAi_DianZanRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Miai;
+
+namespace Mall.Repository.Miai
+{
+    public class RB_MiAi_DianZanRepository : BaseRepository<RB_MiAi_DianZan>
+    {
+
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_MiAi_DianZan); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_MiAi_DianZan_Extend> GetDianZanList(RB_MiAi_DianZan_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT a.*,u.Name as UserName,u.Photo from RB_MiAi_DianZan as a 
+LEFT JOIN rb_member_user as u on a.CreateBy=u.Id  where 1=1");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and a.TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and a.MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and a.ID={0}", where.ID);
+                }
+                if (where.CreateBy > 0)
+                {
+                    sb.AppendFormat(" and a.CreateBy={0}", where.CreateBy);
+                }
+                if (where.IsSelectActivity > 0)
+                {
+                    if (where.IsSelectActivity == 1)
+                    {
+                        sb.AppendFormat(" and a.ActivityId={0} and a.ActivityDiscussId=0", where.ActivityId);
+                    }
+                    else if (where.IsSelectActivity == 2)
+                    {
+                        sb.AppendFormat(" and a.ActivityId={0} and a.ActivityDiscussId={1}", where.ActivityId,where.ActivityDiscussId);
+                    }
+                }
+                if (!string.IsNullOrEmpty(where.ActivityIds))
+                {
+                    sb.AppendFormat($@" and a.{nameof(RB_MiAi_DianZan.ActivityId)} in({where.ActivityIds})");
+                }
+
+                if (where.Status >= 0)
+                {
+                    sb.AppendFormat($" AND a.{nameof(RB_MiAi_DianZan.Status)}={where.Status}");
+                }
+            }
+            return Get<RB_MiAi_DianZan_Extend>(sb.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs

@@ -52,11 +52,12 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} =0";
             }
-           
-            string sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,b.Sex from RB_Miai_ActivityDiscuss d
+
+            string sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,b.Sex,IFNULL(dz.DianZanNum,0) as DianZanNum from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
 left join rb_miai_baseinfo b on d.UserId =b.UserId
+LEFT JOIN (SELECT ActivityDiscussId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId>0  GROUP BY ActivityDiscussId) as dz on dz.ActivityDiscussId=d.Id
 where {where} order by d.Id desc";
             return GetPage<RB_Miai_ActivityDiscuss_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
@@ -68,36 +69,41 @@ where {where} order by d.Id desc";
         /// <returns></returns>
         public List<RB_Miai_ActivityDiscuss_Extend> GetList(RB_Miai_ActivityDiscuss_Extend dmodel)
         {
-            string where = $" 1=1 and {nameof(RB_Miai_ActivityDiscuss_Extend.Status)}=0 ";
+            string where = $" 1=1 and d.{nameof(RB_Miai_ActivityDiscuss_Extend.Status)}=0 ";
             if (dmodel.TenantId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.TenantId)}={dmodel.TenantId}";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.MallBaseId)}={dmodel.MallBaseId}";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.MallBaseId)}={dmodel.MallBaseId}";
             }
             if (dmodel.ActivityId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} ={dmodel.ActivityId}";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} ={dmodel.ActivityId}";
             }
             if (!string.IsNullOrEmpty(dmodel.ActivityIds))
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} in({dmodel.ActivityIds})";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} in({dmodel.ActivityIds})";
             }
             if (dmodel.UserId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}";
             }
             if (dmodel.Id > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.Id)} ={dmodel.Id}";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.Id)} ={dmodel.Id}";
             }
             if (dmodel.ParentId > 0)
             {
-                where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
+            }
+            string orderBy = " order by d.Id asc ";
+            if (dmodel.OrderBy == 1)
+            {
+                orderBy = "  ORDER BY IFNULL(dz.DianZanNum, 0)  desc,d.CreateDate desc";
             }
-            string sql = $@"select * from RB_Miai_ActivityDiscuss where {where} order by Id asc";
+            string sql = $@"select d.*,IFNULL(dz.DianZanNum,0) as DianZanNum from RB_Miai_ActivityDiscuss as d LEFT JOIN (SELECT ActivityDiscussId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId>0  GROUP BY ActivityDiscussId) as dz on dz.ActivityDiscussId=d.Id where {where}  {orderBy}";
             return Get<RB_Miai_ActivityDiscuss_Extend>(sql).ToList();
         }
 
@@ -114,9 +120,10 @@ where {where} order by d.Id desc";
             if (count == 1)
             {
                 //只有一条数据
-                sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+                sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,IFNULL(dz.DianZanNum,0) as DianZanNum from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
+LEFT JOIN (SELECT ActivityDiscussId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId>0  GROUP BY ActivityDiscussId) as dz on dz.ActivityDiscussId=d.Id
 where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id desc limit {number}";
             }
             else
@@ -126,16 +133,18 @@ where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id desc
                     if (i == count - 1)
                     {
                         //最后一条
-                        sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+                        sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,IFNULL(dz.DianZanNum,0) as DianZanNum from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
+LEFT JOIN (SELECT ActivityDiscussId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId>0  GROUP BY ActivityDiscussId) as dz on dz.ActivityDiscussId=d.Id
 where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id desc limit {number})";
                     }
                     else
                     {
-                        sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+                        sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,IFNULL(dz.DianZanNum,0) as DianZanNum from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
+LEFT JOIN (SELECT ActivityDiscussId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId>0  GROUP BY ActivityDiscussId) as dz on dz.ActivityDiscussId=d.Id
 where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id desc limit {number})
 union 
 ";

Mall.Repository/Miai/RB_Miai_ActivityRepository.cs

@@ -24,17 +24,20 @@ namespace Mall.Repository.Miai
         public List<RB_Miai_Activity_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Miai_Activity_Extend dmodel)
         {
             string where = $" 1=1 and a.{nameof(RB_Miai_Activity_Extend.Status)}=0 ";
-            if (dmodel.TenantId > 0) {
+            if (dmodel.TenantId > 0)
+            {
                 where += $@" and a.{nameof(RB_Miai_Activity_Extend.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
                 where += $@" and a.{nameof(RB_Miai_Activity_Extend.MallBaseId)}={dmodel.MallBaseId}";
             }
-            if (!string.IsNullOrEmpty(dmodel.ActivityTitle)) {
+            if (!string.IsNullOrEmpty(dmodel.ActivityTitle))
+            {
                 where += $@" and a.{nameof(RB_Miai_Activity_Extend.ActivityTitle)} like '%{dmodel.ActivityTitle}%'";
             }
-            if (dmodel.ForumId > 0) {
+            if (dmodel.ForumId > 0)
+            {
                 where += $@" and a.{nameof(RB_Miai_Activity_Extend.ForumId)} ={dmodel.ForumId}";
             }
             if (dmodel.UserId > 0)
@@ -49,11 +52,15 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and a.{nameof(RB_Miai_Activity_Extend.Deadline)} >='{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
             }
-
+            string orderBy = " a.Id DESC";
+            if (dmodel.OrderBy == 1)
+            {
+                orderBy = " a.CreateDate DESC";
+            }
             string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_Activity a
 left join rb_member_user u on a.UserId =u.Id
 left join rb_miai_baseinfo b on a.UserId =b.UserId
-where {where} order by a.Id desc";
+where {where} order by {orderBy}";
             return GetPage<RB_Miai_Activity_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
 
@@ -97,7 +104,8 @@ where {where} order by a.Id desc";
             {
                 orderBy = " e.Number DESC,a.Id DESC";
             }
-            else if (dmodel.OrderBy == 2) {
+            else if (dmodel.OrderBy == 2)
+            {
                 orderBy = " r.ReplyNum DESC,a.Id DESC";
             }
 
@@ -116,7 +124,7 @@ where {where} order by {orderBy}";
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Miai_Activity_Extend> GetList(RB_Miai_Activity_Extend dmodel,bool IsAll = false)
+        public List<RB_Miai_Activity_Extend> GetList(RB_Miai_Activity_Extend dmodel, bool IsAll = false)
         {
             string where = $" 1=1 and a.{nameof(RB_Miai_Activity_Extend.Status)}=0 ";
             if (IsAll) { where = " 1=1"; }
@@ -144,11 +152,76 @@ where {where} order by {orderBy}";
             {
                 where += $@" and a.{nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
             }
-            string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_Activity a
+
+            string orderBy = " a.Id DESC";
+            if (dmodel.OrderBy == 1)
+            {
+                orderBy = " a.CreateDate DESC";
+            }
+            string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex,IFNULL(d.DianZanNum,0) as DianZanNum from RB_Miai_Activity a
 left join rb_member_user u on a.UserId =u.Id
 left join rb_miai_baseinfo b on a.UserId =b.UserId
-where {where} order by a.Id desc";
+LEFT JOIN (SELECT ActivityId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId=0  GROUP BY ActivityId) as d on d.ActivityId=a.Id
+where {where} order by {orderBy}";
             return Get<RB_Miai_Activity_Extend>(sql).ToList();
         }
+
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miai_Activity_Extend> GetPageList_V3(int pageIndex, int pageSize, out long rowCount, RB_Miai_Activity_Extend dmodel)
+        {
+            string where = $" 1=1 and a.{nameof(RB_Miai_Activity_Extend.Status)}=0 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ActivityTitle))
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.ActivityTitle)} like '%{dmodel.ActivityTitle}%'";
+            }
+            if (dmodel.ForumId > 0)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.ForumId)} ={dmodel.ForumId}";
+            }
+            if (dmodel.IsFollow == 1)
+            {
+                if (dmodel.UserId > 0)
+                {
+                    where += $@" and f.CreateBy ={dmodel.UserId}";
+                }
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.Id)} ={dmodel.Id}";
+            }
+            if (dmodel.IsSelectEnroll == 1)
+            {
+                where += $@" and a.{nameof(RB_Miai_Activity_Extend.Deadline)} >='{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
+            }
+            string orderBy = " a.Id DESC";
+            if (dmodel.OrderBy == 1)
+            {
+                orderBy = " a.CreateDate DESC";
+            }
+            string sql = $@"select a.*,u.Name as UserName,u.Photo,b.Sex,IFNULL(d.DianZanNum,0) as DianZanNum from RB_Miai_Activity a
+left join rb_member_user u on a.UserId =u.Id
+left join rb_miai_baseinfo b on a.UserId =b.UserId
+LEFT JOIN rb_miai_followmember  f on f.UserId=a.UserId
+LEFT JOIN (SELECT ActivityId,COUNT(*) DianZanNum from rb_miai_dianzan where `Status`=0 and ActivityId>0 and ActivityDiscussId=0  GROUP BY ActivityId) as d on d.ActivityId=a.Id
+where {where} order by {orderBy}";
+            return GetPage<RB_Miai_Activity_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
     }
 }

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -1763,7 +1763,7 @@ where {where} group by g.Id order by col.Id desc";
 
             string sql = $@"select IFNULL(synchro.Isynchro,0) as Isynchro,g.*,s.`Name` as SupplierName from RB_Goods g
 inner join rb_goods_category c on g.Id=c.GoodsId 
-LEFT JOIN rb_supplier as s on g.SupplierId=s.ID
+LEFT JOIN rb_tenant as s on g.TenantId=s.TenantId
 LEFT JOIN (SELECT SourceGoodsId,COUNT(*) as  Isynchro from RB_Goods where SourceGoodsId>0 {sourceWhere} GROUP BY SourceGoodsId ) as 
 synchro on synchro.SourceGoodsId=g.Id 
 where {where} group by g.Id order by {orderBy}";

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -356,6 +356,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     top_text_color = miniProgram.TopNavWordColor,
                     //导航底部是否开启阴影效果(0-未开启，1-开启)
                     shadow = miniProgram.BottomNavIsShadow,
+                    //底部导航栏是否显示图标0-否，1-是
+                    isShowIcon = miniProgram.IsShowIcon,
                     //导航栏
                     navs = navList,
                 };

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -3,6 +3,7 @@ using Mall.Model.Entity.BaseSetUp;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.BaseSetUp;
 using Mall.Model.Extend.MarketingCenter;
+using Mall.Model.Extend.Miai;
 using Mall.Model.Extend.Product;
 using Mall.Model.Extend.User;
 using Mall.Module.BaseSetUp;
@@ -10,6 +11,7 @@ using Mall.Module.MarketingCenter;
 using Mall.Module.Product;
 using Mall.Module.Reserve;
 using Mall.Module.User;
+using Mall.Repository.Miai;
 using Mall.Repository.Product;
 using Mall.Repository.User;
 using Newtonsoft.Json;
@@ -101,6 +103,8 @@ namespace Mall.WebApi.Controllers
 
         private static Module.TradePavilion.CommerceActivityModule commerceActivityModule = new Module.TradePavilion.CommerceActivityModule();
 
+
+
         /// <summary>
         /// 解析插件数据为对象
         /// </summary>
@@ -1345,7 +1349,7 @@ namespace Mall.WebApi.Controllers
                                         lastItem.Age = tempGood.Age.ToString(); //Common.Plugin.StringHelper.GetAge(tempGood.Birthday);
                                         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.Score = 0;
                                         lastItem.Album = tempGood.Album;
                                         if (!string.IsNullOrWhiteSpace(lastItem.Album))
@@ -1561,6 +1565,354 @@ namespace Mall.WebApi.Controllers
                         data = miAiActivityTypeCustomItem
                     };
                     break;
+
+                //相亲ppplus (招募贴)插件
+                case "blindDatePPPlus":
+                    var blindDatePPPlusData = subItem.data as blindDatePPPlusItem;
+                    if (blindDatePPPlusData != null)
+                    {
+                        //显示商品分类
+                        if (blindDatePPPlusData.showCat)
+                        {
+                            if (blindDatePPPlusData.catList != null && blindDatePPPlusData.catList.Count > 0)
+                            {
+                                foreach (var childItem in blindDatePPPlusData.catList)
+                                {
+                                    if (childItem.isCustom == 1)
+                                    {
+                                        if (childItem.range == 1)
+                                        {
+                                            childItem.goodsList = new List<ActivityDetailsItem>();
+                                            var catGoodsList = miaiModule.GetActivityPageList_V3(1, childItem.goodsNum, out long rowsCount, new RB_Miai_Activity_Extend()
+                                            {
+                                                TenantId = TenantId,
+                                                MallBaseId = MallBaseId,
+                                                OrderBy = 1
+                                            });
+                                            if (catGoodsList != null && catGoodsList.Count > 0)
+                                            {
+                                                string goodIds = string.Join(",", catGoodsList.Select(x => x.Id));
+                                                //判断用户是否点赞
+                                                List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                                if (UserId > 0)
+                                                {
+                                                    dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = goodIds, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                                }
+                                                foreach (var gItem in catGoodsList)
+                                                {
+                                                    gItem.ImageList = new List<string>();
+                                                    if (!string.IsNullOrEmpty(gItem.Images) && gItem.Images != "[]")
+                                                    {
+                                                        gItem.ImageList = JsonConvert.DeserializeObject<List<string>>(gItem.Images);
+                                                    }
+                                                    int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == gItem.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                                    childItem.goodsList.Add(new ActivityDetailsItem()
+                                                    {
+                                                        id = gItem.Id,
+                                                        CreateById = gItem.UserId,
+                                                        name = gItem.ActivityTitle,
+                                                        picUrl = (gItem.ImageList != null && gItem.ImageList.Any()) ? gItem.ImageList.FirstOrDefault() : "",
+                                                        CreateBy = gItem.UserName,
+                                                        CreateByIco = gItem.Photo,
+                                                        IsDianZan = dianZanCount,
+                                                        DianZanNum = gItem.DianZanNum//先默认0
+                                                    });
+                                                }
+                                            }
+                                        }
+                                        else if (childItem.range == 2)//用户关注先不忙做等哈在做
+                                        {
+                                            childItem.goodsList = new List<ActivityDetailsItem>();
+                                            if (UserId > 0)
+                                            {
+                                                var catGoodsList = miaiModule.GetActivityPageList_V3(1, childItem.goodsNum, out long rowsCount, new RB_Miai_Activity_Extend()
+                                                {
+                                                    TenantId = TenantId,
+                                                    MallBaseId = MallBaseId,
+                                                    UserId = UserId,
+                                                    OrderBy = 1,
+                                                    IsFollow = 1
+                                                });
+                                                if (catGoodsList != null && catGoodsList.Count > 0)
+                                                {
+                                                    string goodIds = string.Join(",", catGoodsList.Select(x => x.Id));
+                                                    //判断用户是否点赞
+                                                    List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                                    if (UserId > 0)
+                                                    {
+                                                        dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = goodIds, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                                    }
+                                                    foreach (var gItem in catGoodsList)
+                                                    {
+                                                        int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == gItem.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                                        gItem.ImageList = new List<string>();
+                                                        if (!string.IsNullOrEmpty(gItem.Images) && gItem.Images != "[]")
+                                                        {
+                                                            gItem.ImageList = JsonConvert.DeserializeObject<List<string>>(gItem.Images);
+                                                        }
+                                                        childItem.goodsList.Add(new ActivityDetailsItem()
+                                                        {
+                                                            id = gItem.Id,
+                                                            name = gItem.ActivityTitle,
+                                                            picUrl = (gItem.ImageList != null && gItem.ImageList.Any()) ? gItem.ImageList.FirstOrDefault() : "",
+                                                            CreateBy = gItem.UserName,
+                                                            CreateById = gItem.UserId,
+                                                            CreateByIco = gItem.Photo,
+                                                            IsDianZan = dianZanCount,
+                                                            DianZanNum = gItem.DianZanNum//先默认0
+                                                        });
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        else if (childItem.range == 3)
+                                        {
+                                            if (childItem.goodsList != null && childItem.goodsList.Count > 0)
+                                            {
+                                                var Ids = "0," + string.Join(",", childItem.goodsList.Select(qitem => qitem.id));
+                                                var tempGoodsList = miaiModule.GetMiaiActivityList(new RB_Miai_Activity_Extend()
+                                                {
+                                                    TenantId = TenantId,
+                                                    MallBaseId = MallBaseId,
+                                                    ActivityIds = Ids,
+                                                    OrderBy = 1
+                                                }, IsAll: false);
+
+                                                //判断用户是否点赞
+                                                List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                                if (UserId > 0)
+                                                {
+                                                    dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = Ids, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                                }
+                                                List<ActivityDetailsItem> newGoodsList = new List<ActivityDetailsItem>();
+                                                foreach (var goodItem in childItem.goodsList)
+                                                {
+                                                    var lastItem = new ActivityDetailsItem();
+                                                    var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
+                                                    if (tempGood != null && tempGood.Id > 0)
+                                                    {
+                                                        int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == tempGood.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                                        tempGood.ImageList = new List<string>();
+                                                        if (!string.IsNullOrEmpty(tempGood.Images) && tempGood.Images != "[]")
+                                                        {
+                                                            tempGood.ImageList = JsonConvert.DeserializeObject<List<string>>(tempGood.Images);
+                                                        }
+                                                        lastItem.id = tempGood.Id;
+                                                        lastItem.CreateByIco = tempGood.Photo;
+                                                        lastItem.name = tempGood.ActivityTitle;
+                                                        lastItem.picUrl = (tempGood.ImageList != null && tempGood.ImageList.Any()) ? tempGood.ImageList.FirstOrDefault() : "";
+                                                        lastItem.CreateBy = tempGood.UserName;
+                                                        lastItem.IsDianZan = dianZanCount;
+                                                        lastItem.CreateById = tempGood.UserId;
+                                                        lastItem.DianZanNum = tempGood.DianZanNum;//先默认0
+                                                        newGoodsList.Add(lastItem);
+                                                    }
+                                                }
+                                                childItem.goodsList = newGoodsList;
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        //自定义商品
+                                        if (childItem.staticGoods)
+                                        {
+                                            if (childItem.goodsList != null && childItem.goodsList.Count > 0)
+                                            {
+                                                var Ids = "0," + string.Join(",", childItem.goodsList.Select(qitem => qitem.id));
+                                                var tempGoodsList = miaiModule.GetMiaiActivityList(new RB_Miai_Activity_Extend()
+                                                {
+                                                    TenantId = TenantId,
+                                                    MallBaseId = MallBaseId,
+                                                    ActivityIds = Ids,
+                                                    OrderBy = 1
+                                                }, IsAll: false);
+                                                //判断用户是否点赞
+                                                List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                                if (UserId > 0)
+                                                {
+                                                    dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = Ids, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                                }
+                                                List<ActivityDetailsItem> newGoodsList = new List<ActivityDetailsItem>();
+                                                foreach (var goodItem in childItem.goodsList)
+                                                {
+
+                                                    var lastItem = new ActivityDetailsItem();
+                                                    var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
+                                                    if (tempGood != null && tempGood.Id > 0)
+                                                    {
+                                                        int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == tempGood.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                                        tempGood.ImageList = new List<string>();
+                                                        if (!string.IsNullOrEmpty(tempGood.Images) && tempGood.Images != "[]")
+                                                        {
+                                                            tempGood.ImageList = JsonConvert.DeserializeObject<List<string>>(tempGood.Images);
+                                                        }
+                                                        lastItem.id = tempGood.Id;
+                                                        lastItem.name = tempGood.ActivityTitle;
+                                                        lastItem.picUrl = (tempGood.ImageList != null && tempGood.ImageList.Any()) ? tempGood.ImageList.FirstOrDefault() : "";
+                                                        lastItem.CreateBy = tempGood.UserName;
+                                                        lastItem.CreateByIco = tempGood.Photo;
+                                                        lastItem.IsDianZan = dianZanCount;
+                                                        lastItem.CreateById = tempGood.UserId;
+                                                        lastItem.DianZanNum = tempGood.DianZanNum;//先默认0
+                                                        newGoodsList.Add(lastItem);
+                                                    }
+                                                }
+                                                childItem.goodsList = newGoodsList;
+                                            }
+                                        }
+                                        //自动添加商品
+                                        else
+                                        {
+                                            childItem.goodsList = new List<ActivityDetailsItem>();
+                                            var catGoodsList = miaiModule.GetActivityPageList_V3(1, childItem.goodsNum, out long rowsCount, new RB_Miai_Activity_Extend()
+                                            {
+                                                TenantId = TenantId,
+                                                MallBaseId = MallBaseId,
+                                                ForumId = childItem.id,
+                                                OrderBy = 1
+                                            });
+                                            if (catGoodsList != null && catGoodsList.Count > 0)
+                                            {
+                                                string goodIds = string.Join(",", catGoodsList.Select(x => x.Id));
+                                                //判断用户是否点赞
+                                                List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                                if (UserId > 0)
+                                                {
+                                                    dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = goodIds, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                                }
+                                                foreach (var gItem in catGoodsList)
+                                                {
+                                                    int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == gItem.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                                    gItem.ImageList = new List<string>();
+                                                    if (!string.IsNullOrEmpty(gItem.Images) && gItem.Images != "[]")
+                                                    {
+                                                        gItem.ImageList = JsonConvert.DeserializeObject<List<string>>(gItem.Images);
+                                                    }
+                                                    childItem.goodsList.Add(new ActivityDetailsItem()
+                                                    {
+                                                        id = gItem.Id,
+                                                        name = gItem.ActivityTitle,
+                                                        picUrl = (gItem.ImageList != null && gItem.ImageList.Any()) ? gItem.ImageList.FirstOrDefault() : "",
+                                                        CreateBy = gItem.UserName,
+                                                        CreateByIco = gItem.Photo,
+                                                        IsDianZan = dianZanCount,
+                                                        CreateById = gItem.UserId,
+                                                        DianZanNum = gItem.DianZanNum//先默认0
+                                                    });
+                                                }
+                                            }
+                                        }
+                                    }
+
+                                }
+                            }
+                        }
+                        //不显示商品分类
+                        else
+                        {
+                            //自动添加商品
+                            if (blindDatePPPlusData.addActivityType == 0)
+                            {
+                                blindDatePPPlusData.list = new List<ActivityDetailsItem>();
+                                var goodsList = miaiModule.GetActivityPageList_V3(1, blindDatePPPlusData.activityLength, out long rowsCount, new RB_Miai_Activity_Extend()
+                                {
+                                    TenantId = TenantId,
+                                    MallBaseId = MallBaseId,
+                                    OrderBy = 1
+                                });
+                                if (goodsList != null && goodsList.Count > 0)
+                                {
+                                    string goodIds = string.Join(",", goodsList.Select(x => x.Id));
+                                    //判断用户是否点赞
+                                    List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                    if (UserId > 0)
+                                    {
+                                        dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = goodIds, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                    }
+                                    foreach (var gItem in goodsList)
+                                    {
+                                        int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == gItem.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                        gItem.ImageList = new List<string>();
+                                        if (!string.IsNullOrEmpty(gItem.Images) && gItem.Images != "[]")
+                                        {
+                                            gItem.ImageList = JsonConvert.DeserializeObject<List<string>>(gItem.Images);
+                                        }
+                                        blindDatePPPlusData.list.Add(new ActivityDetailsItem()
+                                        {
+                                            id = gItem.Id,
+                                            name = gItem.ActivityTitle,
+                                            picUrl = (gItem.ImageList != null && gItem.ImageList.Any()) ? gItem.ImageList.FirstOrDefault() : "",
+                                            CreateBy = gItem.UserName,
+                                            CreateByIco = gItem.Photo,
+                                            IsDianZan = dianZanCount,
+                                            CreateById = gItem.UserId,
+                                            DianZanNum = gItem.DianZanNum//先默认0
+                                        });
+                                    }
+                                }
+                            }
+                            //手动添加商品
+                            else
+                            {
+                                if (blindDatePPPlusData.list != null && blindDatePPPlusData.list.Count > 0)
+                                {
+                                    var Ids = "0," + string.Join(",", blindDatePPPlusData.list.Select(qitem => qitem.id));
+                                    var tempGoodsList = miaiModule.GetMiaiActivityList(new RB_Miai_Activity_Extend()
+                                    {
+                                        TenantId = TenantId,
+                                        MallBaseId = MallBaseId,
+                                        ActivityIds = Ids,
+                                        OrderBy = 1
+                                    });
+                                    //判断用户是否点赞
+                                    List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+                                    if (UserId > 0)
+                                    {
+                                        dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityIds = Ids, TenantId = TenantId, MallBaseId = MallBaseId, CreateBy = UserId });
+
+                                    }
+                                    List<ActivityDetailsItem> newGoodsList = new List<ActivityDetailsItem>();
+                                    foreach (var goodItem in blindDatePPPlusData.list)
+                                    {
+                                        var childItem = new ActivityDetailsItem();
+                                        var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
+                                        if (tempGood != null && tempGood.Id > 0)
+                                        {
+                                            int dianZanCount = (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(x => x.ActivityId == tempGood.Id && x.ActivityDiscussId == 0).FirstOrDefault()?.ID ?? 0 : 0;
+                                            tempGood.ImageList = new List<string>();
+                                            if (!string.IsNullOrEmpty(tempGood.Images) && tempGood.Images != "[]")
+                                            {
+                                                tempGood.ImageList = JsonConvert.DeserializeObject<List<string>>(tempGood.Images);
+                                            }
+                                            childItem.id = tempGood.Id;
+                                            childItem.name = tempGood.ActivityTitle;
+                                            childItem.picUrl = (tempGood.ImageList != null && tempGood.ImageList.Any()) ? tempGood.ImageList.FirstOrDefault() : "";
+                                            childItem.CreateBy = tempGood.UserName;
+                                            childItem.CreateByIco = tempGood.Photo;
+                                            childItem.IsDianZan = dianZanCount;
+                                            childItem.CreateById = tempGood.UserId;
+                                            childItem.DianZanNum = tempGood.DianZanNum;//先默认0
+                                            newGoodsList.Add(childItem);
+                                        }
+                                    }
+                                    blindDatePPPlusData.list = newGoodsList;
+                                }
+                            }
+                        }
+                    }
+                    obj = new
+                    {
+                        id = subItem.Id,
+                        data = blindDatePPPlusData
+                    };
+                    break;
             }
             return obj;
         }
@@ -2752,6 +3104,7 @@ namespace Mall.WebApi.Controllers
                 resultMallShopStyle?.main,
                 resultMallShopStyle?.secondary,
                 resultMallShopStyle?.IsEducation,
+                miaiPPPlusStyle = miniProgram.MiaiPPPlusStyle==0?1: miniProgram.MiaiPPPlusStyle
             };
 
             var setting = new

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -89,11 +89,13 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ImageList,
                 x.ReplyNum,
                 x.EnrollNum,
+                x.HotCommentList,
                 x.IsOpenEnroll,
                 x.Label,
                 LabelList = string.IsNullOrWhiteSpace(x.Label) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.Label),
-                StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm"),
-                EndTime = x.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                IsTieZi = (x.IsOpenEnroll == 2 && x.ManNum == 0 && x.WoManNum == 0 && x.Distinguish == 1 && !x.StartTime.HasValue && !x.EndTime.HasValue) ? 1 : 0,
                 x.ManNum,
                 x.WoManNum,
                 x.LonLat,
@@ -302,6 +304,224 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
+
+
+
+
+
+        #region 新的招募贴
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetSimpleActivityPageList()
+        {
+            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());
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = miaiModule.GetSimpleActivityPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.ActivityTitle,
+                x.UserId,
+                x.UserName,
+                x.Photo,
+                x.Sex,
+                x.Content,
+                x.ImageList,
+                x.ReplyNum,
+                x.EnrollNum,
+                x.IsOpenEnroll,
+                x.HotCommentList,
+                x.Label,
+                LabelList = string.IsNullOrWhiteSpace(x.Label) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.Label),
+                StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                x.ManNum,
+                x.WoManNum,
+                x.LonLat,
+                x.LocationName,
+                x.ForumId,
+                x.ForumName,
+                x.ForumIcon,
+                Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+
+
+        /// <summary>
+        /// 发布招募贴
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetSimpleActivityInfo()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            AppletUserInfo uInfo = UserReidsCache.GetAppletUserBlacklistInfo(userInfo.UserId);
+            if ((uInfo?.Blacklist ?? 0) == 1)
+            {
+                return ApiResult.Failed("已进入黑名单，无法访问");
+            }
+
+            var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = RequestParm.MallBaseId });
+
+            if (oldBaseInfo == null || oldBaseInfo.Id <= 0)
+            {
+                return ApiResult.Failed("请先实名认证");
+            }
+            if (string.IsNullOrWhiteSpace(oldBaseInfo.IDCardNo) || string.IsNullOrWhiteSpace(oldBaseInfo.RealName))
+            {
+                return ApiResult.Failed("请先通过身份证认证");
+            }
+
+            JObject jobj = JObject.Parse(parms.msg.ToString());
+            RB_Miai_Activity_Extend demodel = new RB_Miai_Activity_Extend()
+            {
+                Id = jobj.GetInt("Id"),
+                ForumId = jobj.GetInt("ForumId"),
+                ActivityTitle = jobj.GetStringValue("ActivityTitle"),
+                Content = jobj.GetStringValue("Content"),
+                ImageList = new List<string>(),
+                //  Deadline = jobj.GetDateTime("Deadline"),
+                LabelList = new List<string>(),
+                IsOpenEnroll = 2,
+                // StartTime = jobj.GetDateTime("StartTime"),
+                // EndTime = jobj.GetDateTime("EndTime"),
+                ManNum = 0,
+                WoManNum = 0,
+                LonLat = jobj.GetStringValue("LonLat"),
+                LocationName = jobj.GetStringValue("LocationName"),
+                Distinguish = 1,
+            };
+            try
+            {
+                demodel.ImageList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(jobj.GetStringValue("ImageList"));
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetActivityInfo_ImageList");
+            }
+            try
+            {
+                demodel.LabelList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(jobj.GetStringValue("LabelList"));
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetActivityInfo_LabelList");
+            }
+            if (demodel.ForumId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递版块id");
+            }
+            if (string.IsNullOrEmpty(demodel.ActivityTitle))
+            {
+                return ApiResult.ParamIsNull("请传递标题名称");
+            }
+            if (string.IsNullOrEmpty(demodel.Content))
+            {
+                return ApiResult.ParamIsNull("请传递内容");
+            }
+            //if (demodel.IsOpenEnroll == 1)
+            //{
+            //    if (demodel.Deadline < DateTime.Now)
+            //    {
+            //        return ApiResult.ParamIsNull("请重新选择报名截止日期");
+            //    }
+            //}
+
+            #region 内容是否违规
+            try
+            {
+                var miniModel = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+                int violationNum = programMsgModule.CheckViolation(miniModel, demodel.ActivityTitle);
+                int violationNum2 = programMsgModule.CheckViolation(miniModel, demodel.Content);
+                if (violationNum == 0 || violationNum2 == 0)
+                {
+                    return ApiResult.Failed("评论内容检测失败，请稍后再试");
+                }
+                else if (violationNum == 1 || violationNum2 == 1)
+                {
+                    var violationLogList = programMsgModule.GetViolationLogList(new RB_Education_ViolationLog { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId });
+                    if (violationLogList != null && violationLogList.Any() && violationLogList.Count() >= 1)
+                    {
+                        userInfo = new AppletUserInfo
+                        {
+                            MallBaseId = uInfo.MallBaseId,
+                            UserId = uInfo.UserId,
+                            TenantId = uInfo.TenantId,
+                            Name = uInfo.Name,
+                            SuperiorId = uInfo.SuperiorId,
+                            Blacklist = 1
+                        };
+                        CacheManager.User.UserReidsCache.AppletUserInfoSet(CacheKey.UserModuleCacheKeyConfig.Applet_Blacklist_Info + uInfo.UserId, userInfo, Config.JwtExpirTime);
+                        programMsgModule.UpdateUserBlacklist(userInfo.TenantId, userInfo.MallBaseId, userInfo.UserId);
+                    }
+                    programMsgModule.SetEducationViolationLog(new RB_Education_ViolationLog { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId, ViolationType = 3, CreateDate = System.DateTime.Now });
+                    miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
+                    {
+                        Id = 0,
+                        Type = Common.Enum.MiAi.MessageTypeEnum.ViolationNotice,
+                        UserId = userInfo.UserId,
+                        SourceId = 0,
+                        Content = "拼拼Plus发帖内容存在违规，若多次发布违规内容将被拉黑",
+                        Status = 0,
+                        TenantId = userInfo.TenantId,
+                        MallBaseId = userInfo.MallBaseId,
+                        CreateBy = userInfo.UserId,
+                        CreateDate = DateTime.Now,
+                        UpdateDate = DateTime.Now
+                    });
+                    return ApiResult.Failed("评论存在违规内容，若多次发布违规内容将被拉黑");
+                }
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetActivityInfo");
+                return ApiResult.Failed("评论内容检测失败，请稍后再试");
+            }
+            #endregion
+
+            demodel.ImageList ??= new List<string>();
+            demodel.Images = JsonConvert.SerializeObject(demodel.ImageList);
+
+
+            demodel.LabelList ??= new List<string>();
+
+            demodel.Label = JsonConvert.SerializeObject(demodel.LabelList);
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.Status = 0;
+            demodel.UserId = userInfo.UserId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = miaiModule.SetSimpleActivityInfo(demodel, out string msg);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
+        }
+        #endregion
+
+
+
+
+
+
         /// <summary>
         /// 删除招募贴
         /// </summary>
@@ -345,6 +565,14 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityDiscussPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+
+            //判断用户是否点赞
+            List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
+            if (parms.UserId > 0)
+            {
+                dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { ActivityId = demodel.ActivityId, TenantId = parms.TenantId, MallBaseId = parms.MallBaseId, CreateBy = parms.UserId });
+
+            }
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
             {
@@ -355,6 +583,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.Sex,
                 x.Content,
                 x.ImageList,
+                x.ActivityId,
                 ReplyList = x.ReplyList.Select(z => new
                 {
                     z.Id,
@@ -365,9 +594,14 @@ namespace Mall.WebApi.Controllers.MallBase
                     z.ImageList,
                     z.ReplyUserId,
                     z.ReplyUserName,
+                    z.DianZanNum,
+                    z.ActivityId,
+                    DianZanId = parms.UserId > 0 ? (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(t => t.CreateBy == parms.UserId && t.ActivityId == demodel.ActivityId && t.ActivityDiscussId > 0 && t.ActivityDiscussId == z.Id).FirstOrDefault()?.ID ?? 0 : 0 : 0,
                     CreateDate = z.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
                 }),
                 x.ReplyNum,
+                x.DianZanNum,
+                DianZanId = parms.UserId > 0 ? (dianZanList != null && dianZanList.Any()) ? dianZanList.Where(y => y.CreateBy == parms.UserId && y.ActivityId == demodel.ActivityId && y.ActivityDiscussId > 0 && y.ActivityDiscussId == x.Id).FirstOrDefault()?.ID ?? 0 : 0 : 0,
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pagelist);
@@ -392,7 +626,20 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityDiscussList(demodel);
 
-            return ApiResult.Success("", new { totalCount = list.Count() });
+            var dianZanList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend
+            {
+                MallBaseId = parms.MallBaseId,
+                ActivityId = demodel.ActivityId,
+                IsSelectActivity = 0,
+                TenantId = parms.TenantId
+            });
+            return ApiResult.Success("", new
+            {
+                totalCount = list.Count(),
+                ActivityCount = dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId == 0).Count(),
+                ActivityDiscussCount = dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId > 0).Count(),
+                ActivityList = dianZanList.Where(x => x.ActivityId > 0 && x.ActivityDiscussId == 0).Select(x => new { x.ID, x.CreateBy, x.UserName, x.Photo, IsOwn = parms.UserId > 0 ? (x.CreateBy == parms.UserId) ? 1 : 0 : 0 })
+            });
         }
 
 
@@ -1789,5 +2036,106 @@ namespace Mall.WebApi.Controllers.MallBase
         #endregion
 
 
+        #region 点赞
+
+        /// <summary>
+        /// 关注会员
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDianZan()
+        {
+            var parms = RequestParm;
+            var userInfo = AppletUserInfo;
+            var query = JsonConvert.DeserializeObject<RB_MiAi_DianZan_Extend>(RequestParm.msg.ToString());
+            query.TenantId = userInfo.TenantId;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.CreateBy = userInfo.UserId;
+
+            bool isUpdate = true;
+
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入我点赞的信息");
+            }
+            else
+            {
+
+                if (query.IsSelectActivity == 1)
+                {
+                    if (query.ActivityId == 0)
+                    {
+                        return ApiResult.ParamIsNull("");
+                    }
+                }
+                else if (query.IsSelectActivity == 2)
+                {
+                    if (query.ActivityId == 0)
+                    {
+                        return ApiResult.ParamIsNull("");
+                    }
+                    if (query.ActivityDiscussId == 0)
+                    {
+                        return ApiResult.ParamIsNull("");
+                    }
+                }
+                else
+                {
+                    return ApiResult.Failed("点赞类型不存在");
+                }
+                //判断是否已经点赞过
+                var oldList = miaiModule.GetDianZanList(new RB_MiAi_DianZan_Extend { Status = -1, ActivityDiscussId = query.ActivityDiscussId, ActivityId = query.ActivityId, IsSelectActivity = query.IsSelectActivity, MallBaseId = query.MallBaseId, TenantId = query.TenantId }); ;
+                if (query.ID == 0)
+                {
+                    isUpdate = false;
+                    query.CreateDate = System.DateTime.Now;
+                    query.UpdateDate = System.DateTime.Now;
+
+                    if (oldList != null && oldList.Any(x => x.Status == 0))
+                    {
+                        return ApiResult.Failed("您已点赞，请勿重复操作");
+                    }
+                    else
+                    {
+                        if (oldList != null && oldList.Any())
+                        {
+                            query.ID = oldList.OrderByDescending(x => x.CreateDate).FirstOrDefault().ID;
+                        }
+                        query.Status = 0;
+                    }
+                }
+                else
+                {
+                    query.Status = 1;
+                }
+
+                bool result = miaiModule.AddOrUpdateDianZan(query);
+                if (isUpdate)
+                {
+                    if (result)
+                    {
+                        return ApiResult.Success("取消点赞成功");
+                    }
+                    else
+                    {
+                        return ApiResult.Failed("取消点赞成功");
+                    }
+                }
+                else
+                {
+                    if (result)
+                    {
+                        return ApiResult.Success("点赞成功");
+                    }
+                    else
+                    {
+                        return ApiResult.Failed("点赞成功");
+                    }
+                }
+            }
+        }
+        #endregion
+
+
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -144,8 +144,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.EnrollNum,
                 x.IsOpenEnroll,
                 x.Label,
-                StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm"),
-                EndTime = x.EndTime.ToString("yyyy-MM-dd HH:mm"),
+                StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                IsTieZi = (x.IsOpenEnroll == 2 && x.ManNum == 0 && x.WoManNum == 0 && x.Distinguish == 1 && !x.StartTime.HasValue && !x.EndTime.HasValue) ? 1 : 0,
                 x.ManNum,
                 x.WoManNum,
                 x.LonLat,
@@ -156,6 +157,47 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", pagelist);
         }
 
+
+        /// <summary>
+        /// 获取活动分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivityDianZanPageList()
+        {
+            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());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = miaiModule.GetActivityPageList_V3(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.ActivityTitle,
+                x.UserId,
+                x.UserName,
+                x.Photo,
+                x.Content,
+                x.ImageList,
+                x.ReplyNum,
+                x.EnrollNum,
+                x.IsOpenEnroll,
+                x.Label,
+                StartTime = x.StartTime.HasValue ? x.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                EndTime = x.EndTime.HasValue ? x.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                x.ManNum,
+                x.WoManNum,
+                x.LonLat,
+                x.LocationName,
+                x.DianZanNum,
+                Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
         /// <summary>
         /// 获取活动信息（包含报名人数）
         /// </summary>
@@ -1003,7 +1045,7 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", new
             {
                 model.Id,
-                WechatNo = oldBaseInfo.WechatNo??"",
+                WechatNo = oldBaseInfo.WechatNo ?? "",
                 Photo = model.Photo ?? "",
                 model.Name,
                 model.AliasName,

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -3170,6 +3170,9 @@ namespace Mall.WebApi.Controllers.MallBase
             var newGoodsList = new List<RB_Goods_Extend>();
             foreach (var item in goodsList)
             {
+                int TenantId = item.TenantId;
+                int MallBaseId = item.MallBaseId;
+
                 RB_Goods_Extend model = new RB_Goods_Extend();
                 item.IsDefaultService = 1;
                 item.IsAreaBuy = 2;
@@ -3211,10 +3214,11 @@ namespace Mall.WebApi.Controllers.MallBase
                 item.SpecificationPriceList.ForEach(x => x.CreateDate = System.DateTime.Now);
                 item.SpecificationPriceList.ForEach(x => x.MallBaseId = RequestParm.MallBaseId);
                 model = item;
+              
+                model.SourceTenantId = TenantId;
+                model.SourceMallBaseId = MallBaseId;
                 model.TenantId = RequestParm.TenantId;
                 model.MallBaseId = RequestParm.MallBaseId;
-                model.SourceTenantId = item.TenantId;
-                model.SourceMallBaseId = item.MallBaseId;
                 model.SourceGoodsId = item.Id;
                 model.RetailStore = 0;
                 model.Id = 0;

Mall.WebApi/Controllers/User/TenantController.cs

@@ -421,6 +421,25 @@ namespace Mall.WebApi.Controllers.User
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+
+        /// <summary>
+        /// 更新相亲拼拼plus风格
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiaiPPPlusStyle()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var MallBaseId = parms.GetInt("MallBaseId", 0);
+            int MiaiPPPlusStyle = parms.GetInt("MiaiPPPlusStyle");
+            var extModel = new RB_MiniProgram_Extend()
+            {
+                MallBaseId = MallBaseId,
+                MiaiPPPlusStyle = MiaiPPPlusStyle
+            };
+            var flag = programModule.SetMiaiPPPlusStyle(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 新增修改底部导航
         /// </summary>