Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Product/RB_Goods_OrderCommission.cs

@@ -43,7 +43,7 @@ namespace Mall.Model.Entity.Product
             set;
         }
         /// <summary>
-        /// 等级  一级分销   二级分销 （跟下线正好相反）  0表示自购返佣
+        /// 等级  一级分销   二级分销 （跟下线正好相反）  0表示自购返佣   //和平+粉象 都是存GradeId
         /// </summary>        
         public int? Grade
         {
@@ -75,7 +75,7 @@ namespace Mall.Model.Entity.Product
             set;
         }
         /// <summary>
-        /// 类型  1标准返佣   2和平返佣
+        /// 类型  1标准返佣   2和平返佣   3粉象返佣
         /// </summary>
         public int? Type { get; set; }
         /// <summary>
@@ -121,4 +121,20 @@ namespace Mall.Model.Entity.Product
 
         public int? IsRemit { get; set; }
     }
+
+    /// <summary>
+    /// 粉象返佣数量记录
+    /// </summary>
+    public class FXOrderCommissionNumModel { 
+
+        public int GradeId { get; set; }
+
+        public int Grade { get; set; }
+
+        public decimal Money { get; set; }
+
+        public int Sort { get; set; }
+
+        public int IsSelfBuy { get; set; }
+    }
 }

Mall.Model/Entity/User/RB_Distributor_FXGrade.cs

@@ -39,7 +39,7 @@ namespace Mall.Model.Entity.User
             set;
         }
         /// <summary>
-        /// 是否普通会员  1是  2否
+        /// 会员类型  1普通会员  2其他会员  3Vip
         /// </summary>        
         public int? IsGuest
         {

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -87,7 +87,10 @@ namespace Mall.Model.Extend.Product
         /// 会员价格
         /// </summary>
         public decimal MemberPrice { get; set; }
-
+        /// <summary>
+        /// 佣金金额
+        /// </summary>
+        public decimal CommissionPrice { get; set; }
 
         /// <summary>
         /// 积分赠送

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -36,6 +36,10 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string GradeName { get; set; }
         /// <summary>
+        /// 等级几
+        /// </summary>
+        public int Grade { get; set; }
+        /// <summary>
         /// 和平等级名称
         /// </summary>
         public string HPGradeName { get; set; }

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -41,6 +41,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public int? MinUserId { get; set; }
 
+        /// <summary>
+        /// 粉象等级ID
+        /// </summary>
+        public int? FXGradeId { get; set; }
+
         /// <summary>
         /// 用户名str
         /// </summary>

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -129,11 +129,11 @@ where {where} group by oc.OrderId,oc.UserId,oc.Grade,oc.Type order by oc.Grade a
                 where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
             }
 
-            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Type,oc.Grade,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
 FROM RB_Goods_OrderCommission oc
 inner join rb_goods_order o on oc.OrderId = o.OrderId
 left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
-where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.OrderId desc";
+where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type,oc.Grade order by oc.OrderId desc";
             return GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
 

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -104,6 +104,88 @@ where {where} order by di.CreateDate desc";
             return Get<RB_Distributor_Info_Extend>(sql).ToList();
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Distributor_Info_Extend> GetListForSingle(RB_Distributor_Info_Extend dmodel)
+        {
+            string where = $@" 1=1 and di.{nameof(RB_Distributor_Info.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.UserIds))
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.UserId)} in({dmodel.UserIds})";
+            }
+            if (dmodel.GradeId >= 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.GradeId)}={dmodel.GradeId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
+            }
+
+            string sql = $@"select di.* from RB_Distributor_Info di where {where} order by di.CreateDate desc";
+            return Get<RB_Distributor_Info_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Distributor_Info_Extend> GetFXGreadeListForMyTeam(RB_Distributor_Info_Extend dmodel)
+        {
+            string where = $@" 1=1 and di.{nameof(RB_Distributor_Info.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.UserIds))
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.UserId)} in({dmodel.UserIds})";
+            }
+            if (dmodel.GradeId >= 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.GradeId)}={dmodel.GradeId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
+            }
+
+            string sql = $@"select di.FXGradeId from RB_Distributor_Info di where {where} group by di.FXGradeId";
+            return Get<RB_Distributor_Info_Extend>(sql).ToList();
+        }
+
         /// <summary>
         /// 获取下载列表
         /// </summary>

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -133,6 +133,66 @@ select * from RB_Member_User where {where} order by CreateDate desc
             return Get<RB_Member_User_Extend>(sql).ToList();
         }
 
+        /// <summary>
+        /// 获取列表（粉象）
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Member_User_Extend> GetPageListForFX(int pageIndex, int pageSize, out long rowCount, RB_Member_User_Extend dmodel)
+        {
+            string where = " 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and u.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and u.{nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and u.{nameof(RB_Member_User.Name)} like '%{dmodel.Name}%'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.UserNameStr))
+            {
+                where += $@" and u.{nameof(RB_Member_User.Name)} in({dmodel.UserNameStr})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.AliasName))
+            {
+                where += $@" and u.{nameof(RB_Member_User.AliasName)} like '%{dmodel.AliasName}%'";
+            }
+            if (dmodel.Source > 0)
+            {
+                where += $@" and u.{nameof(RB_Member_User.Source)} ={(int)dmodel.Source}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Moblie))
+            {
+                where += $@" and u.{nameof(RB_Member_User.Moblie)} like '%{dmodel.Moblie}%'";
+            }
+            if (dmodel.MemberGrade > 0)
+            {
+                where += $@" and u.{nameof(RB_Member_User.MemberGrade)}={dmodel.MemberGrade}";
+            }
+            if (dmodel.SuperiorId > 0)
+            {
+                where += $@" and u.{nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.UserIds))
+            {
+                where += $@" and u.{nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
+            }
+            if (dmodel.FXGradeId > 0) 
+            {
+                where += $@" and d.{nameof(RB_Distributor_Info.FXGradeId)}={dmodel.FXGradeId}";
+            }
+
+            string sql = $@"
+select u.* from RB_Member_User u
+inner join rb_distributor_info d on u.Id =d.UserId
+where {where} order by u.CreateDate desc
+";
+            return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
 
         /// <summary>
         /// 分页列表
@@ -385,6 +445,28 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid
             return Get<RB_Member_User_Extend>(sql).ToList();
         }
 
+        /// <summary>
+        /// 获取用户上级所有的id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public string GetMemberParentIdStr(int id)
+        {
+            string sql = $@" select GetMemberParentrenList({id})";
+            return ExecuteScalar(sql).ToString();
+        }
+
+        /// <summary>
+        /// 获取用户下级所有的id (包括自己)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public string GetMemberChildIdStr(int id)
+        {
+            string sql = $@" select GetMemberChildrenList_AllUser({id})";
+            return ExecuteScalar(sql).ToString();
+        }
+
 
         /// <summary>
         /// 获取下线分销商分页列表

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -646,8 +646,39 @@ namespace Mall.WebApi.Controllers.User
 
             return ApiResult.Success("", pageModel);
         }
-        //分销订单  提现明细  我的团队
 
+
+        /// <summary>
+        /// 获取我的团队里粉象返佣标题
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GerUserMyTeamTitelListForFX()
+        {
+            var userInfo = AppletUserInfo;
+
+            var obj = userModule.GerUserMyTeamTitelListForFX(userInfo);
+            return ApiResult.Success("", obj);
+        }
+
+        /// <summary>
+        /// 获取我的团队  粉象返佣列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetUserMyTeamPageListForFX() {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_Distributor_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Info_Extend>(req.msg.ToString());
+
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            pageModel.pageData = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
+            pageModel.count = Convert.ToInt32(count);
+
+            return ApiResult.Success("", pageModel);
+        }
         #endregion
 
         #region 会员中心

Mall.WebApi/Controllers/User/UserController.cs

@@ -2711,7 +2711,10 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.ParamIsNull("请传递同级返佣比例");
             }
-
+            //验证等级是否重复
+            if (userModule.ValidateFXGrade(demodel.Id, demodel.Grade, req.TenantId, req.MallBaseId)) {
+                return ApiResult.ParamIsNull("等级已存在，请核实后再试");
+            }
 
             demodel.TenantId = req.TenantId;
             demodel.MallBaseId = req.MallBaseId;