页面修改

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -101,5 +101,9 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public int IsSelectOverTime { get; set; }
 
+        /// <summary>
+        /// 小程序排序
+        /// </summary>
+        public int SortNum { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -120,6 +120,10 @@ namespace Mall.Model.Extend.User
 
         #endregion
 
+        /// <summary>
+        /// 小程序排序
+        /// </summary>
+        public int SortNum { get; set; }
     }
 
 

Mall.Module.User/UserModule.cs

@@ -3968,7 +3968,16 @@ namespace Mall.Module.User
         {
             string UserIds = member_UserRepository.GetMemberChildIdStr(demodel.UserId ?? 0);
 
-            var list = member_UserRepository.GetPageListForFX(pageIndex, pageSize, out count, new RB_Member_User_Extend() { UserIds = UserIds, FXGradeId = demodel.FXGradeId, Name = demodel.Name, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+            var list = member_UserRepository.GetPageListForFX(pageIndex, pageSize, out count,
+                new RB_Member_User_Extend()
+                {
+                    UserIds = UserIds,
+                    FXGradeId = demodel.FXGradeId,
+                    Name = demodel.Name,
+                    TenantId = demodel.TenantId,
+                    MallBaseId = demodel.MallBaseId,
+                    SortNum = demodel.SortNum
+                });
             List<object> RList = new List<object>();
             if (list.Any())
             {

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -411,35 +411,42 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.CreateDate)} <='{dmodel.EndTime + " 23:59:59"}'";
             }
+            //默认综合【升序】
             string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc";
+            //上架时间【降序】
             if (dmodel.OrderBy == 1)
-            {//最新
-                orderBy = $" order by g.{nameof(RB_Goods_Extend.CreateDate)} desc";
+            {
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.CreateDate)} DESC";
+            }
+            //上架时间【升序】
+            else if (dmodel.OrderBy == 5)
+            {
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.CreateDate)} ASC ";
             }
+            //价格低=>高【升序】
             else if (dmodel.OrderBy == 2)
             {
-                //价格低-高
-                orderBy = $" order by g.{nameof(RB_Goods_Extend.SellingPrice)} asc";
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.SellingPrice)} ASC";
             }
+            //价格高=>低【降序】
             else if (dmodel.OrderBy == 3)
             {
-                //价格高-低
-                orderBy = $" order by g.{nameof(RB_Goods_Extend.SellingPrice)} desc";
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.SellingPrice)} DESC";
             }
+            //销量高=>低【降序】
             else if (dmodel.OrderBy == 4)
             {
-                //销量高-低
-                orderBy = $" order by g.{nameof(RB_Goods_Extend.SalesNum)} desc ";
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.SalesNum)} DESC ";
             }
-            //上架时间升序
-            else if (dmodel.OrderBy == 5)
+            //销量低=>高【升序】
+            else if (dmodel.OrderBy == 6)
             {
-                orderBy = $" order by g.{nameof(RB_Goods_Extend.CreateDate)} ASC ";
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.SalesNum)} ASC ";
             }
-            //上架时间降序
-            else if (dmodel.OrderBy == 6)
+            //综合【降序】
+            else if (dmodel.OrderBy == 7)
             {
-                orderBy = $" order by g.{nameof(RB_Goods_Extend.CreateDate)} DESC ";
+                orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} DESC ";
             }
 
             if (dmodel.IsSelectVideo == 1)

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -223,14 +223,17 @@ select * from RB_Member_User where {where}  order by CreateDate desc
         /// <returns></returns>
         public List<RB_Member_User_Extend> GetPageListForFX(int pageIndex, int pageSize, out long rowCount, RB_Member_User_Extend dmodel)
         {
-            string where = " 1=1 and d.Status=0 ";
+            string where = " and d.Status=0 ";
+            string where2 = "";
             if (dmodel.TenantId > 0)
             {
                 where += $@" and u.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
+                where2 += $@" and u.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
                 where += $@" and u.{nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
+                where2 += $@" and u.{nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
             }
             if (!string.IsNullOrEmpty(dmodel.Name))
             {
@@ -269,12 +272,34 @@ select * from RB_Member_User where {where}  order by CreateDate desc
                 where += $@" and d.{nameof(RB_Distributor_Info.FXGradeId)}={dmodel.FXGradeId}";
             }
 
-            string sql = $@"
-select u.* from RB_Member_User u
-inner join rb_distributor_info d on u.Id =d.UserId
-where {where} order by u.CreateDate desc
-";
-            return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT u.* 
+FROM RB_Member_User u INNER JOIN rb_distributor_info d on u.Id =d.UserId
+     LEFT JOIN (
+                   SELECT u.SuperiorId,COUNT(0) AS ReferralsNum 
+                   FROM rb_member_user u 
+                   WHERE 1=1 {1}  
+                   GROUP BY u.SuperiorId
+                ) AS B ON U.Id=B.SuperiorId
+WHERE 1=1 {0} 
+", where, where2);
+            string orderBy = " order by u.CreateDate desc ";
+            if (dmodel.SortNum == 1)
+            {
+                orderBy = " order by u.CreateDate ASC ";
+            }
+            else if (dmodel.SortNum == 2)
+            {
+                orderBy = " order by B.ReferralsNum DESC ";
+            }
+            else if (dmodel.SortNum == 3)
+            {
+                orderBy = " order by B.ReferralsNum ASC ";
+            }
+            builder.AppendFormat(orderBy);
+
+            return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount,builder.ToString()).ToList();
         }
 
         /// <summary>

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -15,6 +15,7 @@ using Mall.CacheManager.User;
 using Newtonsoft.Json.Linq;
 using Mall.Common;
 using Mall.Module.Product;
+using Mall.AOP;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -25,7 +26,8 @@ namespace Mall.WebApi.Controllers.MallBase
     public class ProductController : BaseController
     {
 
-        private readonly ProductModule productModule = new ProductModule();
+        private readonly ProductModule productModule = AOPHelper.CreateAOPObject<ProductModule>();
+
 
         #region 素材管理
         /// <summary>