页面修改

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -61,6 +61,8 @@ namespace Mall.Model.Extend.Product
         public int? GoodsId { get; set; }
 
         public int PayMemerNum { get; set; }
+
+        public int TotalPayMemerNum { get; set; }
         /// <summary>
         /// 分销用户id
         /// </summary>

Mall.Module.MarketingCenter/StatisticsModule.cs

@@ -285,9 +285,14 @@ namespace Mall.Module.MarketingCenter
             DataStatistics_Query model = new DataStatistics_Query();
             if (List != null && List.Any())
             {
-                model.OrderPay = List.Count();
+                model.OrderNum = List.Sum(x => x.OrderNum ?? 0); //List.Count();
                 model.PayMoney = List.Sum(x => x.Income ?? 0);
-                model.PayMemerNum = List.Sum(x => x.PayMemerNum ); //List.GroupBy(x => x.UserId).Count();
+                model.PayMemerNum = List.Sum(x => x.PayMemerNum); // List.GroupBy(x => x.UserId).Count();
+                model.GoodsNum = List.Sum(x => x.GoodsTotalNum);
+                model.MemberNum = List.Max(x => x.TotalPayMemerNum);
+                model.OrderPay = List.Count();
+                //model.PayMoney = List.Sum(x => x.Income ?? 0);
+                //model.PayMemerNum = List.Sum(x => x.PayMemerNum );
                 model.BuyNum = List.Sum(x => x.GoodsTotalNum);
                 model.OrderLineList = new List<OrderLine>();
                 if (dmodel.IsYesterday == 1)//同一天
@@ -417,6 +422,7 @@ namespace Mall.Module.MarketingCenter
                 model.PayMoney = List.Sum(x => x.Income ?? 0);
                 model.PayMemerNum = List.Sum(x => x.PayMemerNum); // List.GroupBy(x => x.UserId).Count();
                 model.GoodsNum = List.Sum(x => x.GoodsTotalNum);
+                model.MemberNum = List.Max(x => x.TotalPayMemerNum);
             }
             return model;
         }

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -830,11 +830,12 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum,
                 payMemerNumWhere += $" AND DATE_FORMAT({nameof(RB_Goods_OrderAfterSale.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' )";
             }
 
-            sql = $@"SELECT t.CreateDate,SUM(t.GoodsTotalNum)as GoodsTotalNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as Income,MAX(t.PayMemerNum) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
-from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsTotalNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum from rb_goods_order as  a
+            sql = $@"SELECT t.CreateDate,SUM(t.GoodsTotalNum)as GoodsTotalNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as Income,
+ (SELECT COUNT(DISTINCT UserId)  from rb_goods_order  where 1=1 {payMemerNumWhere} ) as TotalPayMemerNum,
+COUNT(DISTINCT t.UserId) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
+from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsTotalNum,a.UserId,a.Income,a.OrderId from rb_goods_order as  a
  LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsTotalNum 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' ) {where} )
+ {where} )
 as t GROUP BY t.CreateDate desc";
             //            sql = $@"SELECT t.CreateDate,SUM(t.GoodsTotalNum)as GoodsTotalNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as Income,MAX(t.PayMemerNum) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
             //from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsTotalNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum from rb_goods_order as  a
@@ -842,7 +843,6 @@ as t GROUP BY t.CreateDate desc";
             //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' ) {where} )
             //as t GROUP BY t.CreateDate desc";
-
             return Get<RB_Goods_Order_Extend>(sql).ToList();
         }
 
@@ -956,7 +956,7 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             else if (dmodel.OrderStatus == 3)
             {
                 where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL";
-                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL";
+                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL";
             }
             else if (dmodel.OrderStatus == 4)//后面做因为现在还没有售后表
             {
@@ -980,16 +980,17 @@ 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,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 
-             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' ) {where} 
-      )
+                //                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 
+                //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' ) {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,COUNT(DISTINCT t.UserId) 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 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  {where} )
 as t GROUP BY t.CreateDate desc";
+
             }
             else
             {
@@ -1000,10 +1001,11 @@ from
      SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,a.ReNumber,a.Refund as Income,c.PayMemerNum,a.ReOrderId from RB_Goods_OrderAfterSale as a 
      LEFT JOIN 
     (SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from RB_Goods_OrderAfterSale  where 1=1 {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' ))
-     AS c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )  {where} 
+     as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )  {where} 
 )
-AS t GROUP BY t.CreateDate desc";
+as t GROUP BY t.CreateDate desc";
             }
+
             return GetPage<DataStatistics_Query>(pageIndex, pageSize, out count, sql).ToList();
         }