Skip to content

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

解决冲突

parents deba9c49 f45222b4
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 170 deletions
Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs
View file @ 854f1d25
......@@ -26,114 +26,143 @@ namespace Mall.Model.Entity.Miai
/// </summary>
public int UserId { get; set; }
/// <summary>
/// 性别1-男，2-女
/// </summary>
public int Sex { get; set; }
/// <summary>
/// 生日
/// </summary>
public string Birthday { get; set; }
/// <summary>
/// 体重
/// </summary>
public decimal Weight { get; set; }
/// <summary>
/// 身高
/// </summary>
public decimal Height { get; set; }
/// <summary>
/// 体重
/// </summary>
public decimal Weight { get; set; }
/// <summary>
/// 学历
/// </summary>
public EducationTypeEnum? EducationType { get; set; }
/// <summary>
/// 毕业院校
/// </summary>
public string SchoolInfo { get; set; }
/// <summary>
/// 婚姻
/// </summary>
public MarriageEnum? Marriage { get; set; }
/// <summary>
/// 名称
/// 职务
/// </summary>
public string RealName { get; set; }
public string Job { get; set; }
/// <summary>
/// 身份证号
/// 工作单位
/// </summary>
public string IDCardNo { get; set; }
public string WorkUnit { get; set; }
/// <summary>
/// 身份证号
/// 年收入
/// </summary>
public string IDCard { get; set; }
public string YearMoney { get; set; }
/// <summary>
/// 身份证反面
/// </summary>
public string IDCardBack { get; set; }
/// 国家
/// </summary>
public int? Country
{
get;
set;
}
/// <summary>
/// 省
/// </summary>
public int? Province
{
get;
set;
}
/// <summary>
/// 市
/// </summary>
public int? City
{
get;
set;
}
/// <summary>
/// 区
/// </summary>
public int? District
{
get;
set;
}
/// <summary>
/// 户口
/// 资产
/// </summary>
public string HuKou { get; set; }
public string HouseInfo { get; set; }
/// <summary>
/// 籍贯
/// 家庭背景
/// </summary>
public string NativePlace { get; set; }
public string FamilyInfo { get; set; }
/// <summary>
/// 房屋信息
/// 业余爱好
/// </summary>
public string HouseInfo { get; set; }
public string Hobby { get; set; }
/// <summary>
/// 学校信息
/// 喜欢的食物
/// </summary>
public string SchoolInfo { get; set; }
public string LikeFood { get; set; }
/// <summary>
/// 年收入
/// 喜欢的书
/// </summary>
public string YearMoney { get; set; }
public string LikeBook { get; set; }
/// <summary>
/// 职务
/// 喜欢的电影和电视剧
/// </summary>
public string Job { get; set; }
public string LikeTV { get; set; }
/// <summary>
/// 其他兄弟姐妹
/// 喜欢的情歌
/// </summary>
public string OtherPople { get; set; }
public string LikeSong { get; set; }
/// <summary>
/// 专业
/// 欣赏哪对名人的爱情，原因是什么
/// </summary>
public string MajorInfo { get; set; }
public string IdealLove { get; set; }
/// <summary>
/// 车辆信息
/// 情话
/// </summary>
public string CarInfo { get; set; }
public string LoveTalk { get; set; }
/// <summary>
/// 父亲工作信息
/// 单身原因
/// </summary>
public string FatherInfo { get; set; }
public string SingleReason { get; set; }
/// <summary>
/// 母亲工作信息
/// </summary>
public string MotherInfo { get; set; }
/// <summary>
/// 关于
......@@ -141,9 +170,9 @@ namespace Mall.Model.Entity.Miai
public string About { get; set; }
/// <summary>
/// 理想爱情
/// 希望您是
/// </summary>
public string IdealLove { get; set; }
public string HopeYou { get; set; }
/// <summary>
......@@ -151,6 +180,21 @@ namespace Mall.Model.Entity.Miai
/// </summary>
public string Album { get; set; }
/// <summary>
/// 约会时间
/// </summary>
public string Appointment { get; set; }
/// <summary>
/// 约会地点
/// </summary>
public string AppointmentAddress { get; set; }
/// <summary>
/// 浏览数
/// </summary>
......
Mall.Model/Entity/Property/RB_Warehouseout_Inventory.cs
View file @ 854f1d25
......@@ -102,5 +102,10 @@ namespace Mall.Model.Entity.Property
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 有效期ids
/// </summary>
public string ValidityIds { get; set; }
}
}
Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs
View file @ 854f1d25
......@@ -42,6 +42,20 @@ namespace Mall.Model.Extend.Miai
/// 关注权重
/// </summary>
public decimal FollowRate { get; set; }
/// <summary>
/// 省名称
/// </summary>
public string PName { get; set; }
/// <summary>
/// 市名称
/// </summary>
public string CName { get; set; }
/// <summary>
/// 区名称
/// </summary>
public string DName { get; set; }
}
}
Mall.Model/Extend/Miai/RB_Miai_Message_Extend.cs
View file @ 854f1d25
......@@ -44,7 +44,7 @@ namespace Mall.Model.Extend.Miai
/// <summary>
/// 真实名称
/// </summary>
public string RealName { get; set; }
// public string RealName { get; set; }
/// <summary>
/// 头像
/// </summary>
......
Mall.Module.Miai/MiaiModule.cs
View file @ 854f1d25
......@@ -69,7 +69,10 @@ namespace Mall.Module.Miai
/// </summary>
private readonly Repository.User.RB_Member_UserRepository member_UserRepository = new Repository.User.RB_Member_UserRepository();
/// <summary>
/// 区域
/// </summary>
private readonly Repository.BaseSetUp.Rb_destinationRepository destinationRepository = new Repository.BaseSetUp.Rb_destinationRepository();
#region 会员信息
/// <summary>
......@@ -171,7 +174,8 @@ namespace Mall.Module.Miai
{
userIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
}
else {
else
{
userIds = string.Join(",", list.Select(x => x.UserId).Distinct());
}
var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds });
......@@ -179,7 +183,6 @@ namespace Mall.Module.Miai
{
var bmodel = blist.Where(x => x.UserId == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
item.Name = bmodel?.Name ?? "";
item.RealName = bmodel?.RealName ?? "";
item.Photo = bmodel?.Photo ?? "";
item.Sex = bmodel?.Sex ?? 0;
}
......@@ -192,9 +195,11 @@ namespace Mall.Module.Miai
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public string GetMiaiMessageDescription(RB_Miai_Message_Extend model) {
public string GetMiaiMessageDescription(RB_Miai_Message_Extend model)
{
if (model == null) { return ""; }
switch (model.Type) {
switch (model.Type)
{
case Common.Enum.MiAi.MessageTypeEnum.CircleLike:
return "有新用户给你点赞";
case Common.Enum.MiAi.MessageTypeEnum.CircleReply:
......@@ -233,12 +238,14 @@ namespace Mall.Module.Miai
var list = miaiCommonModule.GetPageList(pageIndex, pageSize, out count, demodel);
if (list.Any())
{
//每种类型 额外返回数据
#region 拼拼活动
var activityList = list.Where(x => x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnroll || x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnrollCancel
|| x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellComment || x.Type == Common.Enum.MiAi.MessageTypeEnum.SpellReply).ToList();
List<RB_Miai_Activity_Extend> ActivityList = new List<RB_Miai_Activity_Extend>();
if (activityList.Any()) {
if (activityList.Any())
{
string ActivityIds = string.Join(",", activityList.Select(x => x.SourceId).Distinct());
ActivityList = miai_ActivityRepository.GetList(new RB_Miai_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
}
......@@ -246,7 +253,8 @@ namespace Mall.Module.Miai
#region 星球活动
var commerceList = list.Where(x => x.Type == Common.Enum.MiAi.MessageTypeEnum.ActivityCancel).ToList();
List<Model.Extend.TradePavilion.RB_Commerce_Activity_Extend> CommerceList = new List<Model.Extend.TradePavilion.RB_Commerce_Activity_Extend>();
if (commerceList.Any()) {
if (commerceList.Any())
{
string ActivityIds = string.Join(",", commerceList.Select(x => x.SourceId).Distinct());
CommerceList = commerce_ActivityRepository.GetList(new Model.Extend.TradePavilion.RB_Commerce_Activity_Extend() { TenantId = demodel.TenantId, ActivityIds = ActivityIds });
}
......@@ -254,7 +262,8 @@ namespace Mall.Module.Miai
#region 圈子
var circleList = list.Where(x => x.Type == Common.Enum.MiAi.MessageTypeEnum.CircleLike || x.Type == Common.Enum.MiAi.MessageTypeEnum.CircleReply).ToList();
List<Model.Extend.Education.Rb_Education_Dynamic_Extend> CircleList = new List<Model.Extend.Education.Rb_Education_Dynamic_Extend>();
if (circleList.Any()) {
if (circleList.Any())
{
string CircleIds = string.Join(",", circleList.Select(x => x.SourceId).Distinct());
CircleList = education_DynamicRepository.GetMiAiAllDynamicList(new Model.Extend.Education.Rb_Education_Dynamic_Extend() { TenantId = demodel.TenantId, Ids = CircleIds });
}
......@@ -262,10 +271,15 @@ namespace Mall.Module.Miai
#region 查询创建人
string UserIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = UserIds });
var userList = member_UserRepository.GetList(new Model.Extend.User.RB_Member_User_Extend { TenantId = demodel.TenantId, UserIds = UserIds });
#endregion
foreach (var item in list) {
foreach (var item in list)
{
if (item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnroll || item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellEnrollCancel
|| item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellComment || item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellReply) {
|| item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellComment || item.Type == Common.Enum.MiAi.MessageTypeEnum.SpellReply)
{
item.ReplyContent = ActivityList.Where(x => x.Id == item.SourceId).Select(x => new
{
x.Id,
......@@ -286,7 +300,8 @@ namespace Mall.Module.Miai
x.CoverImg
});
}
if (item.Type == Common.Enum.MiAi.MessageTypeEnum.CircleLike || item.Type == Common.Enum.MiAi.MessageTypeEnum.CircleReply) {
if (item.Type == Common.Enum.MiAi.MessageTypeEnum.CircleLike || item.Type == Common.Enum.MiAi.MessageTypeEnum.CircleReply)
{
item.ReplyContent = CircleList.Where(x => x.Id == item.SourceId).Select(x => new
{
x.Id,
......@@ -301,10 +316,11 @@ namespace Mall.Module.Miai
});
}
var bmodel = blist.Where(x => x.UserId == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
item.Name = bmodel?.Name ?? "";
item.RealName = bmodel?.RealName ?? "";
item.Photo = bmodel?.Photo ?? "";
var bmodel = blist.Where(x => x.UserId == item.CreateBy ).FirstOrDefault();
var userModel= userList.Where(x => x.Id == item.CreateBy ).FirstOrDefault();
item.Name = userModel?.Name ?? "";
item.Photo = userModel?.Photo ?? "";
item.Sex = bmodel?.Sex ?? 0;
}
}
......@@ -560,7 +576,8 @@ namespace Mall.Module.Miai
int PeopleNum = ManENum + WoManENum;
//获取当前用户是否已报名
bool IsEnroll = false;
if (userInfo.UserId > 0){
if (userInfo.UserId > 0)
{
IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
}
//查询活动回复数量
......@@ -816,15 +833,27 @@ namespace Mall.Module.Miai
return list;
}
/// <summary>
/// 获取评论回复分页列表
/// 获取列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Miai_ActivityDiscuss_Extend> GetActivityReplyPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityDiscuss_Extend demodel)
public List<RB_Miai_ActivityDiscuss_Extend> GetActivityDiscussList(RB_Miai_ActivityDiscuss_Extend dmodel)
{
return miai_ActivityDiscussRepository.GetList(dmodel);
}
/// <summary>
/// 获取评论回复分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Miai_ActivityDiscuss_Extend> GetActivityReplyPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityDiscuss_Extend demodel)
{
var list = miai_ActivityDiscussRepository.GetPageList(pageIndex, pageSize, out count, demodel);
foreach (var qitem in list)
......@@ -890,7 +919,8 @@ namespace Mall.Module.Miai
UpdateDate = DateTime.Now
});
}
else {
else
{
//设置消息推送
miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
{
......@@ -1209,10 +1239,35 @@ namespace Mall.Module.Miai
/// <returns></returns>
public List<RB_MiAi_BaseInfo_Extend> GetBaseInfoList(RB_MiAi_BaseInfo_Extend where)
{
return miai_BaseInfoRepository.GetBaseInfoList(where);
var list = miai_BaseInfoRepository.GetBaseInfoList(where);
return list;
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="where"></param>
/// <returns></returns>
public RB_MiAi_BaseInfo_Extend GetBaseInfoModel(RB_MiAi_BaseInfo_Extend where)
{
var model = miai_BaseInfoRepository.GetBaseInfoList(where).FirstOrDefault();
if (model != null && (model.Province > 0 || model.City > 0 || model.District > 0))
{
string areaIds = (model.Province ?? 0) + "," + (model.City ?? 0) + "," + (model.District ?? 0);
var arealist = destinationRepository.GetDictvalueListForIds(areaIds);
model.PName = (model.Province.HasValue && model.Province.Value > 0) ? (arealist.Where(x => x.ID == model.Province).FirstOrDefault()?.Name ?? "") : "";
model.CName = (model.City.HasValue && model.City.Value > 0) ? (arealist.Where(x => x.ID == model.City).FirstOrDefault()?.Name ?? "") : "";
model.DName = (model.District.HasValue && model.District.Value > 0) ? (arealist.Where(x => x.ID == model.District).FirstOrDefault()?.Name ?? "") : "";
}
return model;
}
/// <summary>
/// 分页列表
/// </summary>
......@@ -1242,29 +1297,32 @@ namespace Mall.Module.Miai
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
//{ nameof(RB_MiAi_BaseInfo_Extend.Sex),model.Sex},
{ nameof(RB_MiAi_BaseInfo_Extend.Birthday),model.Birthday},
{ nameof(RB_MiAi_BaseInfo_Extend.Weight),model.Weight},
{ nameof(RB_MiAi_BaseInfo_Extend.Height),model.Height},
{ nameof(RB_MiAi_BaseInfo_Extend.EducationType),model.EducationType},
{ nameof(RB_MiAi_BaseInfo_Extend.City),model.City},
{ nameof(RB_MiAi_BaseInfo_Extend.Province),model.Province},
{ nameof(RB_MiAi_BaseInfo_Extend.District),model.District},
{ nameof(RB_MiAi_BaseInfo_Extend.Marriage),model.Marriage},
//{ nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName},
//{ nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
//{ nameof(RB_MiAi_BaseInfo_Extend.IDCard),model.IDCard},
//{ nameof(RB_MiAi_BaseInfo_Extend.IDCardBack),model.IDCardBack},
{ nameof(RB_MiAi_BaseInfo_Extend.HuKou),model.HuKou},
{ nameof(RB_MiAi_BaseInfo_Extend.NativePlace),model.NativePlace},
{ nameof(RB_MiAi_BaseInfo_Extend.HouseInfo),model.HouseInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.SchoolInfo),model.SchoolInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.YearMoney),model.YearMoney},
{ nameof(RB_MiAi_BaseInfo_Extend.Job),model.Job},
{ nameof(RB_MiAi_BaseInfo_Extend.OtherPople),model.OtherPople},
{ nameof(RB_MiAi_BaseInfo_Extend.MajorInfo),model.MajorInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.CarInfo),model.CarInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.FatherInfo),model.FatherInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.MotherInfo),model.MotherInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.About),model.About},
{ nameof(RB_MiAi_BaseInfo_Extend.WorkUnit),model.WorkUnit},
{ nameof(RB_MiAi_BaseInfo_Extend.YearMoney),model.YearMoney},
{ nameof(RB_MiAi_BaseInfo_Extend.HouseInfo),model.HouseInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.FamilyInfo),model.FamilyInfo},
{ nameof(RB_MiAi_BaseInfo_Extend.Hobby),model.Hobby},
{ nameof(RB_MiAi_BaseInfo_Extend.LikeFood),model.LikeFood},
{ nameof(RB_MiAi_BaseInfo_Extend.LikeBook),model.LikeBook},
{ nameof(RB_MiAi_BaseInfo_Extend.LikeTV),model.LikeTV},
{ nameof(RB_MiAi_BaseInfo_Extend.LikeSong),model.LikeSong},
{ nameof(RB_MiAi_BaseInfo_Extend.IdealLove),model.IdealLove},
{ nameof(RB_MiAi_BaseInfo_Extend.Album),model.Album}
{ nameof(RB_MiAi_BaseInfo_Extend.LoveTalk),model.LoveTalk},
{ nameof(RB_MiAi_BaseInfo_Extend.SingleReason),model.SingleReason},
{ nameof(RB_MiAi_BaseInfo_Extend.About),model.About},
{ nameof(RB_MiAi_BaseInfo_Extend.HopeYou),model.HopeYou},
{ nameof(RB_MiAi_BaseInfo_Extend.Album),model.Album},
{ nameof(RB_MiAi_BaseInfo_Extend.Appointment),model.Appointment},
{ nameof(RB_MiAi_BaseInfo_Extend.AppointmentAddress),model.AppointmentAddress}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
......
Mall.Module.Property/PropertyModule.cs
View file @ 854f1d25
......@@ -1249,7 +1249,8 @@ namespace Mall.Module.Property
StockOutId = item.StockOutId,
TenantId = tenantId,
WarehouseId = item.WarehouseId,
OrderNo = item.OrderNo
OrderNo = item.OrderNo,
ValidityIds = item.ValidityIds
}, trans);
IList.Add(Id);
if (!string.IsNullOrEmpty(item.ValidityIds)) {
......
Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs
View file @ 854f1d25
......@@ -78,10 +78,7 @@ namespace Mall.Repository.Miai
{
sb.AppendFormat(" and a.UserId={0}", where.UserId);
}
if (!string.IsNullOrWhiteSpace(where.RealName))
{
sb.AppendFormat(" and a.RealName like'%{0}%'", where.RealName);
}
if (!string.IsNullOrWhiteSpace(where.Name))
{
sb.AppendFormat(" and b.Name like'%{0}%'", where.Name);
......
Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs
View file @ 854f1d25
......@@ -89,6 +89,10 @@ where {where} order by d.Id desc";
{
where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}";
}
if (dmodel.Id > 0)
{
where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.Id)} ={dmodel.Id}";
}
if (dmodel.ParentId > 0)
{
where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
......
Mall.Repository/Miai/RB_Miai_DatingRepository.cs
View file @ 854f1d25
......@@ -37,14 +37,12 @@ namespace Mall.Repository.Miai
}
if (!string.IsNullOrEmpty(dmodel.UserName))
{
where += $@" and (b1.RealName like '%{dmodel.UserName}%' or b2.RealName like '%{dmodel.UserName}%')";
where += $@" and (u1.`Name` like '%{dmodel.UserName}%' or u2..`Name` like '%{dmodel.UserName}%')";
}
string sql = $@"select d.*,b1.RealName as ManName,u1.Photo as ManPhoto,b2.RealName as WoManName,u2.Photo as WoManPhoto from RB_Miai_Dating d
string sql = $@"select d.*,u1.`Name` as ManName,u1.Photo as ManPhoto,u2.`Name` as WoManName,u2.Photo as WoManPhoto from RB_Miai_Dating d
left join rb_member_user u1 on d.ManId = u1.Id
left join rb_miai_baseinfo b1 on b1.UserId = d.ManId
left join rb_member_user u2 on d.WoManId = u2.Id
left join rb_miai_baseinfo b2 on b2.UserId = d.WoManId
where {where} order by d.Id desc";
return GetPage<RB_Miai_Dating_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
}
......
Mall.Repository/Miai/RB_Miai_MessageRepository.cs
View file @ 854f1d25
......@@ -131,15 +131,15 @@ namespace Mall.Repository.Miai
{
//谁看过我的
string sql = $@" SELECT
(SELECT COUNT(0) FROM rb_miai_message WHERE `Status` =0 and UserId = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59') AS TCount,
(SELECT COUNT(0) FROM (SELECT CreateBy FROM rb_miai_message WHERE `Status` =0 and UserId = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' GROUP BY CreateBy)t) AS PeopleNum ";
(SELECT COUNT(0) FROM rb_miai_message WHERE Type in(7,10) and UserId = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59') AS TCount,
(SELECT COUNT(0) FROM (SELECT CreateBy FROM rb_miai_message WHERE Type in(7,10) and UserId = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' GROUP BY CreateBy)t) AS PeopleNum ";
return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
}
else {
//我看过谁的
string sql = $@" SELECT
(SELECT COUNT(0) FROM rb_miai_message WHERE `Status` =0 and CreateBy = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59') AS TCount,
(SELECT COUNT(0) FROM (SELECT UserId FROM rb_miai_message WHERE `Status` =0 and CreateBy = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' GROUP BY UserId)t) AS PeopleNum ";
(SELECT COUNT(0) FROM rb_miai_message WHERE Type in(7,10) and CreateBy = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59') AS TCount,
(SELECT COUNT(0) FROM (SELECT UserId FROM rb_miai_message WHERE Type in(7,10) and CreateBy = {userId} and CreateDate >= '{DateTime.Now.ToString("yyyy-MM-dd")}' and CreateDate <= '{DateTime.Now.ToString("yyyy-MM-dd")} 23:59:59' GROUP BY UserId)t) AS PeopleNum ";
return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
}
}
......
Mall.Repository/User/RB_MiniProgram_FenXiaoPosterRepository.cs
View file @ 854f1d25
......@@ -44,3 +44,4 @@ namespace Mall.Repository.User
}
}
}
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
View file @ 854f1d25
......@@ -320,6 +320,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{
return ApiResult.Failed("请选择您需要购买的会员等级");
}
if (demodel.GradeId.Value == 0)
{
return ApiResult.Failed("请选择您需要购买的会员等级");
}
//查询用户的openId
var userModel = userModule.GetMemberUserEntityModule(new RB_Member_User_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, Id = userInfo.UserId });
......@@ -328,16 +332,21 @@ namespace Mall.WebApi.Controllers.AppletWeChat
return ApiResult.Failed("用户不存在");
}
string payGoodsName = "会员等级购买";
var rechargeRulesModel = userModule.GetMemberGradeList(new RB_Member_Grade_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, Grade = demodel.GradeId }).FirstOrDefault();
var rechargeRulesModel = userModule.GetMemberGradeList(new RB_Member_Grade_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, Id = demodel.GradeId ?? 0 }).FirstOrDefault();
if (rechargeRulesModel == null)
{
return ApiResult.Failed("您选择的会员等级不存在");
}
if (userModel.MemberGrade >= rechargeRulesModel.Grade)
if (userModel.MemberGrade != 0)
{
return ApiResult.Failed("购买会员等级低于您当前会员等级");
return ApiResult.Failed("只有普通会员可以购买会员等级");
}
//if (userModel.MemberGrade >= rechargeRulesModel.Grade)
//{
// return ApiResult.Failed("购买会员等级低于您当前会员等级");
//}
if (rechargeRulesModel.IsMemberBuy == 1)
{
if (rechargeRulesModel.MemberBuyMoney != demodel.Money)
......@@ -590,6 +599,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
pointModule.UpdatePointOrder(demodel);
return ApiResult.Success("");
}
public ApiResult UpdateDepositBuy()
{
var request = RequestParm;
......@@ -601,6 +611,20 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public ApiResult UpdateMemberBuy()
{
var request = RequestParm;
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(request.msg.ToString());
userCommonModule.UpdateMemberBuy(demodel.UserId ?? 0, demodel.OrderId, demodel.OrderNo, "s1111111111111", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, (demodel.Income ?? 0), System.DateTime.Now);
return ApiResult.Success("");
}
public ApiResult UpdatePointOrder()
{
var request = RequestParm;
RB_Point_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Point_Order_Extend>(request.msg.ToString());
pointModule.UpdatePointOrder(demodel);
return ApiResult.Success("");
}
#endregion
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 854f1d25
......@@ -1441,8 +1441,6 @@ namespace Mall.WebApi.Controllers
}
else if (miAiUserItem.addUserType == 2)
{
long rowCount = 0;
var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
{
......
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @ 854f1d25
......@@ -309,6 +309,31 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取活动评论分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public ApiResult GetActivityDiscussCount()
{
var parms = RequestParm;
RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
if (demodel.ActivityId <= 0)
{
return ApiResult.ParamIsNull("请传递活动id");
}
demodel.MallBaseId = parms.MallBaseId;
var list = miaiModule.GetActivityDiscussList(demodel);
return ApiResult.Success("", new { totalCount = list.Count() });
}
/// <summary>
/// 获取活动回复分页列表
/// </summary>
......@@ -639,7 +664,6 @@ namespace Mall.WebApi.Controllers.MallBase
x.SourceId,
x.Content,
x.Name,
x.RealName,
x.Photo,
x.Sex,
x.ReplyContent,
......@@ -730,7 +754,6 @@ namespace Mall.WebApi.Controllers.MallBase
TypeName = x.Type.GetEnumName(),
UserId = demodel.VsisitorType == 1 ? x.CreateBy : x.UserId,
UserName = x.Name,
x.RealName,
x.Photo,
x.Sex,
x.Status,
......@@ -865,22 +888,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.Failed("请选择婚姻状况");
}
if (string.IsNullOrWhiteSpace(baseInfo.IDCardNo))
{
return ApiResult.Failed("请填写身份证号");
}
if (string.IsNullOrWhiteSpace(baseInfo.RealName))
{
return ApiResult.Failed("请填写姓名");
}
if (string.IsNullOrWhiteSpace(baseInfo.IDCard))
{
return ApiResult.Failed("请上传身份证头像面");
}
if (string.IsNullOrWhiteSpace(baseInfo.IDCardBack))
{
return ApiResult.Failed("请上传身份证国徽面");
}
if (baseInfo.AlbumList != null && baseInfo.AlbumList.Any())
{
baseInfo.Album = JsonConvert.SerializeObject(baseInfo.AlbumList);
......@@ -973,7 +981,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = RequestParm.TenantId, MallBaseId = RequestParm.MallBaseId }).FirstOrDefault();
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = RequestParm.TenantId, MallBaseId = RequestParm.MallBaseId });
......@@ -1007,33 +1015,42 @@ namespace Mall.WebApi.Controllers.MallBase
oldUserInfo.Photo,
IsAttestation,
IsFollow = isFollow,
Sex = oldBaseInfo?.Sex ?? 0,
IDCardNo = oldBaseInfo?.IDCardNo ?? "",
RealName = oldBaseInfo?.RealName ?? "",
IDCard = oldBaseInfo?.IDCard ?? "",
IDCardBack = oldBaseInfo?.IDCardBack ?? "",
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
EducationType = oldBaseInfo.EducationType ?? 0,
EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
Marriage = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
EducationType = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo.YearMoney ?? "",
HuKou = oldBaseInfo.HuKou ?? "",
NativePlace = oldBaseInfo.NativePlace ?? "",
CName = oldBaseInfo.CName ?? "",
DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
HouseInfo = oldBaseInfo.HouseInfo ?? "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
MotherInfo = oldBaseInfo.MotherInfo ?? "",
FatherInfo = oldBaseInfo.FatherInfo ?? "",
Job = oldBaseInfo.Job ?? "",
OtherPople = oldBaseInfo.OtherPople ?? "",
MajorInfo = oldBaseInfo.MajorInfo ?? "",
CarInfo = oldBaseInfo.CarInfo ?? "",
About = oldBaseInfo.About ?? "",
FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
Hobby = oldBaseInfo?.Hobby ?? "",
LikeFood = oldBaseInfo?.LikeFood ?? "",
LikeBook = oldBaseInfo.LikeBook ?? "",
LikeTV = oldBaseInfo.LikeTV ?? "",
LikeSong = oldBaseInfo.LikeSong ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList
};
return ApiResult.Success("", result);
......@@ -1046,6 +1063,102 @@ namespace Mall.WebApi.Controllers.MallBase
/// <summary>
/// 获取会员基础信息
/// </summary>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public ApiResult GetBaseInfoPageList()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
RB_MiAi_BaseInfo_Extend demodel = JsonConvert.DeserializeObject<RB_MiAi_BaseInfo_Extend>(RequestParm.msg.ToString());
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.UserId = parms.UserId;
int Sex = 0;
int Age = 0;
if (demodel.UserId > 0)//说明用户登录了的
{
//查看用户的
var baseInfo = miaiModule.GetBaseInfoList(new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = demodel.UserId }).FirstOrDefault();
if (baseInfo != null)
{
Sex = baseInfo.Sex;
if (!string.IsNullOrWhiteSpace(baseInfo.Birthday))
{
try
{
Age = Convert.ToInt32(Common.Plugin.StringHelper.GetAge(baseInfo.Birthday));
}
catch (Exception)
{
Age = 0;
}
}
}
if (demodel.Sex > 0)
{
demodel.Sex = demodel.Sex == 1 ? 2 : (demodel.Sex == 2 ? 1 : 0);
}
}
var list = miaiModule.GetFirstBaseInfoPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
List<Model.Extend.MarketingCenter.miaiUserDetail> newGoodsList = new List<Model.Extend.MarketingCenter.miaiUserDetail>();
foreach (var tempGood in list)
{
var lastItem = new Model.Extend.MarketingCenter.miaiUserDetail();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if (tempGood != null && tempGood.Id > 0)
{
lastItem.id = tempGood.UserId;
lastItem.name = tempGood.Name;
lastItem.Photo = tempGood.Photo;
lastItem.SexStr = tempGood.Sex == 1 ? "男" : "女";
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) : "";
if (demodel.UserId > 0 && Age > 0)
{
if (Age == tempGood.Age)
{
lastItem.MatchingRate = 90;
}
else if (Age > tempGood.Age)
{
lastItem.MatchingRate = ((Age - tempGood.Age) + 90) > 100 ? 100 : ((Age - tempGood.Age) + 90);
}
else if (Age < tempGood.Age)
{
lastItem.MatchingRate = (90 - (tempGood.Age - Age)) < 0 ? 0 : (90 - (tempGood.Age - Age));
}
else
{
lastItem.MatchingRate = 0;
}
}
else
{
lastItem.MatchingRate = 0;
}
lastItem.Score = 0;
lastItem.Album = tempGood.Album;
if (!string.IsNullOrWhiteSpace(lastItem.Album))
{
lastItem.AlbumList = JsonConvert.DeserializeObject<List<string>>(lastItem.Album);
}
newGoodsList.Add(lastItem);
}
}
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = newGoodsList;
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取教育枚举
/// </summary>
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 854f1d25
......@@ -570,7 +570,7 @@ namespace Mall.WebApi.Controllers.MallBase
// var userInfo = AppletUserInfo;
int userId = parm.GetInt("UserId");
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = UserInfo.TenantId, MallBaseId = UserInfo.MallBaseId }).FirstOrDefault();
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = UserInfo.TenantId, MallBaseId = UserInfo.MallBaseId });
if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{
oldBaseInfo.AlbumList = new List<string>();
......@@ -580,33 +580,42 @@ namespace Mall.WebApi.Controllers.MallBase
}
var result = new
{
oldBaseInfo.Sex,
oldBaseInfo.IDCardNo,
oldBaseInfo.RealName,
oldBaseInfo.IDCard,
oldBaseInfo.IDCardBack,
SexStr = oldBaseInfo.Sex == 1 ? "男" : "女",
oldBaseInfo.Birthday,
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "",
Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo?.Height,
oldBaseInfo?.Weight,
EducationType = oldBaseInfo.EducationType ?? 0,
EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
oldBaseInfo.Height,
oldBaseInfo.Weight,
Marriage = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
EducationType = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
Marriage = oldBaseInfo.Marriage ?? 0,
Job = oldBaseInfo.Job ?? "",
WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo.YearMoney ?? "",
HuKou = oldBaseInfo.HuKou ?? "",
NativePlace = oldBaseInfo.NativePlace ?? "",
CName = oldBaseInfo.CName ?? "",
DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
HouseInfo = oldBaseInfo.HouseInfo ?? "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
MotherInfo = oldBaseInfo.MotherInfo ?? "",
FatherInfo = oldBaseInfo.FatherInfo ?? "",
Job = oldBaseInfo.Job ?? "",
OtherPople = oldBaseInfo.OtherPople ?? "",
MajorInfo = oldBaseInfo.MajorInfo ?? "",
CarInfo = oldBaseInfo.CarInfo ?? "",
About = oldBaseInfo.About ?? "",
FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
Hobby = oldBaseInfo?.Hobby ?? "",
LikeFood = oldBaseInfo?.LikeFood ?? "",
LikeBook = oldBaseInfo.LikeBook ?? "",
LikeTV = oldBaseInfo.LikeTV ?? "",
LikeSong = oldBaseInfo.LikeSong ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList
};
return ApiResult.Success("", result);
......@@ -633,7 +642,6 @@ namespace Mall.WebApi.Controllers.MallBase
x.Name,
x.UserId,
x.Id,
x.RealName,
x.Photo,
SexStr = x.Sex == 1 ? "男" : (x.Sex == 2 ? "女" : ""),
x.Birthday,
......
Mall.WebApi/Mall.WebApi.csproj.user
View file @ 854f1d25
......@@ -9,7 +9,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>E:\Work\Mall_Api\Mall.WebApi\Properties\PublishProfiles\mallapi.oytour.com.pubxml</NameOfLastUsedPublishProfile>
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
</Project>
\ No newline at end of file
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