Commit 944c15cd authored by liudong1993's avatar liudong1993

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents af3bd3d8 e30d75e8
...@@ -120,7 +120,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -120,7 +120,8 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
if (userInfo == null) { if (userInfo == null)
{
userInfo = new AppletUserInfo userInfo = new AppletUserInfo
{ {
UserId = 0, UserId = 0,
...@@ -664,7 +665,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -664,7 +665,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetMiaiMessageVisitorStatistics() { public ApiResult GetMiaiMessageVisitorStatistics()
{
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var parms = JObject.Parse(RequestParm.msg.ToString()); var parms = JObject.Parse(RequestParm.msg.ToString());
int Type = parms.GetInt("Type", 1);// 类型 1谁看过我 2我看过谁 int Type = parms.GetInt("Type", 1);// 类型 1谁看过我 2我看过谁
...@@ -678,7 +680,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -678,7 +680,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetMiaiMessageVisitorPageList() { public ApiResult GetMiaiMessageVisitorPageList()
{
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
...@@ -690,7 +693,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -690,7 +693,8 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
} }
else { else
{
demodel.CreateBy = userInfo.UserId; demodel.CreateBy = userInfo.UserId;
} }
var list = miaiModule.GetMiaiMessageVisitorPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = miaiModule.GetMiaiMessageVisitorPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
...@@ -912,8 +916,16 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -912,8 +916,16 @@ namespace Mall.WebApi.Controllers.MallBase
int MyFollowId = 0; int MyFollowId = 0;
int OtherFollowId = 0; int OtherFollowId = 0;
if (userInfo == null)
if (userInfo!=null) {
userInfo = new AppletUserInfo
{
UserId = RequestParm.UserId,
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId
};
}
if (userInfo != null && userInfo.UserId > 0)
{ {
var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userId, CreateBy = userInfo.UserId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId }); var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userId, CreateBy = userInfo.UserId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
var oldOtherList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userInfo.UserId, CreateBy = userId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId }); var oldOtherList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userInfo.UserId, CreateBy = userId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
......
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