Commit 9e0ee2f6 authored by 吴春's avatar 吴春

解决冲突

parents dd1ced72 8fd8dd70
......@@ -185,7 +185,7 @@ namespace Mall.Module.User
}
else
{
LogHelper.Write(string.Format("SendOrderSucceedMsg:wenXinResult:{0}", wenXinResult));
LogHelper.WriteInfo(string.Format("SendOrderSucceedMsg:wenXinResult:{0}", wenXinResult));
}
}
return false;
......
......@@ -4004,8 +4004,9 @@ namespace Mall.Module.User
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <param name="NewUserId"></param>
/// <returns></returns>
public object GetUserMyTeamPageListForFX(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel)
public object GetUserMyTeamPageListForFX(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel,int NewUserId=0)
{
string UserIds = member_UserRepository.GetMemberChildIdStr(demodel.UserId ?? 0);
......@@ -4028,7 +4029,7 @@ namespace Mall.Module.User
//获取消费金额 + 订单数量
var oList = goods_OrderRepository.GetUserOrderNumAndMoney(userIds, demodel.TenantId, demodel.MallBaseId);
foreach (var item in list)
foreach (var item in list.Where(qitem => qitem.Id != NewUserId))
{
int tgNum = tList.Where(x => x.SuperiorId == item.Id).FirstOrDefault()?.ReferralsNum ?? 0;
var orderModel = oList.Where(x => x.UserId == item.Id).FirstOrDefault();
......
......@@ -690,8 +690,19 @@ namespace Mall.WebApi.Controllers.User
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId;
//var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
int NewUserId = 0;
//HK 2020-08-27新增
JObject parms = JObject.Parse(req.msg.ToString());
if (parms.GetInt("NewUserId") > 0)
{
demodel.UserId = parms.GetInt("NewUserId");
NewUserId= parms.GetInt("NewUserId");
}
var list= userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel,NewUserId: NewUserId);
pageModel.count = Convert.ToInt32(count);
pageModel.pageData = list;
......
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