提交代码

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -630,6 +630,7 @@ namespace Mall.Module.MarketingCenter
                         var driveData = JsonHelper.DeserializeObject<MiAiUserItem>(item.data.ToString());
                         if (driveData != null)
                         {
+                            //miaiUserItem.goodsLength = driveData?.goodsLength ?? 0;
                             miaiUserItem.listStyle = driveData?.listStyle ?? 1;
                             miaiUserItem.backgroundColor = driveData?.backgroundColor ?? "";
                             miaiUserItem.PaddingTop = driveData?.PaddingTop ?? "0";
@@ -637,6 +638,7 @@ namespace Mall.Module.MarketingCenter
                             miaiUserItem.PaddingLeft = driveData?.PaddingLeft ?? "0";
                             miaiUserItem.PaddingRight = driveData?.PaddingRight ?? "0";
                             miaiUserItem.SearchFilletPX = driveData?.SearchFilletPX ?? 0;
+                            miaiUserItem.goodsLength = driveData.goodsLength;
                             miaiUserItem.BrowseRate = miaiUserItem.addUserType == 2 ? (miaiUserItem.BrowseRate == 0 ? 1 : miaiUserItem.BrowseRate) : 0;
                             miaiUserItem.FollowRate = miaiUserItem.addUserType == 2 ? (miaiUserItem.FollowRate == 0 ? 1 : miaiUserItem.FollowRate) : 0;
                             miaiUserItem.list = new List<miaiUserDetail>();

Mall.Module.Miai/MiaiModule.cs

@@ -782,15 +782,29 @@ namespace Mall.Module.Miai
         {
             return miai_BaseInfoRepository.GetFirstBaseInfoPageList(pageIndex, pageSize, out rowsCount, where);
         }
-        #endregion
 
-        #region 我的粉丝/我的关注
+
         /// <summary>
-        /// 新增/修改我关注的会员配置
+        /// 分页列表
         /// </summary>
-        /// <param name="model"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
         /// <returns></returns>
-        public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model, RB_MiAi_BaseInfo_Extend baseInfo)
+        public List<RB_MiAi_BaseInfo_Extend> GetFirstBaseInfoList(RB_MiAi_BaseInfo_Extend where)
+        {
+            return miai_BaseInfoRepository.GetFirstBaseInfoList( where);
+        }
+            #endregion
+
+            #region 我的粉丝/我的关注
+            /// <summary>
+            /// 新增/修改我关注的会员配置
+            /// </summary>
+            /// <param name="model"></param>
+            /// <returns></returns>
+            public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model, RB_MiAi_BaseInfo_Extend baseInfo)
         {
             bool flag = false;
             try

Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs

@@ -146,5 +146,61 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id   where a.Status=0 and b.Blacklis
             }
             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> GetFirstBaseInfoList(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* {where.FollowRate})+(a.BrowseNum*{where.BrowseRate}))) desc");
+                }
+                else if (where.Sort == 3)
+                {
+                    sb.AppendFormat(" ORDER BY b.CreateDate desc ");
+                }
+            }
+            return Get<RB_MiAi_BaseInfo_Extend>( sb.ToString()).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -1294,8 +1294,7 @@ namespace Mall.WebApi.Controllers
                             if (miAiUserItem.list != null && miAiUserItem.list.Count > 0)
                             {
                                 var Ids = "0," + string.Join(",", miAiUserItem.list.Select(qitem => qitem.id));
-                                long rowCount = 0;
-                                var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
+                                var tempGoodsList = miaiModule.GetFirstBaseInfoList( new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
                                 {
                                     TenantId = TenantId,
                                     MallBaseId = MallBaseId,