提交代码

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -27,6 +27,7 @@ namespace Mall.Model.Extend.User
         /// 昵称
         /// </summary>
         public string NickName { get; set; }
+
         /// <summary>
         /// 头像
         /// </summary>

Mall.Model/Extend/User/RB_Supplier_Extend.cs

@@ -16,5 +16,10 @@ namespace Mall.Model.Extend.User
         /// ids
         /// </summary>
         public string SupplierIds { get; set; }
+
+        /// <summary>
+        /// 介绍人名称
+        /// </summary>
+        public string IntroducerName { get; set; }
     }
 }

Mall.Model/Query/StatisticsQuery.cs

@@ -53,6 +53,9 @@ namespace Mall.Model.Query
         /// </summary>
         public int SalesTimeType { get; set; }
 
-  
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public string OrderBy { get; set; }
     }
 }

Mall.Repository/User/MallStatisticsRepository.cs

@@ -75,7 +75,7 @@ namespace Mall.Repository.User
                 user.AppendFormat(" AND {0}={1} ", nameof(RB_Member_User_Extend.Source), (int)query.Source);
             }
             var userTotal = ExecuteScalar(user.ToString());
-            if (userTotal != null && Convert.ToInt32(userTotal)>0)
+            if (userTotal != null && Convert.ToInt32(userTotal) > 0)
             {
                 model.UserTotalNum = Convert.ToInt32(userTotal);
             }
@@ -86,7 +86,7 @@ namespace Mall.Repository.User
             good.Append(" SELECT COUNT(1) FROM rb_goods WHERE 1=1 AND Status=0 ");
             good.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Extend.TenantId), query.TenantId);
             good.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Extend.MallBaseId), query.MallBaseId);
-   
+
             var goodTotal = ExecuteScalar(good.ToString());
             if (goodTotal != null && Convert.ToInt32(goodTotal) > 0)
             {
@@ -114,8 +114,8 @@ namespace Mall.Repository.User
             {
                 orderNum.AppendFormat(" AND {0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), query.EndDate);
             }
-            var orderCountList= Get<OrderNum>(orderNum.ToString()).ToList();
-            
+            var orderCountList = Get<OrderNum>(orderNum.ToString()).ToList();
+
             if (orderCountList != null && orderCountList.Count > 0)
             {
                 model.TotalOrderNum = orderCountList.Sum(qitem => qitem.OrderCount);
@@ -189,7 +189,7 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5
                 builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Goods_Order_Extend.OrderSource), (int)query.Source);
             }
             //开始时间
-            if (query.SalesTimeType==7)
+            if (query.SalesTimeType == 7)
             {
                 builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"));
                 builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Goods_Order_Extend.CreateDate), DateTime.Now.ToString("yyyy-MM-dd"));
@@ -215,7 +215,7 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5
             //开始时间
             if (query.StartDate != null && !string.IsNullOrWhiteSpace(query.StartDate))
             {
-                where+=string.Format(" AND B.{0}>='{1}' ", nameof(RB_Goods_Order_Extend.CreateDate), query.StartDate);
+                where += string.Format(" AND B.{0}>='{1}' ", nameof(RB_Goods_Order_Extend.CreateDate), query.StartDate);
             }
             //结束时间
             if (query.EndDate != null && !string.IsNullOrWhiteSpace(query.EndDate))
@@ -224,14 +224,23 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5
             }
 
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"
-SELECT   A.GoodsName,Count(1) SaleCount,SUM(A.Final_Price) AS Income
+            //            builder.AppendFormat(@"
+            //SELECT   A.GoodsName,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
+            //WHERE 1=1 AND A.GoodsId>0 {0}
+            //GROUP BY A.GoodsId,A.GoodsName
+            //ORDER BY COunt(1) DESC
+            //LIMIT 100
+            //", where);
+            if (string.IsNullOrWhiteSpace(query.OrderBy))
+            {
+                query.OrderBy = "Income desc";
+            }
+            builder.AppendFormat(@$"SELECT * from (SELECT   A.GoodsName,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
-WHERE 1=1 AND A.GoodsId>0 {0}
-GROUP BY A.GoodsId,A.GoodsName
-ORDER BY COunt(1) DESC
-LIMIT 100
-", where);
+WHERE 1=1 AND A.GoodsId>0  {where}
+GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy}  LIMIT 100 ");
+
             var list = Get<MallSalesGoodsTop>(builder.ToString()).ToList();
             if (list != null && list.Count > 0)
             {
@@ -272,15 +281,25 @@ LIMIT 100
             }
 
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@"
-SELECT  C.`Name` AS UserName,C.Photo,COUNT(1) SaleCount,SUM(A.Final_Price) AS Income
+            //            builder.AppendFormat(@"
+            //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 {0}
+            //GROUP BY B.UserId,C.`Name`
+            //ORDER BY COUNT(1) DESC
+            //LIMIT 100
+            //", where);
+            if (string.IsNullOrWhiteSpace(query.OrderBy))
+            {
+                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 {0}
+WHERE 1=1 AND A.GoodsId>0 {where}
 GROUP BY B.UserId,C.`Name`
-ORDER BY COUNT(1) DESC
-LIMIT 100
-", where);
+) as t ORDER BY t.{query.OrderBy}  LIMIT 100");
             var list = Get<MallSalesUserTop>(builder.ToString()).ToList();
             if (list != null && list.Count > 0)
             {

Mall.Repository/User/RB_SupplierRepository.cs

@@ -27,17 +27,17 @@ namespace Mall.Repository.User
             string where = " 1=1  AND Status=0 ";
             if (dmodel.TenantId > 0)
             {
-                where += $@" and {nameof(RB_Supplier.TenantId)}={dmodel.TenantId}";
+                where += $@" and a.{nameof(RB_Supplier.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
-                where += $@" and {nameof(RB_Supplier.MallBaseId)}={dmodel.MallBaseId}";
+                where += $@" and a.{nameof(RB_Supplier.MallBaseId)}={dmodel.MallBaseId}";
             }
             if (!string.IsNullOrWhiteSpace(dmodel.Name))
             {
-                where += $@" and {nameof(RB_Supplier.Name)} like '%{dmodel.Name}%'";
+                where += $@" and a.{nameof(RB_Supplier.Name)} like '%{dmodel.Name}%'";
             }
-            string sql = $@"select * from {TableName} where {where} order by Id desc";
+            string sql = $@"select a.*,b.`Name` as IntroducerName from rb_distributor_info as a LEFT JOIN rb_member_user as b on a.Introducer=b.UserId {where} order by Id desc";
             return GetPage<RB_Supplier_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
 
@@ -65,7 +65,7 @@ namespace Mall.Repository.User
             {
                 where += $@" and a.{nameof(RB_Supplier.ID)} in({dmodel.SupplierIds})";
             }
-            string sql = $@"select * from {TableName} as A where {where} order by Id desc";
+            string sql = $@"select a.*,b.`Name` as IntroducerName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId {where} order by Id desc";
             return Get<RB_Supplier_Extend>(sql).ToList();
         }
     }

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -58,6 +58,8 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.Mobile,
                 x.Address,
+                x.IntroducerName,
+                x.CommissionRate,
                 CardNum = x.ClientBankAccount != null ? x.ClientBankAccount.CardNum : "",
                 OpenBankName = x.ClientBankAccount != null ? x.ClientBankAccount.OpenBankName : "",
                 AccountAlias = x.ClientBankAccount != null ? x.ClientBankAccount.AccountAlias : "",
@@ -153,7 +155,7 @@ namespace Mall.WebApi.Controllers.User
 
 
         /// <summary>
-        /// 删除优惠券
+        /// 删除供应商
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -200,7 +202,22 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", oldLogisticsList);
         }
 
-
+        /// <summary>
+        /// 获取供应商下拉列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetDistributorInfoList()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Distributor_Info_Extend>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            query.AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited;
+            var oldLogisticsList = orderModule.GetDistributorInfoList(query);
+            return ApiResult.Success("", oldLogisticsList);
+        }
 
         #endregion