页面修改

Mall.Model/Entity/User/RB_Member_User.cs

@@ -214,5 +214,10 @@ namespace Mall.Model.Entity.User
         /// 公司毛利利润比例
         /// </summary>
         public decimal CompanyProfitRate { get; set; }
+
+        /// <summary>
+        /// 职位Id,(1-领队导游)
+        /// </summary>
+        public int PostId { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -2061,5 +2061,10 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string bottonImg { get; set; }
 
+        /// <summary>
+        /// 字体颜色
+        /// </summary>
+        public string fontColor { get; set; }
+
     }
 }

Mall.Model/Query/StatisticsQuery.cs

@@ -57,5 +57,10 @@ namespace Mall.Model.Query
         /// 排序
         /// </summary>
         public string OrderBy { get; set; }
+
+        /// <summary>
+        /// 用户类型(0-普通用户,1-领队导游)
+        /// </summary>
+        public int UserType { get; set; }
     }
 }

Mall.Module.User/UserModule.cs

@@ -399,7 +399,8 @@ namespace Mall.Module.User
                 { nameof(RB_Member_User.ContactWay),demodel.ContactWay},
                 { nameof(RB_Member_User.Remark),demodel.Remark},
                 { nameof(RB_Member_User.AliasName),demodel.AliasName},
-                { nameof(RB_Member_Grade.UpdateDate),demodel.UpdateDate}
+                { nameof(RB_Member_Grade.UpdateDate),demodel.UpdateDate},
+                { nameof(RB_Member_User.PostId),demodel.PostId},
             };
             List<WhereHelper> wheres = new List<WhereHelper>() {
                 new WhereHelper(){

Mall.Repository/User/MallStatisticsRepository.cs

@@ -291,17 +291,12 @@ GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy}  LIMIT 100 ");
             {
                 where += string.Format(" AND C.{0}={1} ", nameof(RB_Member_User_Extend.Source), (int)query.Source);
             }
+            if (query.UserType > -1)
+            {
+                where += string.Format(" AND C.{0}={1} ", nameof(RB_Member_User_Extend.PostId), query.UserType);
+            }
 
             StringBuilder builder = new StringBuilder();
-            //            builder.AppendFormat(@"
-            //SELECT  C.`Name` AS UserName,C.Photo,COUNT(1) SaleCount,SUM(A.Final_Price) AS Income
-            //FROM rb_goods_orderdetail AS A LEFT JOIN rb_goods_order AS B ON A.OrderId=B.OrderId
-            //     LEFT JOIN rb_member_user AS C ON B.UserId=C.Id
-            //WHERE 1=1 AND A.GoodsId>0 {0}
-            //GROUP BY B.UserId,C.`Name`
-            //ORDER BY COUNT(1) DESC
-            //LIMIT 100
-            //", where);
             if (string.IsNullOrWhiteSpace(query.OrderBy))
             {
                 query.OrderBy = "Income desc";

Mall.WebApi/Controllers/User/UserController.cs

@@ -88,6 +88,8 @@ namespace Mall.WebApi.Controllers.User
                 x.Source,
                 SourceName = x.Source.GetEnumName(),
                 x.TenantId,
+                x.PostId,
+                PostName=(x?.PostId??0)==1?"领队导游":"",
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);
@@ -159,6 +161,7 @@ namespace Mall.WebApi.Controllers.User
                 model.ContactWay,
                 model.Moblie,
                 model.Remark,
+                model.PostId,
                 CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
         }