提交代码

Mall.Common/Config.cs

@@ -710,5 +710,18 @@ namespace Mall.Common
                 return ReadConfigKey("EduRollCallActionCode");
             }
         }
+        /// <summary>
+        /// 徐总的id，用于区分线下订单
+        /// </summary>
+        public static string XuZongUserId
+        {
+            get
+            {
+                return ReadConfigKey("XuZongUserId");
+            }
+        }
+
+
+        
     }
 }
\ No newline at end of file

Mall.Model/Entity/Product/RB_Goods_Order.cs

@@ -361,5 +361,10 @@ namespace Mall.Model.Entity.Product
         /// 教育erp对应的人员id
         /// </summary>
         public int EduUserId { get; set; }
+
+        /// <summary>
+        /// 是否线下订单 0-不是，1-是 (用户下单时，将凡是属于徐总的订单设置为线下订单，订单类型新增线下订单)
+        /// </summary>
+        public int IsOffline { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -139,7 +139,7 @@ namespace Mall.Model.Extend.Product
         public List<User.RB_Member_DiscountCoupon_Extend> MemberDiscountCouponList { get; set; }
 
 
-        
+
         /// <summary>
         /// 是否发放佣金   1是  2否
         /// </summary>
@@ -252,7 +252,7 @@ namespace Mall.Model.Extend.Product
 
 
         #region 司导信息
-        
+
         /// <summary>
         /// 导游名称
         /// </summary>
@@ -314,6 +314,11 @@ namespace Mall.Model.Extend.Product
         /// 门店地址
         /// </summary>
         public string StoresAddress { get; set; }
+
+        /// <summary>
+        /// 线下订单数
+        /// </summary>
+        public int OfflineOrder { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/Statistics/MallIndexStatistics.cs

@@ -37,6 +37,11 @@ namespace Mall.Model.Extend.Statistics
         /// 维权订单数量
         /// </summary>
         public int ActivistOrderNum { get; set; }
+
+        /// <summary>
+        /// 线下订单数
+        /// </summary>
+        public int OfflineOrderNum { get; set; }
     }
 
     /// <summary>
@@ -59,6 +64,11 @@ namespace Mall.Model.Extend.Statistics
         /// 订单数量
         /// </summary>
         public int OrderCount { get; set; }
+
+        /// <summary>
+        /// 是否线下订单 0-不是，1-是
+        /// </summary>
+        public int IsOffline { get; set; }
     }
 
     /// <summary>

Mall.Model/Query/DataStatistics_Query.cs

@@ -129,6 +129,11 @@ namespace Mall.Model.Query
         /// 领队导游下单人数
         /// </summary>
         public int OrderLeaderActice { get; set; }
+
+        /// <summary>
+        /// 线下订单数
+        /// </summary>
+        public int OfflineOrder { get; set; }
     }
 
 

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -66,6 +66,12 @@ namespace Mall.Repository.Product
             {
                 where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)dmodel.OrderStatus}";
             }
+            if (dmodel.IsOffline > -1)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.IsOffline)}={(int)dmodel.IsOffline}";
+            }
+
+            
             if (dmodel.IsNotSelectCancel == 1)
             {
                 where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} <> {(int)OrderStatusEnum.Cancel}";
@@ -1025,10 +1031,10 @@ 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,
+            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, 
  (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
+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
  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 
  {where} )
 as t GROUP BY t.CreateDate desc";
@@ -1174,9 +1180,9 @@ 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,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(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 
+       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
             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} 

Mall.Repository/User/MallStatisticsRepository.cs

@@ -101,7 +101,7 @@ namespace Mall.Repository.User
 
             #region 订单数量统计
             StringBuilder orderNum = new StringBuilder();
-            orderNum.AppendFormat("SELECT OrderStatus,COUNT(1) AS OrderCount FROM rb_goods_order WHERE OrderStatus IN(2,3,4,5,6) ");
+            orderNum.AppendFormat("SELECT OrderStatus,COUNT(1) AS OrderCount,IsOffline FROM rb_goods_order WHERE OrderStatus IN(2,3,4,5,6) ");
             orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
             orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
             //订单来源
@@ -119,12 +119,16 @@ namespace Mall.Repository.User
             {
                 orderNum.AppendFormat(" AND {0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), query.EndDate);
             }
+
+            orderNum.AppendFormat(" GROUP BY OrderStatus,IsOffline ");
             var orderCountList = Get<OrderNum>(orderNum.ToString()).ToList();
 
             if (orderCountList != null && orderCountList.Count > 0)
             {
                 model.TotalOrderNum = orderCountList.Sum(qitem => qitem.OrderCount);
-                model.NoSendOrderNum = orderCountList.Where(qitem => qitem.OrderStatus == Common.Enum.Goods.OrderStatusEnum.WaitSendGoods).FirstOrDefault()?.OrderCount ?? 0;
+                model.NoSendOrderNum = orderCountList.Where(qitem => qitem.OrderStatus == Common.Enum.Goods.OrderStatusEnum.WaitSendGoods).ToList().Sum(x => x.OrderCount);
+                model.OfflineOrderNum = orderCountList.Where(qitem => qitem.IsOffline == 1).ToList().Sum(x => x.OrderCount);
+                // model.NoSendOrderNum = orderCountList.Where(qitem => qitem.OrderStatus == Common.Enum.Goods.OrderStatusEnum.WaitSendGoods).FirstOrDefault()?.OrderCount ?? 0;
             }
 
             //维权订单【售后订单】
@@ -156,7 +160,7 @@ WHERE 1=1 AND  A.ReOrderStatus IN(2,3,4) ");
                 model.ActivistOrderNum = Convert.ToInt32(afterSalesObj.ToString());
             }
             #endregion
-            
+
             return model;
         }
 
@@ -294,16 +298,16 @@ GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy}  LIMIT 100 ");
             {
                 query.OrderBy = "Income desc";
             }
-//            builder.AppendFormat($@"
-//SELECT * 
-//FROM 
-//    (   
-//        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 {where}
-//        GROUP BY B.UserId,C.`Name`
-//    ) as t ORDER BY t.{query.OrderBy}  LIMIT 100");
+            //            builder.AppendFormat($@"
+            //SELECT * 
+            //FROM 
+            //    (   
+            //        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 {where}
+            //        GROUP BY B.UserId,C.`Name`
+            //    ) as t ORDER BY t.{query.OrderBy}  LIMIT 100");
 
             builder.AppendFormat($@"
 SELECT * 
@@ -439,14 +443,14 @@ GROUP By B.FXGradeId,C.GradeName,DATE_FORMAT(A.CreateDate,'%Y%m%d')
 GROUP BY TabA.TimeStr
 ORDER BY TabA.TimeStr DESC", where);
             List<object> resultList = new List<object>();
-            var list = GetPage<MallDistributorDay>(pageIndex,pageSize,out rowsCount,build.ToString()).ToList();
+            var list = GetPage<MallDistributorDay>(pageIndex, pageSize, out rowsCount, build.ToString()).ToList();
             if (list != null && list.Count > 0)
             {
                 foreach (var item in list)
                 {
                     resultList.Add(new
                     {
-                        TimeStr=Convert.ToDateTime(item.TimeStr).ToString("yyyy-MM-dd"),
+                        TimeStr = Convert.ToDateTime(item.TimeStr).ToString("yyyy-MM-dd"),
                         item.Pink,
                         item.VIP,
                         item.Silver,

Mall.WebApi/Controllers/MarketingCenter/StatisticsController.cs

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

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -546,6 +546,18 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UserId = userInfo.UserId;
             demodel.SmallShopsId = req.SmallShopsId;
             demodel.OrderClassify = 0;
+            if (userInfo!=null)
+            {
+                if (userInfo.UserId.ToString() == Config.XuZongUserId)
+                {
+                    demodel.IsOffline = 1;
+                }
+                else
+                {
+                    demodel.IsOffline = 0;
+                }
+            }
+            
             #endregion
 
             return orderModule.SetAppletGoodsOrderInfo(demodel);

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -74,7 +74,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 Consignee = newParms.GetStringValue("Consignee"),
                 Recycled = newParms.GetInt("Recycled"),
                 AnchorName = newParms.GetStringValue("AnchorName"),
-                IsSelectPayMoney = newParms.GetInt("IsSelectPayMoney", 0)
+                IsSelectPayMoney = newParms.GetInt("IsSelectPayMoney", 0),
+                IsOffline = newParms.GetInt("IsOffline", -1),
             };
 
             demodel.TenantId = parms.TenantId;
@@ -175,7 +176,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.MallBaseId,
                 x.SmallShopsId,
                 x.SmallShopsName,
-                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.IsOffline
             });
             return ApiResult.Success("", pagelist);
         }