Commit 6284ab08 authored by 吴春's avatar 吴春

提交代码

parent 07cd2b23
...@@ -3049,6 +3049,10 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -3049,6 +3049,10 @@ namespace Mall.Model.Extend.MarketingCenter
public int addUserType { get; set; } public int addUserType { get; set; }
/// <summary>
/// 用户添加方式(0-默认,1-男神,2-女神)
/// </summary>
public int sexType { get; set; }
/// <summary> /// <summary>
/// 浏览权重 /// 浏览权重
......
...@@ -639,6 +639,7 @@ namespace Mall.Module.MarketingCenter ...@@ -639,6 +639,7 @@ namespace Mall.Module.MarketingCenter
miaiUserItem.PaddingRight = driveData?.PaddingRight ?? "0"; miaiUserItem.PaddingRight = driveData?.PaddingRight ?? "0";
miaiUserItem.SearchFilletPX = driveData?.SearchFilletPX ?? 0; miaiUserItem.SearchFilletPX = driveData?.SearchFilletPX ?? 0;
miaiUserItem.goodsLength = driveData.goodsLength; miaiUserItem.goodsLength = driveData.goodsLength;
miaiUserItem.sexType = driveData?.sexType ?? 0;
miaiUserItem.BrowseRate = miaiUserItem.addUserType == 2 ? (miaiUserItem.BrowseRate == 0 ? 1 : miaiUserItem.BrowseRate) : 0; miaiUserItem.BrowseRate = miaiUserItem.addUserType == 2 ? (miaiUserItem.BrowseRate == 0 ? 1 : miaiUserItem.BrowseRate) : 0;
miaiUserItem.FollowRate = miaiUserItem.addUserType == 2 ? (miaiUserItem.FollowRate == 0 ? 1 : miaiUserItem.FollowRate) : 0; miaiUserItem.FollowRate = miaiUserItem.addUserType == 2 ? (miaiUserItem.FollowRate == 0 ? 1 : miaiUserItem.FollowRate) : 0;
miaiUserItem.list = new List<miaiUserDetail>(); miaiUserItem.list = new List<miaiUserDetail>();
......
...@@ -1790,6 +1790,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1790,6 +1790,7 @@ namespace Mall.WebApi.Controllers.Education
/// 获取新闻信息详情 /// 获取新闻信息详情
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost]
public ApiResult GetSetEducationTalk() public ApiResult GetSetEducationTalk()
{ {
var qequest = RequestParm; var qequest = RequestParm;
......
...@@ -103,8 +103,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -103,8 +103,7 @@ namespace Mall.WebApi.Controllers.MallBase
int storeId = parms.GetInt("StoreId", 0); int storeId = parms.GetInt("StoreId", 0);
//用户id //用户id
int userId = RequestParm.UserId; int userId = RequestParm.UserId;
//用户性别
int sex = parms.GetInt("Sex", 0);
//首页数据 //首页数据
var homePage = new object(); var homePage = new object();
//底部导航 //底部导航
...@@ -181,7 +180,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -181,7 +180,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
foreach (var subItem in templateModel.ComponentDataList) foreach (var subItem in templateModel.ComponentDataList)
{ {
templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, sex, storeId,userId)); templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, storeId,userId));
} }
} }
var tempObj = new var tempObj = new
......
...@@ -106,7 +106,7 @@ namespace Mall.WebApi.Controllers ...@@ -106,7 +106,7 @@ namespace Mall.WebApi.Controllers
/// </summary> /// </summary>
/// <param name="item"></param> /// <param name="item"></param>
/// <returns></returns> /// <returns></returns>
public static object PlusDataToObject(ComponentItem subItem, int TenantId, int MallBaseId, int SmallShopsId, int IsOpenSchool, int StoreId, int SexInfo, int UserId = 0) public static object PlusDataToObject(ComponentItem subItem, int TenantId, int MallBaseId, int SmallShopsId, int IsOpenSchool, int StoreId, int UserId = 0)
{ {
var obj = new object(); var obj = new object();
switch (subItem.Id) switch (subItem.Id)
...@@ -1311,9 +1311,9 @@ namespace Mall.WebApi.Controllers ...@@ -1311,9 +1311,9 @@ namespace Mall.WebApi.Controllers
} }
} }
} }
if (SexInfo > 0) if (miAiUserItem.sexType > 0)
{ {
Sex = SexInfo == 1 ? 2 : (SexInfo == 2 ? 1 : 0); Sex = miAiUserItem.sexType == 1 ? 2 : (miAiUserItem.sexType == 2 ? 1 : 0);
} }
} }
......
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