提交代码

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -795,7 +795,7 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum,
         public List<RB_Goods_Order_Extend> GetWeeklyOrder(DataStatistics_Query dmodel)
         {
             string where = $"   where 1=1  and  (a.OrderStatus in(2,3,4,6,5)  or( a.{nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL))";
-            string payMemerNumWhere = " and  (OrderStatus in(2,3,4,6,5)  or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
+            string payMemerNumWhere = $" and  (OrderStatus in(2,3,4,6,5)  or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
             string orderTypeWhere = "";
             string sql = "";
             if (dmodel.TenantId > 0)
@@ -943,8 +943,8 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             }
             if (dmodel.OrderStatus == 1 || dmodel.OrderStatus == 0)
             {
-                 where = $"    and  (a.OrderStatus in(2,3,4,6,5)  or( a.{nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL))";
-                 payMemerNumWhere = " and  (OrderStatus in(2,3,4,6,5)  or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
+                 where += $"    and  (a.OrderStatus in(2,3,4,6,5)  or( a.{nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL))";
+                 payMemerNumWhere = $" and  (OrderStatus in(2,3,4,6,5)  or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
             }
             else if (dmodel.OrderStatus == 2)
             {
@@ -978,17 +978,6 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             }
             if (dmodel.OrderStatus == 0 || dmodel.OrderStatus == 1 || dmodel.OrderStatus == 2 || dmodel.OrderStatus == 3)
             {
-                //                sql = $@"SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum,MAX(t.RepurchaseNum) as RepurchaseNum
-                //from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum,d.RepurchaseNum from rb_goods_order as  a
-                // LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId 
-                //LEFT JOIN (SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from rb_goods_order  where 1=1 {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' ))
-                //as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) 
-                //LEFT JOIN (SELECT temp.CreateDate,COUNT(UserId) as RepurchaseNum from (SELECT UserId,COUNT(DISTINCT UserId) as RepurchaseNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from rb_goods_order where 1=1 
-                //{payMemerNumWhere}  GROUP BY UserId,DATE_FORMAT(CreateDate,'%Y-%m-%d' ) having count(UserId) > 1) as temp GROUP BY temp.CreateDate
-                //)
-                //as d on d.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) 
-                //{where} )
-                //as t GROUP BY t.CreateDate desc";
                 sql = $@"SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
 from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum from rb_goods_order as  a
  LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId