1

Mall.Common/Plugin/StringHelper.cs

@@ -52,7 +52,26 @@ namespace Mall.Common.Plugin
 
         #region "日期相关"
 
-
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        /// <param name="bornDate"></param>
+        /// <returns></returns>
+        public static string GetAge(string bornDate)
+        {
+            DateTime b = DateTime.Parse(bornDate);
+            int a2 = DateTime.Now.Year;
+            int b2 = b.Year;
+            int a3 = DateTime.Now.Month;
+            int b3 = b.Month;
+            int a4 = DateTime.Now.Day;
+            int b4 = b.Day;
+            int aa = (a2 - 1900) * 365 + a3 * 30 + a4;
+            int bb = (b2 - 1900) * 365 + b3 * 30 + b4;
+            int cc = aa - bb; //天数
+            int dd = (int)Math.Floor(Convert.ToDouble(cc / 365));
+            return dd.ToString();
+        }
 
         public static string DateFormatToString(DateTime dt)
         {

Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs

@@ -81,6 +81,87 @@ namespace Mall.Model.Entity.Miai
         public string IDCardBack { get; set; }
 
 
+        /// <summary>
+        /// 户口
+        /// </summary>
+        public string HuKou { get; set; }
+
+        /// <summary>
+        /// 籍贯
+        /// </summary>
+        public string NativePlace { get; set; }
+
+        /// <summary>
+        /// 房屋信息
+        /// </summary>
+        public string HouseInfo { get; set; }
+
+        /// <summary>
+        /// 学校信息
+        /// </summary>
+        public string SchoolInfo { get; set; }
+
+        /// <summary>
+        /// 年收入
+        /// </summary>
+        public string YearMoney { get; set; }
+
+        /// <summary>
+        /// 职务
+        /// </summary>
+        public string Job { get; set; }
+
+        /// <summary>
+        /// 其他兄弟姐妹
+        /// </summary>
+        public string OtherPople { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public string MajorInfo { get; set; }
+
+        /// <summary>
+        /// 车辆信息
+        /// </summary>
+        public string CarInfo { get; set; }
+
+        /// <summary>
+        /// 父亲工作信息
+        /// </summary>
+        public string FatherInfo { get; set; }
+
+        /// <summary>
+        /// 母亲工作信息
+        /// </summary>
+        public string MotherInfo { get; set; }
+
+        /// <summary>
+        /// 关于
+        /// </summary>
+        public string About { get; set; }
+
+        /// <summary>
+        /// 理想爱情
+        /// </summary>
+        public string IdealLove { get; set; }
+
+
+        /// <summary>
+        /// 相册
+        /// </summary>
+        public string Album { get; set; }
+
+        /// <summary>
+        /// 浏览数
+        /// </summary>
+        public int BrowseNum { get; set; }
+
+
+        /// <summary>
+        /// 关注数
+        /// </summary>
+        public int FollowNum { get; set; }
+
         /// <summary>
         /// 商户号Id
         /// </summary>        

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -3010,4 +3010,130 @@ namespace Mall.Model.Extend.MarketingCenter
 
     }
     #endregion
+
+
+    #region 相亲- 人物插件
+    public class MiAiUserItem
+    {
+
+        /// <summary>
+        /// 人数数量
+        /// </summary>
+        public int goodsLength { get; set; }
+
+        /// <summary>
+        /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
+        /// </summary>
+        public int listStyle { get; set; }
+
+
+
+        /// <summary>
+        /// 用户添加方式（0-自定义，1-按照匹配度【规则未确定】，2-按照热度【被浏览数据，被关注数据】，3-按照最新）
+        /// </summary>
+        public int addUserType { get; set; }
+
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
+        public string backgroundColor { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string PaddingTop { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string PaddingBottom { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string PaddingLeft { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string PaddingRight { get; set; }
+
+        /// <summary>
+        /// 搜索圆角像素
+        /// </summary>        
+        public int SearchFilletPX
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 自定义列表
+        /// </summary>
+        public List<miaiUserDetail> list { get; set; }
+    }
+
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class miaiUserDetail
+    {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
+        public int id { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+
+        public string name { get; set; }
+
+        /// <summary>
+        /// 商品图片
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string SexStr { get; set; }
+
+
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public string Age { get; set; }
+
+        /// <summary>
+        /// 学历
+        /// </summary>
+        public string Education { get; set; }
+
+        /// <summary>
+        /// 婚姻状态
+        /// </summary>
+        public string Marriage { get; set; }
+
+        /// <summary>
+        /// 匹配度
+        /// </summary>
+        public int MatchingRate { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public int Score { get; set; }
+
+        /// <summary>
+        /// 相册
+        /// </summary>
+        public string Album { get; set; }
+
+
+        public List<string> AlbumList { get; set; }
+    }
+    #endregion
 }
\ No newline at end of file

Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs

@@ -5,8 +5,29 @@ using Mall.Model.Entity.Miai;
 
 namespace Mall.Model.Extend.Miai
 {
-  public  class RB_MiAi_BaseInfo_Extend: RB_MiAi_BaseInfo
+    public class RB_MiAi_BaseInfo_Extend : RB_MiAi_BaseInfo
     {
+        /// <summary>
+        /// 相册
+        /// </summary>
+        public List<string> AlbumList { get; set; }
 
+        public string Name { get; set; }
+
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 指定用户id
+        /// </summary>
+        public string UserIds { get; set; }
+
+        /// <summary>
+        /// 0-指定用户，1-按照匹配度，2-按照热度，3-按照最新
+        /// </summary>
+        public int Sort { get; set; }
     }
 }

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -621,6 +621,31 @@ namespace Mall.Module.MarketingCenter
                     }
                     item.data = storeModel;
                     break;
+                //教育模块-老师列表
+                case "miaiuser":
+                    MiAiUserItem miaiUserItem = new MiAiUserItem();
+                    try
+                    {
+                        var driveData = JsonHelper.DeserializeObject<MiAiUserItem>(item.data.ToString());
+                        if (driveData != null)
+                        {
+                            miaiUserItem.listStyle = driveData?.listStyle ?? 1;
+                            miaiUserItem.backgroundColor = driveData?.backgroundColor ?? "";
+                            miaiUserItem.PaddingTop = driveData?.PaddingTop ?? "0";
+                            miaiUserItem.PaddingBottom = driveData?.PaddingBottom ?? "0";
+                            miaiUserItem.PaddingLeft = driveData?.PaddingLeft ?? "0";
+                            miaiUserItem.PaddingRight = driveData?.PaddingRight ?? "0";
+                            miaiUserItem.SearchFilletPX = driveData?.SearchFilletPX ?? 0;
+                            miaiUserItem.list = new List<miaiUserDetail>();
+                            miaiUserItem.list = driveData.list;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Common.Plugin.LogHelper.Write(ex, "miaiuser");
+                    }
+                    item.data = miaiUserItem;
+                    break;
                 //导航-页面
                 case "nav-page": item.data = JsonHelper.DeserializeObject<navPageItem>(item.data.ToString()); break;
 

Mall.Module.Miai/MiaiModule.cs

@@ -81,7 +81,8 @@ namespace Mall.Module.Miai
                 bool flag = miai_ForumRepository.Update(keyValues, wheres);
                 return flag;
             }
-            else {
+            else
+            {
                 bool flag = miai_ForumRepository.Insert(demodel) > 0;
                 return flag;
             }
@@ -113,7 +114,8 @@ namespace Mall.Module.Miai
                 bool flag = miai_ForumRepository.Update(keyValues, wheres);
                 return flag;
             }
-            else {
+            else
+            {
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Miai_Forum_Extend.Status),1},
                     { nameof(RB_Miai_Forum_Extend.UpdateDate),DateTime.Now},
@@ -260,7 +262,8 @@ namespace Mall.Module.Miai
                 };
                 return miai_ActivityRepository.Update(keyValues, wheres);
             }
-            else {
+            else
+            {
                 return miai_ActivityRepository.Insert(demodel) > 0;
             }
         }
@@ -288,7 +291,8 @@ namespace Mall.Module.Miai
                 }
             };
             bool flag = miai_ActivityRepository.Update(keyValues, wheres);
-            if (flag) {
+            if (flag)
+            {
                 miai_LogRepository.Insert(new Model.Entity.Miai.RB_Miai_Log()
                 {
                     Id = 0,
@@ -355,20 +359,24 @@ namespace Mall.Module.Miai
         {
             demodel.ParentId = -1;//查询主评论
             var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel);
-            if (list.Any()) {
+            if (list.Any())
+            {
                 //查询评论下  前几条回复记录
                 List<int> PidsList = list.Select(x => x.Id).ToList();
                 var clist = miai_ActivityDiscussRepository.GetActivityDiscussChildList(PidsList, 4);
                 //查询评论回复数量
                 var rlist = miai_ActivityDiscussRepository.GetDiscussReplyNumList(string.Join(",", PidsList));
-                foreach (var item in list) {
+                foreach (var item in list)
+                {
                     item.ReplyList = clist.Where(x => x.ParentId == item.Id).OrderBy(x => x.Id).ToList();
                     item.ReplyNum = rlist.Where(x => x.ParentId == item.Id).FirstOrDefault()?.ReplyNum ?? 0;
                     item.ImageList = new List<string>();
-                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]") {
+                    if (!string.IsNullOrEmpty(item.Images) && item.Images != "[]")
+                    {
                         item.ImageList = JsonConvert.DeserializeObject<List<string>>(item.Images);
                     }
-                    foreach (var qitem in item.ReplyList) {
+                    foreach (var qitem in item.ReplyList)
+                    {
                         qitem.ImageList = new List<string>();
                         if (!string.IsNullOrEmpty(qitem.Images) && qitem.Images != "[]")
                         {
@@ -481,7 +489,7 @@ namespace Mall.Module.Miai
         /// <param name="discussId"></param>
         /// <param name="empId"></param>
         /// <returns></returns>
-        public string DelActivityDiscussInfo_V2(int discussId, int empId,int TenantId,int MallBaseId)
+        public string DelActivityDiscussInfo_V2(int discussId, int empId, int TenantId, int MallBaseId)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Miai_ActivityDiscuss_Extend.Status),1},
@@ -559,7 +567,8 @@ namespace Mall.Module.Miai
             if (list.Any()) { return "已存在报名信息"; }
             var model = miai_ActivityRepository.GetEntity(demodel.ActivityId);
             if (model == null || model.Status == 1) { return "活动不存在"; }
-            if (model.Deadline <= DateTime.Now) {
+            if (model.Deadline <= DateTime.Now)
+            {
                 return "已过了报名时间，无法报名";
             }
             bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
@@ -672,8 +681,59 @@ namespace Mall.Module.Miai
             {
                 flag = miai_BaseInfoRepository.Insert(model) > 0;
             }
+            else {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        //{ nameof(RB_MiAi_BaseInfo_Extend.Sex),model.Sex},
+                        { nameof(RB_MiAi_BaseInfo_Extend.Birthday),model.Birthday},
+                        { nameof(RB_MiAi_BaseInfo_Extend.Weight),model.Weight},
+                        { nameof(RB_MiAi_BaseInfo_Extend.Height),model.Height},
+                        { nameof(RB_MiAi_BaseInfo_Extend.EducationType),model.EducationType},
+                        { nameof(RB_MiAi_BaseInfo_Extend.Marriage),model.Marriage},
+                        //{ nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName},
+                        //{ nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
+                        //{ nameof(RB_MiAi_BaseInfo_Extend.IDCard),model.IDCard},
+                        //{ nameof(RB_MiAi_BaseInfo_Extend.IDCardBack),model.IDCardBack},
+                        { nameof(RB_MiAi_BaseInfo_Extend.HuKou),model.HuKou},
+                        { nameof(RB_MiAi_BaseInfo_Extend.NativePlace),model.NativePlace},
+                        { nameof(RB_MiAi_BaseInfo_Extend.HouseInfo),model.HouseInfo},
+                        { nameof(RB_MiAi_BaseInfo_Extend.SchoolInfo),model.SchoolInfo},
+                        { nameof(RB_MiAi_BaseInfo_Extend.YearMoney),model.YearMoney},
+                        { nameof(RB_MiAi_BaseInfo_Extend.Job),model.Job},
+                        { nameof(RB_MiAi_BaseInfo_Extend.OtherPople),model.OtherPople},
+                        { nameof(RB_MiAi_BaseInfo_Extend.MajorInfo),model.MajorInfo},
+                        { nameof(RB_MiAi_BaseInfo_Extend.CarInfo),model.CarInfo},
+                        { nameof(RB_MiAi_BaseInfo_Extend.FatherInfo),model.FatherInfo},
+                        { nameof(RB_MiAi_BaseInfo_Extend.MotherInfo),model.MotherInfo},
+                        { nameof(RB_MiAi_BaseInfo_Extend.About),model.About},
+                        { nameof(RB_MiAi_BaseInfo_Extend.IdealLove),model.IdealLove},
+                          { nameof(RB_MiAi_BaseInfo_Extend.Album),model.Album}
+                    };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id),
+                              FiledValue=model.Id,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+
+                flag = miai_BaseInfoRepository.Update(keyValues, wheres);
+            }
             return flag;
         }
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_MiAi_BaseInfo_Extend> GetFirstBaseInfoPageList(int pageIndex, int pageSize, out long rowsCount, RB_MiAi_BaseInfo_Extend where)
+        {
+            return miai_BaseInfoRepository.GetFirstBaseInfoPageList(pageIndex, pageSize, out rowsCount, where);
+        }
         #endregion
 
         #region 我的粉丝/我的关注
@@ -682,15 +742,15 @@ namespace Mall.Module.Miai
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model)
+        public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model, RB_MiAi_BaseInfo_Extend baseInfo)
         {
             bool flag = false;
             try
             {
-
                 if (model.ID == 0)
                 {
                     flag = miai_FollowMemberRepository.Insert(model) > 0;
+                    baseInfo.FollowNum += 1;
                 }
                 else
                 {
@@ -705,8 +765,30 @@ namespace Mall.Module.Miai
                                OperatorEnum=OperatorEnum.Equal
                         }
                     };
+                    if (model.Status == 1)//取消关注
+                    {
+                        baseInfo.FollowNum -= 1;
+                    }
+                    else {
+                        baseInfo.FollowNum += 1;
+                    }
                     flag = miai_FollowMemberRepository.Update(keyValues, wheres);
                 }
+                if (flag)
+                {
+
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                        { nameof(RB_MiAi_BaseInfo_Extend.FollowNum),baseInfo.FollowNum}
+                    };
+                    List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id),
+                              FiledValue=baseInfo.Id,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                    miai_BaseInfoRepository.Update(keyValues, wheres);
+                }
             }
             catch (Exception ex)
             {
@@ -782,7 +864,10 @@ namespace Mall.Module.Miai
             }
             return list;
         }
-        #endregion
 
-    }
+
+       
+            #endregion
+
+        }
 }

Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs

@@ -7,7 +7,7 @@ using Mall.Model.Extend.Miai;
 
 namespace Mall.Repository.Miai
 {
-  public  class RB_MiAi_BaseInfoRepository:BaseRepository<RB_MiAi_BaseInfo>
+    public class RB_MiAi_BaseInfoRepository : BaseRepository<RB_MiAi_BaseInfo>
     {
         /// <summary>
         /// 表名称
@@ -77,5 +77,61 @@ namespace Mall.Repository.Miai
             }
             return GetPage<RB_MiAi_BaseInfo_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
         }
+
+
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_MiAi_BaseInfo_Extend> GetFirstBaseInfoPageList(int pageIndex, int pageSize, out long rowsCount, RB_MiAi_BaseInfo_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT a.*,b.`Name`,b.Photo   from RB_MiAi_BaseInfo as a
+LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklist!=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.UserId > 0)
+                {
+                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                }
+
+                if (!string.IsNullOrWhiteSpace(where.UserIds))
+                {
+                    sb.AppendFormat(" and a.UserId in({0})", where.UserIds);
+                }
+
+                if (where.Sort == 1)
+                {
+                   // sb.AppendFormat("  order by ");
+                }
+                else if (where.Sort == 2)
+                {
+                    sb.AppendFormat(" ORDER BY (a.FollowNum+a.BrowseNum) desc");
+                }
+                else if (where.Sort ==3)
+                {
+                    sb.AppendFormat(" ORDER BY b.CreateDate desc ");
+                }
+            }
+            return GetPage<RB_MiAi_BaseInfo_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
     }
 }