提交代码

Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs

@@ -15,6 +15,8 @@ namespace Mall.Model.Extend.Miai
         public string Name { get; set; }
 
 
+        public int Age { get; set; }
+
         /// <summary>
         /// 头像
         /// </summary>

Mall.Module.Miai/MiaiModule.cs

@@ -1034,9 +1034,25 @@ namespace Mall.Module.Miai
         {
             return miai_BaseInfoRepository.GetFirstBaseInfoList( where);
         }
+
+
+
+
+        /// <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> GetMatchingBaseInfoList(RB_MiAi_BaseInfo_Extend where, int Top)
+        {
+            return miai_BaseInfoRepository.GetMatchingBaseInfoList(where, Top);
+        }
             #endregion
 
-        #region 我的粉丝/我的关注
+            #region 我的粉丝/我的关注
             /// <summary>
             /// 新增/修改我关注的会员配置
             /// </summary>

Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs

@@ -104,7 +104,7 @@ namespace Mall.Repository.Miai
         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
+            sb.Append($@"SELECT a.*,b.`Name`,b.Photo ,(YEAR (curdate())- YEAR ( a.Birthday )- 1+ (DATE_FORMAT(  a.Birthday, '%m%d' )<=(DATE_FORMAT( curdate(), '%m%d' )))) Age   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)
             {
@@ -122,9 +122,12 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
                 }
                 if (where.UserId > 0)
                 {
-                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                    sb.AppendFormat(" and a.UserId !={0}", where.UserId);
+                }
+                if (where.Sex > 0)
+                {
+                    sb.AppendFormat(" and a.Sex !={0}", where.Sex);
                 }
-
                 if (!string.IsNullOrWhiteSpace(where.UserIds))
                 {
                     sb.AppendFormat(" and a.UserId in({0})", where.UserIds);
@@ -132,14 +135,14 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
 
                 if (where.Sort == 1)
                 {
-                   // sb.AppendFormat("  order by ");
+                    // sb.AppendFormat("  order by ");
                 }
                 else if (where.Sort == 2)
                 {
 
                     sb.AppendFormat($@" ORDER BY (((a.FollowNum* {where.FollowRate})+(a.BrowseNum*{where.BrowseRate}))) desc");
                 }
-                else if (where.Sort ==3)
+                else if (where.Sort == 3)
                 {
                     sb.AppendFormat(" ORDER BY b.CreateDate desc ");
                 }
@@ -149,6 +152,12 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
 
 
 
+
+
+
+
+
+
         /// <summary>
         /// 分页列表
         /// </summary>
@@ -160,7 +169,7 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
         public List<RB_MiAi_BaseInfo_Extend> GetFirstBaseInfoList(RB_MiAi_BaseInfo_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT a.*,b.`Name`,b.Photo   from RB_MiAi_BaseInfo as a
+            sb.Append($@"SELECT a.*,b.`Name`,b.Photo ,(YEAR (curdate())- YEAR ( a.Birthday )- 1+ (DATE_FORMAT(  a.Birthday, '%m%d' )<=(DATE_FORMAT( curdate(), '%m%d' )))) Age    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)
             {
@@ -178,7 +187,11 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
                 }
                 if (where.UserId > 0)
                 {
-                    sb.AppendFormat(" and a.UserId={0}", where.UserId);
+                    sb.AppendFormat(" and a.UserId !={0}", where.UserId);
+                }
+                if (where.Sex > 0)
+                {
+                    sb.AppendFormat(" and a.Sex !={0}", where.Sex);
                 }
 
                 if (!string.IsNullOrWhiteSpace(where.UserIds))
@@ -200,7 +213,69 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
                     sb.AppendFormat(" ORDER BY b.CreateDate desc ");
                 }
             }
-            return Get<RB_MiAi_BaseInfo_Extend>( sb.ToString()).ToList();
+            return Get<RB_MiAi_BaseInfo_Extend>(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> GetMatchingBaseInfoList(RB_MiAi_BaseInfo_Extend where,int  Top)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT
+   a. *,b.`Name`,b.Photo ,(YEAR (curdate())- YEAR ( a.Birthday )- 1+ (DATE_FORMAT(  a.Birthday, '%m%d' )<=(DATE_FORMAT( curdate(), '%m%d' )))) Age
+FROM
+    `RB_MiAi_BaseInfo` AS a
+JOIN (
+    SELECT
+        ROUND(
+            RAND() * (
+                (SELECT MAX(id) FROM `RB_MiAi_BaseInfo`) - (SELECT MIN(id) FROM `RB_MiAi_BaseInfo`)
+            ) + (SELECT MIN(id) FROM `RB_MiAi_BaseInfo`)
+        ) AS id
+) AS t2
+LEFT JOIN rb_member_user as b on a.UserId=b.Id  
+WHERE
+    a.id >= t2.id and a.Status=0 and b.Blacklist!=1
+ORDER BY
+    a.id
+LIMIT {Top} ");
+            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 (where.Sex > 0)
+                {
+                    sb.AppendFormat(" and a.Sex!={0}", where.Sex);
+                }
+                if (!string.IsNullOrWhiteSpace(where.UserIds))
+                {
+                    sb.AppendFormat(" and a.UserId in({0})", where.UserIds);
+                }
+            }
+            return Get<RB_MiAi_BaseInfo_Extend>(sb.ToString()).ToList();
         }
     }
 }

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -101,6 +101,10 @@ namespace Mall.WebApi.Controllers.MallBase
 
             //店铺id
             int storeId = parms.GetInt("StoreId", 0);
+            //用户id
+            int userId = RequestParm.UserId;
+            //用户性别
+            int sex = parms.GetInt("Sex", 0);
             //首页数据
             var homePage = new object();
             //底部导航
@@ -177,7 +181,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         {
                             foreach (var subItem in templateModel.ComponentDataList)
                             {
-                                templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, storeId));
+                                templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, sex, storeId,userId));
                             }
                         }
                         var tempObj = new
@@ -250,7 +254,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             {
                                 foreach (var subItem in templateModel.ComponentDataList)
                                 {
-                                    templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, storeId));
+                                    templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, storeId, userId));
                                 }
                             }
                             var tempObj = new