Skip to content

M
mall.oytour.com
Commit cf313656 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent f06dc300
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 33 deletions
Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs
View file @ cf313656
......@@ -101,7 +101,10 @@ namespace Mall.Model.Entity.Miai
/// 年收入
/// </summary>
public decimal YearMoney { get; set; }
/// <summary>
/// 年收入
/// </summary>
public YearMoneyTypeEnum? YearMoneyType { get; set; }
/// <summary>
/// 国家
......@@ -302,5 +305,10 @@ namespace Mall.Model.Entity.Miai
}
public int IsFaTie { get; set; }
/// <summary>
/// 行业
/// </summary>
public string Industry { get; set; }
}
}
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ cf313656
......@@ -3660,6 +3660,12 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary>
public string Education { get; set; }
/// <summary>
/// 行业
/// </summary>
public string Industry { get; set; }
/// <summary>
/// 婚姻状态
/// </summary>
......@@ -3670,6 +3676,22 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary>
public int Score { get; set; }
/// <summary>
/// 是否已认证，0-未认证，1-已认证
/// </summary>
public int Authentication { get; set; }
/// <summary>
/// 年收入
/// </summary>
public string YearMoneyTypeStr { get; set; }
public string IDCardNo { get; set; }
/// <summary>
/// 身高
/// </summary>
public decimal Height { get; set; }
/// <summary>
/// 相册
/// </summary>
......
Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs
View file @ cf313656
......@@ -12,7 +12,7 @@ namespace Mall.Model.Extend.Miai
/// </summary>
public List<string> AlbumList { get; set; }
public string Name { get; set; }
......@@ -81,6 +81,13 @@ namespace Mall.Model.Extend.Miai
/// 车
/// </summary>
public string CarInfoStr { get; set; }
/// <summary>
/// 年收入信息
/// </summary>
public string YearMoneyTypeStr { get; set; }
/// <summary>
/// 房信息
......
Mall.Module.Miai/MiaiModule.cs
View file @ cf313656
......@@ -1618,6 +1618,8 @@ namespace Mall.Module.Miai
{ nameof(RB_MiAi_BaseInfo_Extend.DWCity),model.DWCity},
{ nameof(RB_MiAi_BaseInfo_Extend.DWProvince),model.DWProvince},
{ nameof(RB_MiAi_BaseInfo_Extend.DWDistrict),model.DWDistrict},
{ nameof(RB_MiAi_BaseInfo_Extend.Industry),model.Industry},
{ nameof(RB_MiAi_BaseInfo_Extend.YearMoneyType),model.YearMoneyType},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ cf313656
......@@ -299,7 +299,7 @@ namespace Mall.WebApi.Controllers
CategoryIds = childItem.id.ToString(),
GoodsStatus = 1,
GoodsClassify = 1,//查询非司导
OrderBy=2,
OrderBy = 2,
CreateBy = -1,
GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
}, SmallShopsId: SmallShopsId);
......@@ -335,8 +335,8 @@ namespace Mall.WebApi.Controllers
MallBaseId = MallBaseId,
GoodsStatus = 1,
GoodsClassify = 1,//查询非司导
OrderBy=2,
CreateBy=-1,
OrderBy = 2,
CreateBy = -1,
GoodsPageType = IsOpenSchool == 1 ? Common.Enum.Goods.GoodsPageTypeEnum.School : Common.Enum.Goods.GoodsPageTypeEnum.Mall
});
#region 微店价格
......@@ -1359,13 +1359,29 @@ namespace Mall.WebApi.Controllers
lastItem.Age = tempGood.Age.ToString(); //Common.Plugin.StringHelper.GetAge(tempGood.Birthday);
lastItem.Marriage = (tempGood.Marriage.HasValue && tempGood.Marriage.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.Marriage) : "";
lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
lastItem.Score = 0;
lastItem.Height = tempGood.Height;
lastItem.Industry = tempGood.Industry;
if (!string.IsNullOrWhiteSpace(tempGood.IDCardNo))
{
lastItem.Authentication = 1;
if (tempGood.IDCardNo.Length==18)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(8, 2);
}
else if (tempGood.IDCardNo.Length == 15)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(6, 2);
}
}
lastItem.Album = tempGood.Album;
if (!string.IsNullOrWhiteSpace(lastItem.Album))
{
lastItem.AlbumList = JsonConvert.DeserializeObject<List<string>>(lastItem.Album);
}
newGoodsList.Add(lastItem);
}
}
......@@ -1407,6 +1423,7 @@ namespace Mall.WebApi.Controllers
miaiBaseIfoQuery.CarInfo = queryBaseInfoModel.CarInfo;
miaiBaseIfoQuery.HouseInfo = queryBaseInfoModel.HouseInfo;
miaiBaseIfoQuery.Marriage = queryBaseInfoModel.Marriage;
}
}
var tempGoodsList = miaiModule.GetMatchingBaseInfoList(miaiBaseIfoQuery, miAiUserItem.goodsLength);
......@@ -1425,6 +1442,20 @@ namespace Mall.WebApi.Controllers
lastItem.Marriage = (tempGood.Marriage.HasValue && tempGood.Marriage.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.Marriage) : "";
lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
lastItem.Score = 0;
lastItem.Height = tempGood.Height;
lastItem.Industry = tempGood.Industry;
if (!string.IsNullOrWhiteSpace(tempGood.IDCardNo))
{
lastItem.Authentication = 1;
if (tempGood.IDCardNo.Length == 18)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(8, 2);
}
else if (tempGood.IDCardNo.Length == 15)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(6, 2);
}
}
lastItem.Album = tempGood.Album;
if (!string.IsNullOrWhiteSpace(lastItem.Album))
{
......@@ -1462,6 +1493,20 @@ namespace Mall.WebApi.Controllers
lastItem.Marriage = (tempGood.Marriage.HasValue && tempGood.Marriage.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.Marriage) : "";
lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
lastItem.Score = 0;
lastItem.Height = tempGood.Height;
lastItem.Industry = tempGood.Industry;
if (!string.IsNullOrWhiteSpace(tempGood.IDCardNo))
{
lastItem.Authentication = 1;
if (tempGood.IDCardNo.Length == 18)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(8, 2);
}
else if (tempGood.IDCardNo.Length == 15)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(6, 2);
}
}
lastItem.Album = tempGood.Album;
if (!string.IsNullOrWhiteSpace(lastItem.Album))
{
......@@ -1497,6 +1542,20 @@ namespace Mall.WebApi.Controllers
lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
lastItem.Score = 0;
lastItem.Height = tempGood.Height;
lastItem.Industry = tempGood.Industry;
if (!string.IsNullOrWhiteSpace(tempGood.IDCardNo))
{
lastItem.Authentication = 1;
if (tempGood.IDCardNo.Length == 18)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(8, 2);
}
else if (tempGood.IDCardNo.Length == 15)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(6, 2);
}
}
lastItem.Album = tempGood.Album;
if (!string.IsNullOrWhiteSpace(lastItem.Album))
{
......@@ -1619,7 +1678,7 @@ namespace Mall.WebApi.Controllers
CreateBy = gItem.UserName,
CreateByIco = gItem.Photo,
IsDianZan = dianZanCount,
IsTieZi=gItem.IsTieZi,
IsTieZi = gItem.IsTieZi,
DianZanNum = gItem.DianZanNum//先默认0
});
}
......@@ -1764,7 +1823,7 @@ namespace Mall.WebApi.Controllers
lastItem.CreateByIco = tempGood.Photo;
lastItem.IsDianZan = dianZanCount;
lastItem.CreateById = tempGood.UserId;
lastItem. IsTieZi = tempGood.IsTieZi;
lastItem.IsTieZi = tempGood.IsTieZi;
lastItem.DianZanNum = tempGood.DianZanNum;//先默认0
newGoodsList.Add(lastItem);
}
......@@ -1923,7 +1982,7 @@ namespace Mall.WebApi.Controllers
data = blindDatePPPlusData
};
break;
//首店-自定义列表插件
//首店-自定义列表插件
case "tradePavilionCustom":
var tradeData = subItem.data as educationCustomItem;
if (tradeData != null)
......@@ -1950,7 +2009,7 @@ namespace Mall.WebApi.Controllers
picUrl = cItem.Logo,
lableName = cItem.CarrierPlan,
lableNameList = new List<string>(),
linkUrl = string.Format("/pages/kotra/carrier/detail?id={0}&&type={1}", cItem.ID,cItem.ProjectType.GetEnumName())
linkUrl = string.Format("/pages/kotra/carrier/detail?id={0}&&type={1}", cItem.ID, cItem.ProjectType.GetEnumName())
};
tradeData.list.Add(dModel);
}
......@@ -1973,7 +2032,7 @@ namespace Mall.WebApi.Controllers
picUrl = cItem.Logo,
lableName = cItem.BrandType,
lableNameList = new List<string>(),
linkUrl = string.Format("/pages/kotra/brand/detail?id={0}",cItem.ID),
linkUrl = string.Format("/pages/kotra/brand/detail?id={0}", cItem.ID),
};
tradeData.list.Add(dModel);
}
......@@ -1981,8 +2040,8 @@ namespace Mall.WebApi.Controllers
}
//手动添加
else
{
{
}
}
obj = new
......@@ -1993,11 +2052,11 @@ namespace Mall.WebApi.Controllers
break;
//首店活动组件
case "tradeActivity":
var tradeActivityData = Common.Plugin.JsonHelper.DeserializeObject<List< TradeActivityItem >>(Common.Plugin.JsonHelper.Serialize(subItem.data));
var tradeActivityData = Common.Plugin.JsonHelper.DeserializeObject<List<TradeActivityItem>>(Common.Plugin.JsonHelper.Serialize(subItem.data));
List<object> activityDataList = new List<object>();
if (tradeActivityData != null && tradeActivityData.Count > 0)
{
string ActivityIds = string.Join(",", tradeActivityData.Where(qitem=>!string.IsNullOrEmpty(qitem.NewActivitys)).Select(qitem => qitem.NewActivitys.Replace("，",",")));
string ActivityIds = string.Join(",", tradeActivityData.Where(qitem => !string.IsNullOrEmpty(qitem.NewActivitys)).Select(qitem => qitem.NewActivitys.Replace("，", ",")));
var activityList = commerceActivityModule.GetCommerceActivityListModule(new RB_Commerce_Activity_Extend()
{
TenantId = TenantId,
......@@ -2039,7 +2098,8 @@ namespace Mall.WebApi.Controllers
{
tItem.GroupName,
tItem.DateStr,
DataList = aList?.Select(aItem => new {
DataList = aList?.Select(aItem => new
{
aItem.Id,
aItem.ActivityName,
StartTime = Common.ConvertHelper.FormatTime(aItem.StartTime),
......@@ -3255,7 +3315,7 @@ namespace Mall.WebApi.Controllers
resultMallShopStyle?.main,
resultMallShopStyle?.secondary,
resultMallShopStyle?.IsEducation,
miaiPPPlusStyle = miniProgram.MiaiPPPlusStyle==0?1: miniProgram.MiaiPPPlusStyle
miaiPPPlusStyle = miniProgram.MiaiPPPlusStyle == 0 ? 1 : miniProgram.MiaiPPPlusStyle
};
var setting = new
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ cf313656
......@@ -45,7 +45,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetForumList()
{
var req = base.RequestParm;
......@@ -69,7 +70,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityPageList()
{
var parms = RequestParm;
......@@ -132,7 +134,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityInfo()
{
var userInfo = AppletUserInfo;
......@@ -334,7 +337,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetSimpleActivityPageList()
{
var parms = RequestParm;
......@@ -573,7 +577,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityDiscussPageList()
{
var parms = RequestParm;
......@@ -598,7 +603,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
x.Id,
x.UserId,
UserName= !string.IsNullOrWhiteSpace(x.CreateByUserName) ? x.CreateByUserName : x.UserName,
UserName = !string.IsNullOrWhiteSpace(x.CreateByUserName) ? x.CreateByUserName : x.UserName,
x.Photo,
x.Sex,
x.Content,
......@@ -634,7 +639,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityDiscussCount()
{
var parms = RequestParm;
......@@ -669,7 +675,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetActivityReplyPageList()
{
var parms = RequestParm;
......@@ -1223,10 +1230,10 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed("请选择定位省市区");
}
if (baseInfo.YearMoney == 0)
{
return ApiResult.Failed("请输入年收入");
}
//if (baseInfo.YearMoney == 0)
//{
// return ApiResult.Failed("请输入年收入");
//}
if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
{
return ApiResult.Failed("请选择学历");
......@@ -1270,7 +1277,8 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[HttpPost]
public ApiResult GetMiAiBaseIfo()
{
......@@ -1399,6 +1407,9 @@ namespace Mall.WebApi.Controllers.MallBase
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
YearMoneyTypeStr = (oldBaseInfo.YearMoneyType.HasValue && oldBaseInfo.YearMoneyType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.YearMoneyType) : "",
YearMoneyType = oldBaseInfo.YearMoneyType ?? 0,
Industry = oldBaseInfo.Industry ?? "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
......@@ -1460,7 +1471,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// 获取会员基础信息
/// </summary>
/// <returns></returns>
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[HttpPost]
public ApiResult GetBaseInfoPageList()
{
......@@ -1532,6 +1544,8 @@ namespace Mall.WebApi.Controllers.MallBase
lastItem.Age = tempGood.Age.ToString();
lastItem.Marriage = (tempGood.Marriage.HasValue && tempGood.Marriage.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.Marriage) : "";
lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
lastItem.YearMoneyTypeStr = (tempGood.YearMoneyType.HasValue && tempGood.YearMoneyType.Value > 0) ? EnumHelper.GetEnumName(tempGood.YearMoneyType) : "";
lastItem.Industry = tempGood.Industry ?? "";
lastItem.Score = 0;
lastItem.Album = tempGood.Album;
if (!string.IsNullOrWhiteSpace(lastItem.Album))
......@@ -1552,7 +1566,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// 获取会员基础信息
/// </summary>
/// <returns></returns>
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[HttpPost]
public ApiResult GetBaseInfoQueryList()
{
......@@ -1641,12 +1656,27 @@ namespace Mall.WebApi.Controllers.MallBase
Id = Convert.ToInt32(x.Value)
}));
}
/// <summary>
/// 获取年收入枚举
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetYearMoneyTypeEnumList()
{
var list = EnumHelper.GetEnumList(typeof(Common.Enum.MiAi.YearMoneyTypeEnum));
return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
{
Name = x.Key,
Id = Convert.ToInt32(x.Value)
}));
}
/// <summary>
/// 获取每日随机信息
/// </summary>
/// <returns></returns>
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[HttpPost]
public ApiResult GetDailyRandomList()
{
......@@ -1724,6 +1754,20 @@ namespace Mall.WebApi.Controllers.MallBase
lastItem.Education = (tempGood.EducationType.HasValue && tempGood.EducationType.Value > 0) ? Common.Plugin.EnumHelper.GetEnumName(tempGood.EducationType) : "";
lastItem.Score = 0;
lastItem.Album = tempGood.Album;
lastItem.Height = tempGood.Height;
lastItem.Industry = tempGood.Industry;
if (!string.IsNullOrWhiteSpace(tempGood.IDCardNo))
{
lastItem.Authentication = 1;
if (tempGood.IDCardNo.Length == 18)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(8, 2);
}
else if (tempGood.IDCardNo.Length == 15)
{
lastItem.IDCardNo = tempGood.IDCardNo.Substring(6, 2);
}
}
if (!string.IsNullOrWhiteSpace(lastItem.Album))
{
lastItem.AlbumList = JsonConvert.DeserializeObject<List<string>>(lastItem.Album);
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ cf313656
......@@ -689,6 +689,9 @@ namespace Mall.WebApi.Controllers.MallBase
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
YearMoneyTypeStr = (oldBaseInfo.YearMoneyType.HasValue && oldBaseInfo.YearMoneyType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.YearMoneyType) : "",
YearMoneyType = oldBaseInfo.YearMoneyType ?? 0,
Industry = oldBaseInfo.Industry ?? "",
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo?.YearMoney ?? 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