Commit 980e1a6f authored by 吴春's avatar 吴春

提交代码主要是每日随机

parent 09359eef
...@@ -21,6 +21,11 @@ namespace Mall.Model.Entity.Miai ...@@ -21,6 +21,11 @@ namespace Mall.Model.Entity.Miai
get; get;
set; set;
} }
/// <summary>
/// 微信号
/// </summary>
public string WechatNo { get; set; }
/// <summary> /// <summary>
/// 会员id /// 会员id
/// </summary> /// </summary>
...@@ -126,6 +131,30 @@ namespace Mall.Model.Entity.Miai ...@@ -126,6 +131,30 @@ namespace Mall.Model.Entity.Miai
} }
/// <summary>
/// 定位省
/// </summary>
public int? DWProvince
{
get;
set;
}
/// <summary>
/// 定位市
/// </summary>
public int? DWCity
{
get;
set;
}
/// <summary>
/// 定位区
/// </summary>
public int? DWDistrict
{
get;
set;
}
......
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Enum.MiAi;
using VT.FW.DB;
namespace Mall.Model.Entity.Miai
{
/// <summary>
/// 查询相亲会员每日随机基础资料
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_MiAi_BaseInfoDayQuery
{
/// <summary>
/// 编号
/// </summary>
public int Id
{
get;
set;
}
/// <summary>
/// 会员id
/// </summary>
public int UserId { get; set; }
/// <summary>
/// 商户号Id
/// </summary>
public int? TenantId
{
get;
set;
}
/// <summary>
/// 小程序Id
/// </summary>
public int? MallBaseId
{
get;
set;
}
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateDate
{
get;
set;
}
/// <summary>
/// 删除状态
/// </summary>
public int? Status
{
get;
set;
}
/// <summary>
/// 性别1-男,2-女
/// </summary>
public int Sex { get; set; }
/// <summary>
/// 每日的基础会员id
/// </summary>
public string BaseInfoIds { get; set; }
}
}
...@@ -3049,7 +3049,7 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -3049,7 +3049,7 @@ namespace Mall.Model.Extend.MarketingCenter
/// <summary> /// <summary>
/// 用户添加方式(0-自定义,1-按照匹配度【规则未确定】,2-按照热度【被浏览数据,被关注数据】,3-按照最新) /// 用户添加方式(0-自定义,1-按照匹配度【规则未确定】,2-按照热度【被浏览数据,被关注数据】,3-按照最新,4-每日随机
/// </summary> /// </summary>
public int addUserType { get; set; } public int addUserType { get; set; }
......
...@@ -23,6 +23,11 @@ namespace Mall.Model.Extend.Miai ...@@ -23,6 +23,11 @@ namespace Mall.Model.Extend.Miai
/// </summary> /// </summary>
public string Photo { get; set; } public string Photo { get; set; }
/// <summary>
/// 手机号码
/// </summary>
public string Moblie { get; set; }
/// <summary> /// <summary>
/// 指定用户id /// 指定用户id
/// </summary> /// </summary>
...@@ -58,6 +63,20 @@ namespace Mall.Model.Extend.Miai ...@@ -58,6 +63,20 @@ namespace Mall.Model.Extend.Miai
/// </summary> /// </summary>
public string DName { get; set; } public string DName { get; set; }
/// <summary>
/// 定位省名称
/// </summary>
public string DWPName { get; set; }
/// <summary>
/// 定位市名称
/// </summary>
public string DWCName { get; set; }
/// <summary>
/// 定位区名称
/// </summary>
public string DWDName { get; set; }
/// <summary> /// <summary>
/// 车 /// 车
/// </summary> /// </summary>
......
...@@ -185,6 +185,7 @@ namespace Mall.Model.Extend.User ...@@ -185,6 +185,7 @@ namespace Mall.Model.Extend.User
public class RB_Member_MiaiUser_Extend : RB_Member_User public class RB_Member_MiaiUser_Extend : RB_Member_User
{ {
public string WechatNo { get; set; }
/// <summary> /// <summary>
/// 导出枚举ids /// 导出枚举ids
/// </summary> /// </summary>
......
...@@ -82,6 +82,8 @@ namespace Mall.Module.Miai ...@@ -82,6 +82,8 @@ namespace Mall.Module.Miai
private readonly RB_MiAi_BaseInfoQueryRepository miAiBaseInfoQueryRepository = new RB_MiAi_BaseInfoQueryRepository(); private readonly RB_MiAi_BaseInfoQueryRepository miAiBaseInfoQueryRepository = new RB_MiAi_BaseInfoQueryRepository();
private readonly RB_MiAi_BaseInfoDayQueryRepository miAiBaseInfoDayQueryRepository = new RB_MiAi_BaseInfoDayQueryRepository();
#region 会员信息 #region 会员信息
/// <summary> /// <summary>
...@@ -188,7 +190,7 @@ namespace Mall.Module.Miai ...@@ -188,7 +190,7 @@ namespace Mall.Module.Miai
userIds = string.Join(",", list.Select(x => x.UserId).Distinct()); userIds = string.Join(",", list.Select(x => x.UserId).Distinct());
} }
var blist = member_UserRepository.GetMiAiList(new Model.Extend.User.RB_Member_MiaiUser_Extend { TenantId = demodel.TenantId, UserIds = userIds }); var blist = member_UserRepository.GetMiAiList(new Model.Extend.User.RB_Member_MiaiUser_Extend { TenantId = demodel.TenantId, UserIds = userIds });
// var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds }); // var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds });
foreach (var item in list) foreach (var item in list)
{ {
var bmodel = blist.Where(x => x.Id == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault(); var bmodel = blist.Where(x => x.Id == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
...@@ -609,6 +611,7 @@ namespace Mall.Module.Miai ...@@ -609,6 +611,7 @@ namespace Mall.Module.Miai
} }
return new return new
{ {
model.ForumId,
model.Id, model.Id,
model.ActivityTitle, model.ActivityTitle,
model.Content, model.Content,
...@@ -693,8 +696,18 @@ namespace Mall.Module.Miai ...@@ -693,8 +696,18 @@ namespace Mall.Module.Miai
if (model.UserId != demodel.UserId) { msg = "无法修改活动"; return false; } if (model.UserId != demodel.UserId) { msg = "无法修改活动"; return false; }
int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 1); int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 1);
int WoManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 2); int WoManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 2);
if (demodel.ManNum < ManPeopleNum) { msg = "男已报名" + ManPeopleNum + "人、不能低于此数量"; return false; } if (demodel.Distinguish == 0)
if (demodel.WoManNum < WoManPeopleNum) { msg = "女已报名" + ManPeopleNum + "人、不能低于此数量"; return false; } {
if (demodel.ManNum < ManPeopleNum) { msg = "男已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
if (demodel.WoManNum < WoManPeopleNum) { msg = "女已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
}
else
{
if (demodel.ManNum < (ManPeopleNum + WoManPeopleNum)) { msg = "已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
}
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Miai_Activity_Extend.ActivityTitle),demodel.ActivityTitle}, { nameof(RB_Miai_Activity_Extend.ActivityTitle),demodel.ActivityTitle},
{ nameof(RB_Miai_Activity_Extend.Content),demodel.Content}, { nameof(RB_Miai_Activity_Extend.Content),demodel.Content},
...@@ -708,7 +721,8 @@ namespace Mall.Module.Miai ...@@ -708,7 +721,8 @@ namespace Mall.Module.Miai
{ nameof(RB_Miai_Activity_Extend.WoManNum),demodel.WoManNum}, { nameof(RB_Miai_Activity_Extend.WoManNum),demodel.WoManNum},
{ nameof(RB_Miai_Activity_Extend.LonLat),demodel.LonLat}, { nameof(RB_Miai_Activity_Extend.LonLat),demodel.LonLat},
{ nameof(RB_Miai_Activity_Extend.LocationName),demodel.LocationName}, { nameof(RB_Miai_Activity_Extend.LocationName),demodel.LocationName},
{ nameof(RB_Miai_Activity_Extend.UpdateDate),demodel.UpdateDate} { nameof(RB_Miai_Activity_Extend.UpdateDate),demodel.UpdateDate},
{ nameof(RB_Miai_Activity_Extend.Distinguish),demodel.Distinguish}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
...@@ -1133,7 +1147,7 @@ namespace Mall.Module.Miai ...@@ -1133,7 +1147,7 @@ namespace Mall.Module.Miai
int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 0); int ManPeopleNum = miai_ActivityEnrollRepository.GetActivityEnrollNum(demodel.Id, 0);
if (model.ManNum <= ManPeopleNum) { return "已报满,无法报名"; } if (model.ManNum <= ManPeopleNum) { return "已报满,无法报名"; }
} }
demodel.Sex = bmodel.Sex;
bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0; bool flag = miai_ActivityEnrollRepository.Insert(demodel) > 0;
if (flag) if (flag)
{ {
...@@ -1276,12 +1290,16 @@ namespace Mall.Module.Miai ...@@ -1276,12 +1290,16 @@ namespace Mall.Module.Miai
var model = miai_BaseInfoRepository.GetBaseInfoList(where).FirstOrDefault(); var model = miai_BaseInfoRepository.GetBaseInfoList(where).FirstOrDefault();
if (model != null && (model.Province > 0 || model.City > 0 || model.District > 0)) if (model != null && (model.Province > 0 || model.City > 0 || model.District > 0))
{ {
string areaIds = (model.Province ?? 0) + "," + (model.City ?? 0) + "," + (model.District ?? 0); string areaIds = (model.Province ?? 0) + "," + (model.City ?? 0) + "," + (model.District ?? 0) + "," + (model.DWProvince ?? 0) + "," + (model.DWCity ?? 0) + "," + (model.DWDistrict ?? 0);
var arealist = destinationRepository.GetDictvalueListForIds(areaIds); var arealist = destinationRepository.GetDictvalueListForIds(areaIds);
model.PName = (model.Province.HasValue && model.Province.Value > 0) ? (arealist.Where(x => x.ID == model.Province).FirstOrDefault()?.Name ?? "") : ""; 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.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 ?? "") : ""; model.DName = (model.District.HasValue && model.District.Value > 0) ? (arealist.Where(x => x.ID == model.District).FirstOrDefault()?.Name ?? "") : "";
model.DWPName = (model.DWProvince.HasValue && model.DWProvince.Value > 0) ? (arealist.Where(x => x.ID == model.DWProvince).FirstOrDefault()?.Name ?? "") : "";
model.DWCName = (model.DWCity.HasValue && model.DWCity.Value > 0) ? (arealist.Where(x => x.ID == model.DWCity).FirstOrDefault()?.Name ?? "") : "";
model.DWDName = (model.DWDistrict.HasValue && model.DWDistrict.Value > 0) ? (arealist.Where(x => x.ID == model.DWDistrict).FirstOrDefault()?.Name ?? "") : "";
} }
return model; return model;
...@@ -1340,6 +1358,7 @@ namespace Mall.Module.Miai ...@@ -1340,6 +1358,7 @@ namespace Mall.Module.Miai
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_MiAi_BaseInfo_Extend.Sex),model.Sex}, { 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.Weight),model.Weight},
{ nameof(RB_MiAi_BaseInfo_Extend.Height),model.Height}, { nameof(RB_MiAi_BaseInfo_Extend.Height),model.Height},
{ nameof(RB_MiAi_BaseInfo_Extend.EducationType),model.EducationType}, { nameof(RB_MiAi_BaseInfo_Extend.EducationType),model.EducationType},
...@@ -1372,7 +1391,11 @@ namespace Mall.Module.Miai ...@@ -1372,7 +1391,11 @@ namespace Mall.Module.Miai
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardBack),model.IDCardBack}, { nameof(RB_MiAi_BaseInfo_Extend.IDCardBack),model.IDCardBack},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo}, { nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
{ nameof(RB_MiAi_BaseInfo_Extend.ActivityRegion),model.ActivityRegion}, { nameof(RB_MiAi_BaseInfo_Extend.ActivityRegion),model.ActivityRegion},
{ nameof(RB_MiAi_BaseInfo_Extend.IsFaTie),model.IsFaTie} { nameof(RB_MiAi_BaseInfo_Extend.IsFaTie),model.IsFaTie},
{ nameof(RB_MiAi_BaseInfo_Extend.WechatNo),model.WechatNo},
{ nameof(RB_MiAi_BaseInfo_Extend.DWCity),model.DWCity},
{ nameof(RB_MiAi_BaseInfo_Extend.DWProvince),model.DWProvince},
{ nameof(RB_MiAi_BaseInfo_Extend.DWDistrict),model.DWDistrict},
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
...@@ -1388,7 +1411,8 @@ namespace Mall.Module.Miai ...@@ -1388,7 +1411,8 @@ namespace Mall.Module.Miai
{ {
Dictionary<string, object> keyValuesUser = new Dictionary<string, object>() { Dictionary<string, object> keyValuesUser = new Dictionary<string, object>() {
{ nameof(Model.Entity.User.RB_Member_User.Name),model.Name}, { nameof(Model.Entity.User.RB_Member_User.Name),model.Name},
{ nameof(Model.Entity.User.RB_Member_User.Photo),model.Photo} { nameof(Model.Entity.User.RB_Member_User.Photo),model.Photo},
{ nameof(Model.Entity.User.RB_Member_User.Moblie),model.Moblie}
}; };
List<WhereHelper> wheresUser = new List<WhereHelper>() { List<WhereHelper> wheresUser = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
...@@ -1799,5 +1823,48 @@ namespace Mall.Module.Miai ...@@ -1799,5 +1823,48 @@ namespace Mall.Module.Miai
} }
#endregion #endregion
#region 会员基础每日随机查询信息
/// <summary>
/// 获取列表
/// </summary>
/// <param name="where"></param>
/// <returns></returns>
public List<RB_MiAi_BaseInfoDayQuery> GetBaseInfoQueryList(RB_MiAi_BaseInfoDayQuery where)
{
return miAiBaseInfoDayQueryRepository.GetBaseInfoDayQueryList(where);
}
/// <summary>
/// 新增/修改会员基础信息查询条件信息
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetMiAiBaseInfoDayQuery(RB_MiAi_BaseInfoDayQuery model)
{
if (model.Id == 0)
{
return miAiBaseInfoDayQueryRepository.Insert(model) > 0;
}
return false;
}
/// <summary>
/// 获取每日随机基础信息
/// </summary>
/// <param name="where"></param>
/// <param name="Top"></param>
/// <returns></returns>
public List<RB_MiAi_BaseInfo_Extend> GetDailyRandomList(RB_MiaiMember_Extend where, int Top)
{
return miai_BaseInfoRepository.GetDailyRandomList(where, Top);
}
#endregion
} }
} }
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Model.Entity.Miai;
namespace Mall.Repository.Miai
{
/// <summary>
/// 详情会员每日随机查询仓储层
/// </summary>
public class RB_MiAi_BaseInfoDayQueryRepository : BaseRepository<RB_MiAi_BaseInfoDayQuery>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_MiAi_BaseInfoDayQuery); } }
/// <summary>
/// 获取列表
/// </summary>
/// <param name="where"></param>
/// <returns></returns>
public List<RB_MiAi_BaseInfoDayQuery> GetBaseInfoDayQueryList(RB_MiAi_BaseInfoDayQuery where)
{
StringBuilder sb = new StringBuilder();
sb.Append($@" SELECT * from RB_MiAi_BaseInfoDayQuery where Status=0");
if (where != null)
{
if (where.TenantId > 0)
{
sb.AppendFormat(" and TenantId={0}", where.TenantId);
}
if (where.MallBaseId > 0)
{
sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
}
if (where.Id > 0)
{
sb.AppendFormat(" and Id={0}", where.Id);
}
if (where.UserId > 0)
{
sb.AppendFormat(" and UserId={0}", where.UserId);
}
if (where.Sex > 0)
{
sb.AppendFormat(" and Sex={0}", where.Sex);
}
if (where.CreateDate.HasValue)
{
sb.AppendFormat(" and DATE_FORMAT(CreateDate,'%Y-%m-%d' ) = DATE_FORMAT('{0}','%Y-%m-%d' )", where.CreateDate.Value);
}
}
return Get<RB_MiAi_BaseInfoDayQuery>(sb.ToString()).ToList();
}
}
}
...@@ -423,5 +423,48 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id where a.Status=0 and b.Blacklis ...@@ -423,5 +423,48 @@ LEFT JOIN rb_member_user as b on a.UserId=b.Id where a.Status=0 and b.Blacklis
} }
/// <summary>
/// 获取每日随机基础信息
/// </summary>
/// <param name="where"></param>
/// <param name="Top"></param>
/// <returns></returns>
public List<RB_MiAi_BaseInfo_Extend> GetDailyRandomList(RB_MiaiMember_Extend where, int Top)
{
StringBuilder sb = new StringBuilder();
sb.Append($@" SELECT * FROM rb_miai_baseinfo as a where a.`Status`=0 ");
if (where != null)
{
if (where.TenantId > 0)
{
sb.AppendFormat(" and a.TenantId={0}", where.TenantId);
}
if (where.MallBaseId > 0)
{
sb.AppendFormat(" and a.MallBaseId={0}", where.MallBaseId);
}
if (where.Id > 0)
{
sb.AppendFormat(" and a.Id={0}", where.Id);
}
if (where.UserId > 0)
{
sb.AppendFormat(" and a.UserId!={0}", where.UserId);
}
if (where.Sex > 0)
{
sb.AppendFormat(" and a.Sex ={0}", where.Sex);
}
if (!string.IsNullOrWhiteSpace(where.UserIds))
{
sb.AppendFormat(" and a.UserId in({0})", where.UserIds);
}
}
sb.AppendFormat($@" ORDER BY RAND() LIMIT {Top}");
return Get<RB_MiAi_BaseInfo_Extend>(sb.ToString()).ToList();
}
} }
} }
...@@ -41,6 +41,10 @@ namespace Mall.Repository.Miai ...@@ -41,6 +41,10 @@ namespace Mall.Repository.Miai
{ {
where += $@" and a.{nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}"; where += $@" and a.{nameof(RB_Miai_Activity_Extend.UserId)} ={dmodel.UserId}";
} }
if (dmodel.Id > 0)
{
where += $@" and a.{nameof(RB_Miai_Activity_Extend.Id)} ={dmodel.Id}";
}
if (dmodel.IsSelectEnroll == 1) if (dmodel.IsSelectEnroll == 1)
{ {
where += $@" and a.{nameof(RB_Miai_Activity_Extend.Deadline)} >='{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'"; where += $@" and a.{nameof(RB_Miai_Activity_Extend.Deadline)} >='{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
......
...@@ -1379,7 +1379,7 @@ FROM ...@@ -1379,7 +1379,7 @@ FROM
// orderBy = "a.Id asc"; // orderBy = "a.Id asc";
//} //}
string sql = $@" string sql = $@"
SELECT * from (SELECT a.*,mu.`Name` as SuperiorName, b.Id as BaseInfoId,b.Album,b.Birthday,b.Height,b.IsFaTie,b.Weight,b.YearMoney,b.EducationType,b.Marriage,b.CarInfo,b.HouseInfo,(YEAR (curdate()) - YEAR (b.Birthday) - 1 + ( DATE_FORMAT(b.Birthday, '%m%d') <= ( DATE_FORMAT(curdate(), '%m%d') ) )) Age SELECT * from (SELECT a.*,mu.`Name` as SuperiorName,b.WechatNo, b.Id as BaseInfoId,b.Album,b.Birthday,b.Height,b.IsFaTie,b.Weight,b.YearMoney,b.EducationType,b.Marriage,b.CarInfo,b.HouseInfo,(YEAR (curdate()) - YEAR (b.Birthday) - 1 + ( DATE_FORMAT(b.Birthday, '%m%d') <= ( DATE_FORMAT(curdate(), '%m%d') ) )) Age
FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId LEFT JOIN rb_member_user as mu on a.SuperiorId=mu.Id) as t where {where} order by {orderBy} FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId LEFT JOIN rb_member_user as mu on a.SuperiorId=mu.Id) as t where {where} order by {orderBy}
"; ";
return GetPage<RB_Member_MiaiUser_Extend>(pageIndex, pageSize, out rowCount, sql).ToList(); return GetPage<RB_Member_MiaiUser_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
......
...@@ -570,7 +570,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -570,7 +570,7 @@ namespace Mall.WebApi.Controllers.MallBase
JObject parm = JObject.Parse(parms.msg.ToString()); JObject parm = JObject.Parse(parms.msg.ToString());
// var userInfo = AppletUserInfo; // var userInfo = AppletUserInfo;
int userId = parm.GetInt("UserId"); int userId = parm.GetInt("UserId");
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = UserInfo.TenantId, MallBaseId = UserInfo.MallBaseId }); 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)
{ {
...@@ -582,6 +582,11 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -582,6 +582,11 @@ namespace Mall.WebApi.Controllers.MallBase
var result = new var result = new
{ {
oldUserInfo.Id,
oldUserInfo.Name,
oldUserInfo.Photo,
WechatNo = oldBaseInfo.WechatNo ?? "",
Moblie = oldUserInfo.Moblie ?? "",
SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "", SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
Birthday = oldBaseInfo.Birthday ?? "", Birthday = oldBaseInfo.Birthday ?? "",
Sex = oldBaseInfo?.Sex ?? 0, Sex = oldBaseInfo?.Sex ?? 0,
...@@ -627,6 +632,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -627,6 +632,12 @@ namespace Mall.WebApi.Controllers.MallBase
IDCard = oldBaseInfo.IDCard ?? "", IDCard = oldBaseInfo.IDCard ?? "",
IDCardBack = oldBaseInfo.IDCardBack ?? "", IDCardBack = oldBaseInfo.IDCardBack ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "", ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
DWCName = oldBaseInfo.DWCName ?? "",
DWDName = oldBaseInfo.DWDName ?? "",
DWPName = oldBaseInfo.DWPName ?? "",
DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0,
}; };
return ApiResult.Success("", result); return ApiResult.Success("", result);
} }
...@@ -707,6 +718,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -707,6 +718,7 @@ namespace Mall.WebApi.Controllers.MallBase
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
{ {
WechatNo = x.WechatNo ?? "",
x.Id, x.Id,
x.AliasName, x.AliasName,
Birthday = x.Birthday ?? "", Birthday = x.Birthday ?? "",
...@@ -990,6 +1002,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -990,6 +1002,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success("", new return ApiResult.Success("", new
{ {
model.Id, model.Id,
WechatNo = oldBaseInfo.WechatNo??"",
Photo = model.Photo ?? "", Photo = model.Photo ?? "",
model.Name, model.Name,
model.AliasName, model.AliasName,
...@@ -1048,7 +1061,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1048,7 +1061,13 @@ namespace Mall.WebApi.Controllers.MallBase
IDCardNo = oldBaseInfo.IDCardNo ?? "", IDCardNo = oldBaseInfo.IDCardNo ?? "",
ActivityRegion = oldBaseInfo.ActivityRegion ?? "", ActivityRegion = oldBaseInfo.ActivityRegion ?? "",
BaseInfoId = oldBaseInfo?.Id ?? 0, BaseInfoId = oldBaseInfo?.Id ?? 0,
IsFaTie = oldBaseInfo?.IsFaTie ?? 0 IsFaTie = oldBaseInfo?.IsFaTie ?? 0,
DWCName = oldBaseInfo.DWCName ?? "",
DWDName = oldBaseInfo.DWDName ?? "",
DWPName = oldBaseInfo.DWPName ?? "",
DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0,
}); });
} }
...@@ -1113,6 +1132,10 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1113,6 +1132,10 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Failed("请选择身高"); return ApiResult.Failed("请选择身高");
} }
if ((!baseInfo.DWProvince.HasValue || baseInfo.DWProvince.Value == 0) || (!baseInfo.DWCity.HasValue || baseInfo.DWCity.Value == 0) || (!baseInfo.DWDistrict.HasValue || baseInfo.DWDistrict.Value == 0))
{
return ApiResult.Failed("请选择定位省市区");
}
if (baseInfo.YearMoney == 0) if (baseInfo.YearMoney == 0)
{ {
return ApiResult.Failed("请输入年收入"); return ApiResult.Failed("请输入年收入");
......
...@@ -17,6 +17,8 @@ namespace Mall.WindowsService.Helper ...@@ -17,6 +17,8 @@ namespace Mall.WindowsService.Helper
private static int inTimer5 = 0; private static int inTimer5 = 0;
private static int inTimer6 = 0; private static int inTimer6 = 0;
private static int inTimer7 = 0; private static int inTimer7 = 0;
private static int inTimer8 = 0;
/// <summary> /// <summary>
/// 收入单子服务开始执行方法 /// 收入单子服务开始执行方法
/// </summary> /// </summary>
...@@ -208,5 +210,30 @@ namespace Mall.WindowsService.Helper ...@@ -208,5 +210,30 @@ namespace Mall.WindowsService.Helper
Interlocked.Exchange(ref inTimer7, 0); Interlocked.Exchange(ref inTimer7, 0);
} }
} }
/// <summary>
///相亲每日随机查询信息删除
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
public void DailyRandomShelves(object sender, System.Timers.ElapsedEventArgs e)
{
if (Interlocked.Exchange(ref inTimer8, 1) == 0)
{
try
{
string str = Common.Config.GetConnectionString("DefaultConnection");
LogHelper.Write("DailyRandomShelves=====Start" + str);
Module.EducationArticleShelvesModule.DailyRandomModule();
LogHelper.Write("DailyRandomShelves=====End");
}
catch (Exception ex)
{
LogHelper.Write("DailyRandomShelves=====ex" + ex.Message);
}
Interlocked.Exchange(ref inTimer8, 0);
}
}
} }
} }
...@@ -20,7 +20,10 @@ namespace Mall.WindowsService.Module ...@@ -20,7 +20,10 @@ namespace Mall.WindowsService.Module
/// </summary> /// </summary>
private static readonly RB_Education_ArticleRepository educationArticleRepository = new RB_Education_ArticleRepository(); private static readonly RB_Education_ArticleRepository educationArticleRepository = new RB_Education_ArticleRepository();
/// <summary>
/// 相亲每日随机会员查询信息
/// </summary>
private static readonly Repository.Miai.RB_MiAi_BaseInfoDayQueryRepository miaiBaseInfoDayQueryRepository = new Repository.Miai.RB_MiAi_BaseInfoDayQueryRepository();
/// <summary> /// <summary>
/// 会员储值卡仓储层 /// 会员储值卡仓储层
/// </summary> /// </summary>
...@@ -113,8 +116,26 @@ WHERE Status=1 AND SendTime<='{0}' and SendStatus=2 ", DateTime.Now.ToString("yy ...@@ -113,8 +116,26 @@ WHERE Status=1 AND SendTime<='{0}' and SendStatus=2 ", DateTime.Now.ToString("yy
return flag; return flag;
} }
/// <summary>
/// 相亲每日随机查询信息删除
/// </summary>
/// <returns></returns>
public static bool DailyRandomModule()
{
bool flag = false;
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" SELECT * from RB_MiAi_BaseInfoDayQuery where Status=0 and DATE_FORMAT(CreateDate,'%Y-%m-%d' ) < DATE_FORMAT('{0}','%Y-%m-%d' )", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var list = miaiBaseInfoDayQueryRepository.Get<Model.Entity.Miai.RB_MiAi_BaseInfoDayQuery>(builder.ToString()).ToList();
if (list != null && list.Count > 0)
{
flag = miaiBaseInfoDayQueryRepository.DeleteBatch(list);
}
return flag;
}
} }
} }
...@@ -7,6 +7,7 @@ namespace Mall.WindowsService ...@@ -7,6 +7,7 @@ namespace Mall.WindowsService
{ {
static void Main(string[] args) static void Main(string[] args)
{ {
// Module.EducationArticleShelvesModule.DailyRandomModule();
ServiceBase[] services = new ServiceBase[] { new WindowsService() }; ServiceBase[] services = new ServiceBase[] { new WindowsService() };
ServiceBase.Run(services); ServiceBase.Run(services);
} }
......
...@@ -19,6 +19,7 @@ namespace Mall.WindowsService ...@@ -19,6 +19,7 @@ namespace Mall.WindowsService
private System.Timers.Timer timer6; //资讯定时上架和下架 private System.Timers.Timer timer6; //资讯定时上架和下架
private System.Timers.Timer timer7; //会员储值卡赠送状态更新 private System.Timers.Timer timer7; //会员储值卡赠送状态更新
private System.Timers.Timer timer8;//会员购买储值卡收入 private System.Timers.Timer timer8;//会员购买储值卡收入
private System.Timers.Timer timer9;//相亲每日随机查询信息删除
public WindowsService() public WindowsService()
{ {
InitializeComponent(); InitializeComponent();
...@@ -94,7 +95,7 @@ namespace Mall.WindowsService ...@@ -94,7 +95,7 @@ namespace Mall.WindowsService
timer7 = new System.Timers.Timer(); timer7 = new System.Timers.Timer();
timer7 = new System.Timers.Timer timer7 = new System.Timers.Timer
{ {
Interval = 1000 * (60 * 2) //10分钟调用一次 Interval = 1000 * (60 * 10) //10分钟调用一次
}; };
timer7.Elapsed += new System.Timers.ElapsedEventHandler(helper.MemberDepositBuyShelves); timer7.Elapsed += new System.Timers.ElapsedEventHandler(helper.MemberDepositBuyShelves);
timer7.Enabled = true; timer7.Enabled = true;
...@@ -112,7 +113,18 @@ namespace Mall.WindowsService ...@@ -112,7 +113,18 @@ namespace Mall.WindowsService
timer8.Enabled = true; timer8.Enabled = true;
#endregion #endregion
#region 相亲每日随机查询信息删除
timer9 = new System.Timers.Timer();
timer9 = new System.Timers.Timer
{
Interval = 1000 * (60 * 240) //4小时调用一次
};
timer9.Elapsed += new System.Timers.ElapsedEventHandler(helper.DailyRandomShelves);
timer9.Enabled = true;
#endregion
} }
protected override void OnStop() protected override void OnStop()
......
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