Skip to content

M
mall.oytour.com
Commit 5bc98ec2 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 26f5edef
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 43 deletions
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @ 5bc98ec2
......@@ -129,6 +129,11 @@ namespace Mall.Model.Extend.User
/// 是否已提现 1是 2否
/// </summary>
public int IsRemit { get; set; }
/// <summary>
/// 用户等级头像
/// </summary>
public string Icon { get; set; }
}
......
Mall.Module.User/MemberUserModule.cs
View file @ 5bc98ec2
......@@ -31,36 +31,6 @@ namespace Mall.Module.User
{ nameof(RB_Member_User_Extend.Photo),extModel.Photo},
};
return member_UserRepository.Update(fileds, new WhereHelper(nameof(RB_Member_User_Extend.Id), extModel.Id));
//bool falg= member_UserRepository.UpdateMemberUserRepository(new RB_Member_User_Extend()
//{
// Name=extModel.AliasName,
// Photo=extModel.Photo,
// Id=extModel.Id
//});
//return falg;
}
/// <summary>
/// 获取用户佣金
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public RB_Member_User_Extend GetUserCommissionModule(int UserId)
{
RB_Member_User_Extend model = new RB_Member_User_Extend() { Id = UserId };
//总佣金
var totalList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds=UserId.ToString()});
//本月佣金
var currentMonthList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds = UserId.ToString() }, IsGetCurrentMonth: true);
if (totalList != null && totalList.Count > 0)
{
model.TotalCommission = totalList.Sum(qitem => qitem.Commission);
}
if (currentMonthList != null && currentMonthList.Count > 0)
{
model.Commission = currentMonthList.Sum(qitem => qitem.Commission);
}
return model;
}
}
}
Mall.Module.User/UserModule.cs
View file @ 5bc98ec2
......@@ -3420,6 +3420,47 @@ namespace Mall.Module.User
};
}
/// <summary>
/// 获取团队成员详情
/// </summary>
/// <param name="UserId"></param>
/// <returns></returns>
public object GetTeamUserInfoModule(int UserId)
{
var extModel = member_UserRepository.GetListExtRepository(new RB_Member_User_Extend() { UserIds = UserId.ToString() })?.FirstOrDefault();
List<RB_Member_User_Extend> totalList = new List<RB_Member_User_Extend>();
//本月佣金
List<RB_Member_User_Extend> currentMonthList = new List<RB_Member_User_Extend>();
decimal totalCommission = 0;
totalList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds = UserId.ToString() });
if (totalList != null && totalList.Count > 0)
{
totalCommission = totalList.Sum(qitem => qitem.Commission);
}
decimal currentCommission = 0;
currentMonthList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds = UserId.ToString() }, IsGetCurrentMonth: true);
if (currentMonthList != null && currentMonthList.Count > 0)
{
currentCommission = currentMonthList.Sum(qitem => qitem.Commission);
}
string createDateStr = "";
if (extModel != null && extModel.CreateDate != null)
{
createDateStr = Convert.ToDateTime(extModel.CreateDate).ToString("yyyy年MM月dd月");
}
var obj = new
{
extModel?.Name,
extModel?.Photo,
extModel?.Icon,
createDateStr,
totalCommission,
currentCommission
};
return obj;
}
/// <summary>
/// 获取分销商升级条件
/// </summary>
......@@ -3967,7 +4008,7 @@ namespace Mall.Module.User
public object GetUserMyTeamPageListForFX(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel)
{
string UserIds = member_UserRepository.GetMemberChildIdStr(demodel.UserId ?? 0);
var list = member_UserRepository.GetPageListForFX(pageIndex, pageSize, out count,
new RB_Member_User_Extend()
{
......@@ -3999,7 +4040,7 @@ namespace Mall.Module.User
CreateDate = item.CreateDate.HasValue ? item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
GeneralizeNum = tgNum,
OrderNum = orderModel?.OrderNum ?? 0,
Income = orderModel?.Income ?? 0
Income = orderModel?.Income ?? 0,
});
}
}
......
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ 5bc98ec2
......@@ -289,7 +289,7 @@ select * from RB_Member_User where {where} order by CreateDate desc
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT u.*
SELECT u.*
FROM RB_Member_User u INNER JOIN rb_distributor_info d on u.Id =d.UserId
LEFT JOIN (
SELECT u.SuperiorId,COUNT(0) AS ReferralsNum
......@@ -317,6 +317,89 @@ WHERE 1=1 {0}
return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 获取用户列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Member_User_Extend> GetListExtRepository(RB_Member_User_Extend dmodel)
{
string where = " and d.Status=0 ";
if (dmodel.TenantId > 0)
{
where += $@" and u.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
where += $@" and B.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and u.{nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
where += $@" and B.{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}";
}
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT u.*,B.Icon
FROM RB_Member_User u INNER JOIN rb_distributor_info d on u.Id =d.UserId
LEFT JOIN rb_distributor_fxgrade AS B ON d.FXGradeId=B.Grade AND B.`Status`=0
WHERE 1=1 {0}
", where);
string orderBy = " order by u.CreateDate desc ";
if (dmodel.SortNum == 1)
{
orderBy = " order by u.CreateDate ASC ";
}
else if (dmodel.SortNum == 2)
{
orderBy = " order by B.ReferralsNum DESC ";
}
else if (dmodel.SortNum == 3)
{
orderBy = " order by B.ReferralsNum ASC ";
}
builder.AppendFormat(orderBy);
return Get<RB_Member_User_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 获取下线数量（粉象）
/// </summary>
......@@ -1007,7 +1090,7 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use
}
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT UserId,IsRemit,SUM(A.Commission) AS Commission
SELECT UserId AS Id,IsRemit,SUM(A.Commission) AS Commission
FROM
(
SELECT UserId,SUM(Commission) AS Commission,IsRemit
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ 5bc98ec2
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mall.Common.API;
using Mall.Model.Extend.User;
using Mall.Module.User;
......@@ -11,16 +10,12 @@ using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Mall.Common.Plugin;
using Mall.Common.Enum.User;
using Mall.CacheManager.User;
using Newtonsoft.Json.Linq;
using Mall.Common;
using Mall.Model.Extend.Product;
using Mall.Model.Extend.MarketingCenter;
using Mall.Model.Entity.User;
using NPOI.SS.Formula.Functions;
using Google.Protobuf.WellKnownTypes;
using Mall.Module.BaseSetUp;
namespace Mall.WebApi.Controllers.User
{
[Route("api/[controller]/[action]")]
......@@ -402,6 +397,19 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Success("", obj);
}
/// <summary>
/// 获取团队成员信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetTeamUserInfo()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
int UserId = parms.GetInt("UserId", 0);
var obj = userModule.GetTeamUserInfoModule(UserId);
return ApiResult.Success("", obj);
}
/// <summary>
/// 获取和平下线
/// </summary>
......@@ -678,13 +686,15 @@ namespace Mall.WebApi.Controllers.User
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());
JObject prams = JObject.Parse(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);
var list= userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
pageModel.count = Convert.ToInt32(count);
pageModel.pageData = list;
return ApiResult.Success("", pageModel);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment