页面修改

Mall.Common/API/AppletUserInfo.cs

@@ -151,5 +151,10 @@ namespace Mall.Common
         /// 是否管理员  1是
         /// </summary>
         public int IsAdmin { get; set; }
+
+        /// <summary>
+        /// 小程序管理员编号
+        /// </summary>
+        public int AdminId { get; set; }
     }
 }
\ No newline at end of file

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -202,6 +202,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public int Gender { get; set; }
 
+        /// <summary>
+        /// 管理员编号
+        /// </summary>
+        public int AdminId { get; set; }
+
     }
 
 

Mall.Module.User/MiniProgramModule.cs

@@ -2153,13 +2153,28 @@ namespace Mall.Module.User
         #region 首页统计
 
         /// <summary>
-        /// 获取商城的总订单和总用户
+        /// 首页数据统计
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public MallIndexStatistics GetMallUserAndOrderModule(StatisticsQuery query)
-        {
-            return mallStatisticsRepository.GetMallUserAndOrderRepository(query);
+        public object GetMallIndexDataModule(StatisticsQuery query)
+        {
+            //首页基础数据统计
+            var basicData = MallIndexStatisticsModule(query);
+            //销售情况统计
+            var salesData = MallIndexSalesStatisticsModule(query);
+            //商品购买力TOP排行
+            var saleIncomeData =MallIndesSalesIncomeStatisticsModule(query);
+            //用户购买力TOP排行
+            var saleUserData = MallIndesSalesUserStatisticsModule(query);
+            var obj = new
+            {
+                basicData,
+                salesData,
+                saleIncomeData,
+                saleUserData
+            };
+            return obj;
         }
 
         /// <summary>
@@ -2167,7 +2182,7 @@ namespace Mall.Module.User
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public MallIndexStatistics MallIndexStatisticsModule(StatisticsQuery query)
+        private MallIndexStatistics MallIndexStatisticsModule(StatisticsQuery query)
         {
             return mallStatisticsRepository.MallIndexStatisticsRepository(query);
         }
@@ -2176,7 +2191,7 @@ namespace Mall.Module.User
         /// 销售情况统计
         /// </summary>
         /// <param name="query"></param>
-        public object MallIndexSalesStatisticsModule(StatisticsQuery query)
+        private object MallIndexSalesStatisticsModule(StatisticsQuery query)
         {
             var list = mallStatisticsRepository.MallIndexSalesStatisticsRepository(query);
             List<object> resultList = new List<object>();
@@ -2228,6 +2243,18 @@ namespace Mall.Module.User
             return obj;
         }
 
+
+        /// <summary>
+        /// 获取商城的总订单和总用户
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public MallIndexStatistics GetMallUserAndOrderModule(StatisticsQuery query)
+        {
+           return mallStatisticsRepository.GetMallUserAndOrderRepository(query);
+        }
+
+
         /// <summary>
         /// 商品购买力TOP排行
         /// </summary>

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -870,54 +870,59 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use
         /// <returns></returns>
         public RB_Member_User_Extend GetMemberUserEntityRepository(RB_Member_User_Extend query)
         {
-            string where = " 1=1 ";
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.UserId,0) AS AdminId 
+FROM RB_Member_User AS A LEFT JOIN rb_miniprogram_admin AS B ON A.Id=B.UserId
+WHERE 1=1 
+");
             if (query.TenantId > 0)
             {
-                where += $@" and {nameof(RB_Member_User.TenantId)}={query.TenantId}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.TenantId)}={query.TenantId}");
             }
             if (query.MallBaseId > 0)
             {
-                where += $@" and {nameof(RB_Member_User.MallBaseId)}={query.MallBaseId}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.MallBaseId)}={query.MallBaseId}");
             }
             if (query.Id > 0)
             {
-                where += $@" and {nameof(RB_Member_User.Id)}={query.Id}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Id)}={query.Id}");
             }
             if (!string.IsNullOrEmpty(query.Name))
             {
-                where += $@" and {nameof(RB_Member_User.Name)} like '%{query.Name}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Name)} like '%{query.Name}%' ");
             }
             if (!string.IsNullOrEmpty(query.AliasName))
             {
-                where += $@" and {nameof(RB_Member_User.AliasName)} like '%{query.AliasName}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.AliasName)} like '%{query.AliasName}%'");
             }
             if (query.Source > 0)
             {
-                where += $@" and {nameof(RB_Member_User.Source)} ={(int)query.Source}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Source)} ={(int)query.Source}");
             }
             if (!string.IsNullOrEmpty(query.Moblie))
             {
-                where += $@" and {nameof(RB_Member_User.Moblie)} like '%{query.Moblie}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.Moblie)} like '%{query.Moblie}%'");
             }
             if (query.MemberGrade > 0)
             {
-                where += $@" and {nameof(RB_Member_User.MemberGrade)}={query.MemberGrade}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.MemberGrade)}={query.MemberGrade}");
             }
             if (query.SuperiorId > 0)
             {
-                where += $@" and {nameof(RB_Member_User.SuperiorId)}={query.SuperiorId}";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.SuperiorId)}={query.SuperiorId}");
             }
             if (query.IsEmptyUserPhoto == 1)
             {
-                where += $@" and IFNULL({nameof(RB_Member_User.Photo)},'')=''";
+                builder.AppendFormat($@" and IFNULL(A.{nameof(RB_Member_User.Photo)},'')=''");
             }
             //HK06-01新增查询条件
             if (query.OpenId != null && !string.IsNullOrWhiteSpace(query.OpenId))
             {
-                where += $@" and {nameof(RB_Member_User.OpenId)} LIKE '{query.OpenId}%'";
+                builder.AppendFormat($@" and A.{nameof(RB_Member_User.OpenId)} LIKE '{query.OpenId}%'");
             }
-            string sql = $@"select * from RB_Member_User where {where} ";
-            return Get<RB_Member_User_Extend>(sql).FirstOrDefault();
+         
+            return Get<RB_Member_User_Extend>(builder.ToString()).FirstOrDefault();
         }
 
         #endregion

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -352,7 +352,8 @@ namespace Mall.WebApi.Controllers.User
                     UserTeacher = (teacher != null && teacher.ID > 0) ? teacher.ID : 0,
                     IsAddBaseInfo = 0,
                     IsOpenMiAi = mmodel.IsOpenMiAi,
-                    IsAdmin = umodel.IsAdmin
+                    IsAdmin = umodel.IsAdmin,
+                    AdminId=umodel.AdminId,
                 };
                 if (mmodel.IsOpenMiAi == 1)
                 {

Mall.WebApi/Controllers/User/TenantController.cs

@@ -1974,21 +1974,8 @@ namespace Mall.WebApi.Controllers.User
             var query = JsonConvert.DeserializeObject<StatisticsQuery>(RequestParm.msg.ToString());
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            //首页基础数据统计
-            var basicData = programModule.MallIndexStatisticsModule(query);
-            //销售情况统计
-            var salesData = programModule.MallIndexSalesStatisticsModule(query);
-            //商品购买力TOP排行
-            var saleIncomeData = programModule.MallIndesSalesIncomeStatisticsModule(query);
-            //用户购买力TOP排行
-            var saleUserData = programModule.MallIndesSalesUserStatisticsModule(query);
-            var obj = new
-            {
-                basicData,
-                salesData,
-                saleIncomeData,
-                saleUserData
-            };
+ 
+            var obj = programModule.GetMallIndexDataModule(query);
             return ApiResult.Success(data: obj);
         }