Skip to content

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

提交代码

parent 20d25d83
Expand all Show whitespace changes
Inline Side-by-side
Showing with 419 additions and 161 deletions
Mall.Model/Entity/Miai/RB_MiAi_BaseInfo.cs
View file @ 577dec1b
...@@ -26,114 +26,143 @@ namespace Mall.Model.Entity.Miai ...@@ -26,114 +26,143 @@ namespace Mall.Model.Entity.Miai
/// </summary> /// </summary>
public int UserId { get; set; } public int UserId { get; set; }
/// <summary> /// <summary>
/// 性别1-男，2-女 /// 性别1-男，2-女
/// </summary> /// </summary>
public int Sex { get; set; } public int Sex { get; set; }
/// <summary> /// <summary>
/// 生日 /// 生日
/// </summary> /// </summary>
public string Birthday { get; set; } public string Birthday { get; set; }
/// <summary>
/// 体重
/// </summary>
public decimal Weight { get; set; }
/// <summary> /// <summary>
/// 身高 /// 身高
/// </summary> /// </summary>
public decimal Height { get; set; } public decimal Height { get; set; }
/// <summary>
/// 体重
/// </summary>
public decimal Weight { get; set; }
/// <summary> /// <summary>
/// 学历 /// 学历
/// </summary> /// </summary>
public EducationTypeEnum? EducationType { get; set; } public EducationTypeEnum? EducationType { get; set; }
/// <summary> /// <summary>
/// 婚姻 /// 毕业院校
/// </summary> /// </summary>
public MarriageEnum? Marriage { get; set; } public string SchoolInfo { get; set; }
/// <summary> /// <summary>
/// 名称 /// 婚姻
/// </summary> /// </summary>
public string RealName { get; set; } public MarriageEnum? Marriage { get; set; }
/// <summary> /// <summary>
/// 身份证号 /// 职务
/// </summary> /// </summary>
public string IDCardNo { get; set; } public string Job { get; set; }
/// <summary> /// <summary>
/// 身份证号 /// 工作单位
/// </summary> /// </summary>
public string IDCard { get; set; } public string WorkUnit { get; set; }
/// <summary> /// <summary>
/// 身份证反面 /// 年收入
/// </summary> /// </summary>
public string IDCardBack { get; set; } public string YearMoney { get; set; }
/// <summary> /// <summary>
/// 户口 /// 国家
/// </summary> /// </summary>
public string HuKou { get; set; } public int? Country
{
get;
set;
}
/// <summary>
/// 省
/// </summary>
public int? Province
{
get;
set;
}
/// <summary>
/// 市
/// </summary>
public int? City
{
get;
set;
}
/// <summary> /// <summary>
/// 籍贯 /// 区
/// </summary> /// </summary>
public string NativePlace { get; set; } public int? District
{
get;
set;
}
/// <summary> /// <summary>
/// 房屋信息 /// 资产
/// </summary> /// </summary>
public string HouseInfo { get; set; } public string HouseInfo { get; set; }
/// <summary> /// <summary>
/// 学校信息 /// 家庭背景
/// </summary> /// </summary>
public string SchoolInfo { get; set; } public string FamilyInfo { get; set; }
/// <summary> /// <summary>
/// 年收入 /// 业余爱好
/// </summary> /// </summary>
public string YearMoney { get; set; } public string Hobby { get; set; }
/// <summary> /// <summary>
/// 职务 /// 喜欢的食物
/// </summary> /// </summary>
public string Job { get; set; } public string LikeFood { get; set; }
/// <summary> /// <summary>
/// 其他兄弟姐妹 /// 喜欢的书
/// </summary> /// </summary>
public string OtherPople { get; set; } public string LikeBook { get; set; }
/// <summary> /// <summary>
/// 专业 /// 喜欢的电影和电视剧
/// </summary> /// </summary>
public string MajorInfo { get; set; } public string LikeTV { get; set; }
/// <summary> /// <summary>
/// 车辆信息 /// 喜欢的情歌
/// </summary> /// </summary>
public string CarInfo { get; set; } public string LikeSong { get; set; }
/// <summary> /// <summary>
/// 父亲工作信息 /// 欣赏哪对名人的爱情，原因是什么
/// </summary> /// </summary>
public string FatherInfo { get; set; } public string IdealLove { get; set; }
/// <summary> /// <summary>
/// 母亲工作信息 /// 情话
/// </summary>
public string LoveTalk { get; set; }
/// <summary>
/// 单身原因
/// </summary> /// </summary>
public string MotherInfo { get; set; } public string SingleReason { get; set; }
/// <summary> /// <summary>
/// 关于 /// 关于
...@@ -141,9 +170,9 @@ namespace Mall.Model.Entity.Miai ...@@ -141,9 +170,9 @@ namespace Mall.Model.Entity.Miai
public string About { get; set; } public string About { get; set; }
/// <summary> /// <summary>
/// 理想爱情 /// 希望您是
/// </summary> /// </summary>
public string IdealLove { get; set; } public string HopeYou { get; set; }
/// <summary> /// <summary>
...@@ -151,6 +180,21 @@ namespace Mall.Model.Entity.Miai ...@@ -151,6 +180,21 @@ namespace Mall.Model.Entity.Miai
/// </summary> /// </summary>
public string Album { get; set; } public string Album { get; set; }
/// <summary>
/// 约会时间
/// </summary>
public string Appointment { get; set; }
/// <summary>
/// 约会地点
/// </summary>
public string AppointmentAddress { get; set; }
/// <summary> /// <summary>
/// 浏览数 /// 浏览数
/// </summary> /// </summary>
......
Mall.Model/Extend/Miai/RB_MiAi_BaseInfo_Extend.cs
View file @ 577dec1b
...@@ -43,5 +43,19 @@ namespace Mall.Model.Extend.Miai ...@@ -43,5 +43,19 @@ namespace Mall.Model.Extend.Miai
/// </summary> /// </summary>
public decimal FollowRate { get; set; } 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 @ 577dec1b
...@@ -44,7 +44,7 @@ namespace Mall.Model.Extend.Miai ...@@ -44,7 +44,7 @@ namespace Mall.Model.Extend.Miai
/// <summary> /// <summary>
/// 真实名称 /// 真实名称
/// </summary> /// </summary>
public string RealName { get; set; } // public string RealName { get; set; }
/// <summary> /// <summary>
/// 头像 /// 头像
/// </summary> /// </summary>
......
Mall.Module.Miai/MiaiModule.cs
View file @ 577dec1b
This diff is collapsed.
Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs
View file @ 577dec1b
...@@ -78,10 +78,7 @@ namespace Mall.Repository.Miai ...@@ -78,10 +78,7 @@ namespace Mall.Repository.Miai
{ {
sb.AppendFormat(" and a.UserId={0}", where.UserId); 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)) if (!string.IsNullOrWhiteSpace(where.Name))
{ {
sb.AppendFormat(" and b.Name like'%{0}%'", where.Name); sb.AppendFormat(" and b.Name like'%{0}%'", where.Name);
......
Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs
View file @ 577dec1b
...@@ -89,6 +89,10 @@ where {where} order by d.Id desc"; ...@@ -89,6 +89,10 @@ where {where} order by d.Id desc";
{ {
where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}"; 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) if (dmodel.ParentId > 0)
{ {
where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}"; where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
......
Mall.Repository/Miai/RB_Miai_MessageRepository.cs
View file @ 577dec1b
...@@ -131,15 +131,15 @@ namespace Mall.Repository.Miai ...@@ -131,15 +131,15 @@ namespace Mall.Repository.Miai
{ {
//谁看过我的 //谁看过我的
string sql = $@" SELECT 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 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 `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 (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(); return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
} }
else { else {
//我看过谁的 //我看过谁的
string sql = $@" SELECT 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 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 `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 (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(); return Get<RB_Miai_Message_Extend>(sql).FirstOrDefault();
} }
} }
......
Mall.Repository/User/RB_MiniProgram_FenXiaoPosterRepository.cs
View file @ 577dec1b
...@@ -44,3 +44,4 @@ namespace Mall.Repository.User ...@@ -44,3 +44,4 @@ namespace Mall.Repository.User
} }
} }
} }
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
View file @ 577dec1b
...@@ -320,6 +320,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -320,6 +320,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{ {
return ApiResult.Failed("请选择您需要购买的会员等级"); return ApiResult.Failed("请选择您需要购买的会员等级");
} }
if (demodel.GradeId.Value == 0)
{
return ApiResult.Failed("请选择您需要购买的会员等级");
}
//查询用户的openId //查询用户的openId
var userModel = userModule.GetMemberUserEntityModule(new RB_Member_User_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, Id = userInfo.UserId }); 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 ...@@ -328,16 +332,21 @@ namespace Mall.WebApi.Controllers.AppletWeChat
return ApiResult.Failed("用户不存在"); return ApiResult.Failed("用户不存在");
} }
string payGoodsName = "会员等级购买"; 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) if (rechargeRulesModel == null)
{ {
return ApiResult.Failed("您选择的会员等级不存在"); return ApiResult.Failed("您选择的会员等级不存在");
} }
if (userModel.MemberGrade != 0)
if (userModel.MemberGrade >= rechargeRulesModel.Grade)
{ {
return ApiResult.Failed("购买会员等级低于您当前会员等级"); return ApiResult.Failed("只有普通会员可以购买会员等级");
} }
//if (userModel.MemberGrade >= rechargeRulesModel.Grade)
//{
// return ApiResult.Failed("购买会员等级低于您当前会员等级");
//}
if (rechargeRulesModel.IsMemberBuy == 1) if (rechargeRulesModel.IsMemberBuy == 1)
{ {
if (rechargeRulesModel.MemberBuyMoney != demodel.Money) if (rechargeRulesModel.MemberBuyMoney != demodel.Money)
...@@ -590,6 +599,23 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -590,6 +599,23 @@ namespace Mall.WebApi.Controllers.AppletWeChat
pointModule.UpdatePointOrder(demodel); pointModule.UpdatePointOrder(demodel);
return ApiResult.Success(""); return ApiResult.Success("");
} }
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 #endregion
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 577dec1b
...@@ -1441,8 +1441,6 @@ namespace Mall.WebApi.Controllers ...@@ -1441,8 +1441,6 @@ namespace Mall.WebApi.Controllers
} }
else if (miAiUserItem.addUserType == 2) else if (miAiUserItem.addUserType == 2)
{ {
long rowCount = 0; long rowCount = 0;
var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
{ {
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 577dec1b
...@@ -570,7 +570,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -570,7 +570,7 @@ namespace Mall.WebApi.Controllers.MallBase
// var userInfo = AppletUserInfo; // var userInfo = AppletUserInfo;
int userId = parm.GetInt("UserId"); 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) if (oldBaseInfo != null && oldBaseInfo.Id > 0)
{ {
oldBaseInfo.AlbumList = new List<string>(); oldBaseInfo.AlbumList = new List<string>();
...@@ -580,33 +580,42 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -580,33 +580,42 @@ namespace Mall.WebApi.Controllers.MallBase
} }
var result = new var result = new
{ {
oldBaseInfo.Sex, SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
oldBaseInfo.IDCardNo, Birthday = oldBaseInfo.Birthday ?? "",
oldBaseInfo.RealName, Sex = oldBaseInfo?.Sex ?? 0,
oldBaseInfo.IDCard, oldBaseInfo?.Height,
oldBaseInfo.IDCardBack, oldBaseInfo?.Weight,
SexStr = oldBaseInfo.Sex == 1 ? "男" : "女", EducationType = oldBaseInfo.EducationType ?? 0,
oldBaseInfo.Birthday, EducationTypeStr = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "",
Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪 Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖 ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座 ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
oldBaseInfo.Height, MarriageStr = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
oldBaseInfo.Weight, Marriage = oldBaseInfo.Marriage ?? 0,
Marriage = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "", Job = oldBaseInfo.Job ?? "",
EducationType = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "", WorkUnit = oldBaseInfo?.WorkUnit ?? "",
YearMoney = oldBaseInfo.YearMoney ?? "", YearMoney = oldBaseInfo.YearMoney ?? "",
HuKou = oldBaseInfo.HuKou ?? "", CName = oldBaseInfo.CName ?? "",
NativePlace = oldBaseInfo.NativePlace ?? "", DName = oldBaseInfo.DName ?? "",
PName = oldBaseInfo.PName ?? "",
Province = oldBaseInfo.Province ?? 0,
City = oldBaseInfo.City ?? 0,
District = oldBaseInfo.District ?? 0,
HouseInfo = oldBaseInfo.HouseInfo ?? "", HouseInfo = oldBaseInfo.HouseInfo ?? "",
SchoolInfo = oldBaseInfo.SchoolInfo ?? "", FamilyInfo = oldBaseInfo?.FamilyInfo ?? "",
MotherInfo = oldBaseInfo.MotherInfo ?? "", Hobby = oldBaseInfo?.Hobby ?? "",
FatherInfo = oldBaseInfo.FatherInfo ?? "", LikeFood = oldBaseInfo?.LikeFood ?? "",
Job = oldBaseInfo.Job ?? "", LikeBook = oldBaseInfo.LikeBook ?? "",
OtherPople = oldBaseInfo.OtherPople ?? "", LikeTV = oldBaseInfo.LikeTV ?? "",
MajorInfo = oldBaseInfo.MajorInfo ?? "", LikeSong = oldBaseInfo.LikeSong ?? "",
CarInfo = oldBaseInfo.CarInfo ?? "",
About = oldBaseInfo.About ?? "",
IdealLove = oldBaseInfo.IdealLove ?? "", IdealLove = oldBaseInfo.IdealLove ?? "",
LoveTalk = oldBaseInfo.LoveTalk ?? "",
SingleReason = oldBaseInfo.SingleReason ?? "",
HopeYou = oldBaseInfo.HopeYou ?? "",
About = oldBaseInfo.About ?? "",
Appointment = oldBaseInfo.Appointment ?? "",
AppointmentAddress = oldBaseInfo.AppointmentAddress ?? "",
oldBaseInfo.AlbumList oldBaseInfo.AlbumList
}; };
return ApiResult.Success("", result); return ApiResult.Success("", result);
...@@ -633,7 +642,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -633,7 +642,6 @@ namespace Mall.WebApi.Controllers.MallBase
x.Name, x.Name,
x.UserId, x.UserId,
x.Id, x.Id,
x.RealName,
x.Photo, x.Photo,
SexStr = x.Sex == 1 ? "男" : (x.Sex == 2 ? "女" : ""), SexStr = x.Sex == 1 ? "男" : (x.Sex == 2 ? "女" : ""),
x.Birthday, x.Birthday,
......
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