页面修改

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1101,23 +1101,13 @@ INNER JOIN
 	FROM rb_goods_order AS a
 	WHERE 1=1 AND (a.OrderStatus IN(2,3,4,5,6) OR (a.OrderStatus=7 AND a.PaymentTime IS NOT NULL AND a.CancelTime IS NOT NULL AND DATE_FORMAT(a.PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(a.CancelTime,'%Y-%m-%d' ))) 
           AND DATE_FORMAT(a.CreateDate,'%y/%m/%d')= DATE_FORMAT('{0}','%y/%m/%d') {1}
-) AS B ON A.Id=B.UserId AND A.SuperiorId>0 AND A.SuperiorId<20 AND A.PostId=0
-UNION ALL 
-SELECT A.* 
-FROM rb_member_user AS A
-INNER JOIN
-(
-	SELECT DISTINCT a.UserId
-	FROM rb_goods_order AS a
-	WHERE 1=1 AND (a.OrderStatus IN(2,3,4,5,6) OR (a.OrderStatus=7 AND a.PaymentTime IS NOT NULL AND a.CancelTime IS NOT NULL AND DATE_FORMAT(a.PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(a.CancelTime,'%Y-%m-%d' ))) 
-         AND DATE_FORMAT(a.CreateDate,'%y/%m/%d')= DATE_FORMAT('{0}','%y/%m/%d') {1}
-) AS B ON A.Id=B.UserId   AND A.PostId=1
+) AS B ON A.Id=B.UserId 
 ", DateTime.Now.ToString("yyyy-MM-dd"), where);
             var list = Get<RB_Member_User_Extend>(builder.ToString()).ToList();
             var obj = new
             {
                 OrderTotal = list?.Count ?? 0,
-                OrderEmployee = list?.Where(qitem => qitem.PostId == 0)?.Count() ?? 0,
+                OrderEmployee = list?.Where(qitem => qitem.PostId == 0 && qitem.SuperiorId>0 && qitem.SuperiorId<20)?.Count() ?? 0,
                 OrderLeader = list?.Where(qitem => qitem.PostId == 1)?.Count() ?? 0,
             };
             return obj;

Mall.Repository/User/RB_Member_UserRepository2.cs

@@ -68,23 +68,14 @@ INNER JOIN
 		FROM rb_login_log
 		WHERE DATE_FORMAT(LoginTime,'%y/%m/%d')=DATE_FORMAT('{1}','%y/%m/%d')
 ) AS B ON A.Id=B.UserId
-WHERE A.SuperiorId>0 AND A.SuperiorId<20 AND A.PostId=0 {0}
-UNION ALL 
+WHERE 1=1 {0}
 
-SELECT * FROM rb_member_user AS A
-INNER JOIN
-(
-		SELECT DISTINCT UserId 
-		FROM rb_login_log
-		WHERE DATE_FORMAT(LoginTime,'%y/%m/%d')=DATE_FORMAT('{1}','%y/%m/%d')
-) AS B ON A.Id=B.UserId
-WHERE   A.PostId=1 {0}
 ", where.ToString(), DateTime.Now.ToString("yyyy-MM-dd"));
             var list = Get<RB_Member_User_Extend>(builder.ToString()).ToList();
             var obj = new
             {
                 LoginTotal = list?.Count ?? 0,
-                LoginEmployee = list?.Where(qitem => qitem.PostId == 0)?.Count() ?? 0,
+                LoginEmployee = list?.Where(qitem => qitem.PostId == 0 && qitem.SuperiorId>0 && qitem.SuperiorId<20)?.Count() ?? 0,
                 LoginLeader = list?.Where(qitem => qitem.PostId == 1)?.Count() ?? 0,
             };
             return obj;