提交代码

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -319,6 +319,11 @@ namespace Mall.Model.Extend.Product
         /// 线下订单数
         /// </summary>
         public int OfflineOrder { get; set; }
+
+        /// <summary>
+        /// 线下订单金额
+        /// </summary>
+        public decimal OfflineOrderPrice { get; set; }
     }
 
     /// <summary>

Mall.Model/Query/DataStatistics_Query.cs

@@ -134,6 +134,12 @@ namespace Mall.Model.Query
         /// 线下订单数
         /// </summary>
         public int OfflineOrder { get; set; }
+
+
+        /// <summary>
+        /// 线下订单金额
+        /// </summary>
+        public decimal OfflineOrderPrice { get; set; }
     }
 
 

Mall.Module.MarketingCenter/StatisticsModule.cs

@@ -527,6 +527,8 @@ namespace Mall.Module.MarketingCenter
                 model.GoodsNum = List.Sum(x => x.GoodsTotalNum);
                 model.MemberNum = List.Max(x => x.TotalPayMemerNum);
                 model.OfflineOrder = List.Sum(x => x.OfflineOrder);
+                model.OfflineOrderPrice= List.Sum(x => x.OfflineOrderPrice);
+
             }
             return model;
         }

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1031,7 +1031,7 @@ 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,SUM(case WHEN IsOffline=1 then 1 else 0 end )as  OfflineOrder, 
+            sql = $@"SELECT t.CreateDate,SUM(t.GoodsTotalNum)as GoodsTotalNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as Income,SUM(case WHEN IsOffline=1 then 1 else 0 end )as  OfflineOrder,SUM(case WHEN t.IsOffline=1 then t.Income else 0 end )as  OfflineOrderPrice, 
  (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,a.IsOffline from rb_goods_order as  a
@@ -1180,7 +1180,7 @@ 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(case WHEN IsOffline=1 then 1 else 0 end )as  OfflineOrder,SUM(t.Income)as PayMoney,COUNT(DISTINCT t.UserId) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
+SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(case WHEN IsOffline=1 then 1 else 0 end )as  OfflineOrder,SUM(case WHEN t.IsOffline=1 then t.Income else 0 end )as  OfflineOrderPrice,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 ,a.IsOffline
        FROM rb_goods_order AS  a

Mall.WebApi/Controllers/MarketingCenter/StatisticsController.cs

@@ -243,7 +243,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 x.LoginLeaderActive,
                 x.OrderEmpActive,
                 x.OrderLeaderActice,
-                x.OfflineOrder
+                x.OfflineOrder,
+                x.OfflineOrderPrice
             });
             return ApiResult.Success("", pagelist);
         }