Skip to content

M
mall.oytour.com
Commit 11e888dd authored by 黄奎's avatar 黄奎
Browse files
Options

新增字段

parent 679e5ce9
Hide whitespace changes
Inline Side-by-side
Showing with 1104 additions and 188 deletions
Mall.Common/Plugin/WeiXinHelper.cs
View file @ 11e888dd
...@@ -276,7 +276,7 @@ namespace Mall.Common.Plugin ...@@ -276,7 +276,7 @@ namespace Mall.Common.Plugin
public string priTmplId { get; set; } public string priTmplId { get; set; }
/// <summary> /// <summary>
/// 模版标题 /// 模版标题
/// </summary> /// </summary>
public string title { get; set; } public string title { get; set; }
......
Mall.Model/Entity/User/RB_Member_Group.cs 0 → 100644
View file @ 11e888dd
using Mall.Common.Enum;
using System;
using VT.FW.DB;
namespace Mall.Model.Entity.User
{
/// <summary>
/// 用户分组实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Member_Group
{
/// <summary>
/// 分组编号(主键)
/// </summary>
public int GroupId { get; set; }
/// <summary>
/// 可查看分组编号
/// </summary>
public string LookGroupIds { get; set; }
/// <summary>
/// 分组名称
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 是否默认分组(1-是)
/// </summary>
public int IsDefault { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
}
}
Mall.Model/Entity/User/RB_Member_Look.cs 0 → 100644
View file @ 11e888dd
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Entity.User
{
/// <summary>
/// 用户查看微信日志实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Member_Look
{
/// <summary>
/// 用户查看微信日志Id
/// </summary>
public int LookId { get; set; }
/// <summary>
/// 用户编号
/// </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 int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
}
}
Mall.Model/Entity/User/RB_Member_User.cs
View file @ 11e888dd
...@@ -230,13 +230,11 @@ namespace Mall.Model.Entity.User ...@@ -230,13 +230,11 @@ namespace Mall.Model.Entity.User
/// </summary> /// </summary>
public string PhoneNum { get; set; } public string PhoneNum { get; set; }
/// <summary> /// <summary>
/// 是否结算用户，1-是 2020-11-10 Addd By:w /// 是否结算用户，1-是 2020-11-10 Addd By:w
/// </summary> /// </summary>
public int IsSettlement { get; set; } public int IsSettlement { get; set; }
/// <summary> /// <summary>
/// 教育点数（针对购买直播产品） /// 教育点数（针对购买直播产品）
/// </summary> /// </summary>
...@@ -251,5 +249,20 @@ namespace Mall.Model.Entity.User ...@@ -251,5 +249,20 @@ namespace Mall.Model.Entity.User
/// 是否管理员 1是 /// 是否管理员 1是
/// </summary> /// </summary>
public int IsAdmin { get; set; } public int IsAdmin { get; set; }
/// <summary>
/// 是否显示用户资料(1-显示，0-不显示)
/// </summary>
public int IsShow { get; set; }
/// <summary>
/// 用户所属分组
/// </summary>
public string BelongGroupIds { get; set; }
/// <summary>
/// 查看次数
/// </summary>
public int LookTimes { get; set; }
} }
} }
Mall.Model/Extend/User/RB_Member_Group_Extend.cs 0 → 100644
View file @ 11e888dd
using Mall.Model.Entity.User;
using System.Collections.Generic;
namespace Mall.Model.Extend.User
{
/// <summary>
/// 用户分组扩展实体类
/// </summary>
public class RB_Member_Group_Extend: RB_Member_Group
{
/// <summary>
/// 分组编号
/// </summary>
public string Q_GroupIds { get; set; }
/// <summary>
/// 可查看分组列表
/// </summary>
public List<object> LookGroupList { get; set; }
/// <summary>
/// 可查询分组编号
/// </summary>
public List<int> GroupIdList
{
get
{
List<int> ids = new List<int>();
if (!string.IsNullOrEmpty(this.LookGroupIds))
{
ids = Common.ConvertHelper.StringToList(this.LookGroupIds);
}
return ids;
}
}
/// <summary>
/// 是否查询默认分组
/// </summary>
public int IsQueryDefault { get; set; }
}
}
Mall.Model/Extend/User/RB_Member_Look_Extend.cs 0 → 100644
View file @ 11e888dd
using Mall.Model.Entity.User;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Extend.User
{
/// <summary>
/// 用户查看微信日志扩展实体类
/// </summary>
public class RB_Member_Look_Extend: RB_Member_Look
{
}
}
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @ 11e888dd
...@@ -149,8 +149,6 @@ namespace Mall.Model.Extend.User ...@@ -149,8 +149,6 @@ namespace Mall.Model.Extend.User
/// </summary> /// </summary>
public string Icon { get; set; } public string Icon { get; set; }
/// <summary> /// <summary>
/// 是否赞羊使用0-否，1-是 /// 是否赞羊使用0-否，1-是
/// </summary> /// </summary>
...@@ -207,18 +205,39 @@ namespace Mall.Model.Extend.User ...@@ -207,18 +205,39 @@ namespace Mall.Model.Extend.User
/// </summary> /// </summary>
public int AdminId { get; set; } public int AdminId { get; set; }
} /// <summary>
/// 用户所属分组
/// </summary>
public List<int> BelongGroupIdList
{
get
{
return Common.ConvertHelper.StringToList(this.BelongGroupIds);
}
}
}
/// <summary>
/// 相亲用户扩展实体类
/// </summary>
public class RB_Member_MiaiUser_Extend : RB_Member_User public class RB_Member_MiaiUser_Extend : RB_Member_User
{ {
/// <summary>
/// 微信号
/// </summary>
public string WechatNo { get; set; } public string WechatNo { get; set; }
/// <summary> /// <summary>
/// 导出枚举ids /// 导出枚举ids
/// </summary> /// </summary>
public List<int> ExcelEnumIds { get; set; } public List<int> ExcelEnumIds { get; set; }
/// <summary>
/// 生日
/// </summary>
public string Birthday { get; set; } public string Birthday { get; set; }
/// <summary> /// <summary>
/// 年龄 /// 年龄
/// </summary> /// </summary>
...@@ -283,6 +302,7 @@ namespace Mall.Model.Extend.User ...@@ -283,6 +302,7 @@ namespace Mall.Model.Extend.User
/// 开始时间 /// 开始时间
/// </summary> /// </summary>
public string StartTime { get; set; } public string StartTime { get; set; }
/// <summary> /// <summary>
/// 结束时间 /// 结束时间
/// </summary> /// </summary>
...@@ -298,9 +318,14 @@ namespace Mall.Model.Extend.User ...@@ -298,9 +318,14 @@ namespace Mall.Model.Extend.User
/// </summary> /// </summary>
public string SuperiorName { get; set; } public string SuperiorName { get; set; }
/// <summary>
/// 性别(1-男，2-女)
/// </summary>
public int Sex { get; set; } public int Sex { get; set; }
/// <summary>
/// 用户编号
/// </summary>
public string UserIds { get; set; } public string UserIds { get; set; }
/// <summary> /// <summary>
...@@ -308,10 +333,43 @@ namespace Mall.Model.Extend.User ...@@ -308,10 +333,43 @@ namespace Mall.Model.Extend.User
/// </summary> /// </summary>
public int IsFaTie { get; set; } public int IsFaTie { get; set; }
/// <summary>
/// 基础信息编号
/// </summary>
public int BaseInfoId { get; set; } public int BaseInfoId { get; set; }
/// <summary>
/// 查询分组
/// </summary>
public List<int> Q_BelongGroup_Ids { get; set; }
/// <summary>
/// 用户所属分组
/// </summary>
public List<GroupItem> BelongGroupList { get; set; }
/// <summary>
/// 用户查看分组
/// </summary>
public List<GroupItem> LookGroupList { get; set; }
} }
/// <summary>
/// 组别项
/// </summary>
public class GroupItem
{
/// <summary>
/// 分组编号
/// </summary>
public int GroupId { get; set; }
/// <summary>
/// 分组名称
/// </summary>
public string GroupName { get; set; }
}
/// <summary> /// <summary>
...@@ -338,5 +396,6 @@ namespace Mall.Model.Extend.User ...@@ -338,5 +396,6 @@ namespace Mall.Model.Extend.User
/// 客户编号 /// 客户编号
/// </summary> /// </summary>
public int UserID { get; set; } public int UserID { get; set; }
} }
} }
Mall.Module.Miai/MiaiModule.cs
View file @ 11e888dd
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using Mall.Common; using Mall.Common;
using Mall.Common.Plugin; using Mall.Common.Plugin;
using Newtonsoft.Json; using Newtonsoft.Json;
using Mall.Common.API;
using Newtonsoft.Json.Linq;
using VT.FW.DB; using VT.FW.DB;
using Mall.Repository.Miai; using Mall.Repository.Miai;
using Mall.Model.Extend.Miai; using Mall.Model.Extend.Miai;
...@@ -15,6 +12,7 @@ using Mall.Repository.TradePavilion; ...@@ -15,6 +12,7 @@ using Mall.Repository.TradePavilion;
using Mall.Repository.Education; using Mall.Repository.Education;
using Mall.Model.Entity.Miai; using Mall.Model.Entity.Miai;
using Mall.Repository.Product; using Mall.Repository.Product;
using Mall.Repository.User;
namespace Mall.Module.Miai namespace Mall.Module.Miai
{ {
...@@ -92,6 +90,11 @@ namespace Mall.Module.Miai ...@@ -92,6 +90,11 @@ namespace Mall.Module.Miai
/// </summary> /// </summary>
private readonly RB_MiAi_DianZanRepository miAiDianZanRepository = new RB_MiAi_DianZanRepository(); private readonly RB_MiAi_DianZanRepository miAiDianZanRepository = new RB_MiAi_DianZanRepository();
/// <summary>
/// 用户分组仓储层对象
/// </summary>
private readonly RB_Member_GroupRepository member_GroupRepository = new RB_Member_GroupRepository();
#region 会员信息 #region 会员信息
/// <summary> /// <summary>
...@@ -1539,24 +1542,27 @@ namespace Mall.Module.Miai ...@@ -1539,24 +1542,27 @@ namespace Mall.Module.Miai
/// <returns></returns> /// <returns></returns>
public bool UpdateIDCardInfo(RB_MiAi_BaseInfo_Extend model) public bool UpdateIDCardInfo(RB_MiAi_BaseInfo_Extend model)
{ {
bool flag = false; bool flag ;
if (model.Id == 0) if (model.Id == 0)
{ {
flag = miai_BaseInfoRepository.Insert(model) > 0; flag = miai_BaseInfoRepository.Insert(model) > 0;
} }
else else
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{ nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo}, {
{ nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName} { nameof(RB_MiAi_BaseInfo_Extend.IDCardNo),model.IDCardNo},
}; { nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName}
List<WhereHelper> wheres = new List<WhereHelper>() { };
new WhereHelper(){ List<WhereHelper> wheres = new List<WhereHelper>()
FiledName=nameof(RB_MiAi_BaseInfo_Extend.UserId), {
FiledValue=model.UserId, new WhereHelper()
OperatorEnum=OperatorEnum.Equal {
} FiledName=nameof(RB_MiAi_BaseInfo_Extend.UserId),
}; FiledValue=model.UserId,
OperatorEnum=OperatorEnum.Equal
}
};
flag = miai_BaseInfoRepository.Update(keyValues, wheres); flag = miai_BaseInfoRepository.Update(keyValues, wheres);
} }
return flag; return flag;
...@@ -1570,14 +1576,15 @@ namespace Mall.Module.Miai ...@@ -1570,14 +1576,15 @@ namespace Mall.Module.Miai
/// <returns></returns> /// <returns></returns>
public bool SetMiAiBaseInfo(RB_MiAi_BaseInfo_Extend model) public bool SetMiAiBaseInfo(RB_MiAi_BaseInfo_Extend model)
{ {
bool flag = false; bool flag;
if (model.Id == 0) if (model.Id == 0)
{ {
flag = miai_BaseInfoRepository.Insert(model) > 0; flag = miai_BaseInfoRepository.Insert(model) > 0;
} }
else else
{ {
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.Birthday),model.Birthday},
{ nameof(RB_MiAi_BaseInfo_Extend.Weight),model.Weight}, { nameof(RB_MiAi_BaseInfo_Extend.Weight),model.Weight},
...@@ -1609,45 +1616,48 @@ namespace Mall.Module.Miai ...@@ -1609,45 +1616,48 @@ namespace Mall.Module.Miai
{ nameof(RB_MiAi_BaseInfo_Extend.Appointment),model.Appointment}, { nameof(RB_MiAi_BaseInfo_Extend.Appointment),model.Appointment},
{ nameof(RB_MiAi_BaseInfo_Extend.AppointmentAddress),model.AppointmentAddress}, { nameof(RB_MiAi_BaseInfo_Extend.AppointmentAddress),model.AppointmentAddress},
{ nameof(RB_MiAi_BaseInfo_Extend.IDCard),model.IDCard}, { nameof(RB_MiAi_BaseInfo_Extend.IDCard),model.IDCard},
{ 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.RealName),model.RealName}, { nameof(RB_MiAi_BaseInfo_Extend.RealName),model.RealName},
{ 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.WechatNo),model.WechatNo},
{ nameof(RB_MiAi_BaseInfo_Extend.DWCity),model.DWCity}, { nameof(RB_MiAi_BaseInfo_Extend.DWCity),model.DWCity},
{ nameof(RB_MiAi_BaseInfo_Extend.DWProvince),model.DWProvince}, { nameof(RB_MiAi_BaseInfo_Extend.DWProvince),model.DWProvince},
{ nameof(RB_MiAi_BaseInfo_Extend.DWDistrict),model.DWDistrict}, { nameof(RB_MiAi_BaseInfo_Extend.DWDistrict),model.DWDistrict},
{ nameof(RB_MiAi_BaseInfo_Extend.Industry),model.Industry}, { nameof(RB_MiAi_BaseInfo_Extend.Industry),model.Industry},
{ nameof(RB_MiAi_BaseInfo_Extend.YearMoneyType),model.YearMoneyType}, { nameof(RB_MiAi_BaseInfo_Extend.YearMoneyType),model.YearMoneyType},
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id), new WhereHelper()
FiledValue=model.Id, {
OperatorEnum=OperatorEnum.Equal FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id),
} FiledValue=model.Id,
}; OperatorEnum=OperatorEnum.Equal
}
};
flag = miai_BaseInfoRepository.Update(keyValues, wheres); flag = miai_BaseInfoRepository.Update(keyValues, wheres);
} }
if (flag) if (flag)
{ {
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.Photo),model.Photo}, { nameof(Model.Entity.User.RB_Member_User.Name),model.Name},
{ nameof(Model.Entity.User.RB_Member_User.Moblie),model.Moblie} { 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>() { };
new WhereHelper(){ List<WhereHelper> wheresUser = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(Model.Entity.User.RB_Member_User.Id), FiledName=nameof(Model.Entity.User.RB_Member_User.Id),
FiledValue=model.UserId, FiledValue=model.UserId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
member_UserRepository.Update(keyValuesUser, wheresUser); member_UserRepository.Update(keyValuesUser, wheresUser);
} }
return flag; return flag;
} }
...@@ -1720,7 +1730,7 @@ namespace Mall.Module.Miai ...@@ -1720,7 +1730,7 @@ namespace Mall.Module.Miai
/// <returns></returns> /// <returns></returns>
public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model, RB_MiAi_BaseInfo_Extend baseInfo) public bool AddOrUpdateFollowMember(RB_MiAi_FollowMember model, RB_MiAi_BaseInfo_Extend baseInfo)
{ {
bool flag = false; bool flag;
try try
{ {
int Id = 0; int Id = 0;
...@@ -1735,15 +1745,18 @@ namespace Mall.Module.Miai ...@@ -1735,15 +1745,18 @@ namespace Mall.Module.Miai
else else
{ {
Id = model.ID; Id = model.ID;
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Education_FollowTeacher.UpdateDate),System.DateTime.Now}, { nameof(RB_Education_FollowTeacher.UpdateDate),System.DateTime.Now},
{ nameof(RB_Education_FollowTeacher.Status),model.Status} { nameof(RB_Education_FollowTeacher.Status),model.Status}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_MiAi_FollowMember.ID), FiledName=nameof(RB_MiAi_FollowMember.ID),
FiledValue=model.ID, FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
if (model.Status == 1)//取消关注 if (model.Status == 1)//取消关注
...@@ -1759,15 +1772,17 @@ namespace Mall.Module.Miai ...@@ -1759,15 +1772,17 @@ namespace Mall.Module.Miai
} }
if (flag) if (flag)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>()
Dictionary<string, object> keyValues = new Dictionary<string, object>() { {
{ nameof(RB_MiAi_BaseInfo_Extend.FollowNum),baseInfo.FollowNum} { nameof(RB_MiAi_BaseInfo_Extend.FollowNum),baseInfo.FollowNum}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id), FiledName=nameof(RB_MiAi_BaseInfo_Extend.Id),
FiledValue=baseInfo.Id, FiledValue=baseInfo.Id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
miai_BaseInfoRepository.Update(keyValues, wheres); miai_BaseInfoRepository.Update(keyValues, wheres);
...@@ -1789,7 +1804,6 @@ namespace Mall.Module.Miai ...@@ -1789,7 +1804,6 @@ namespace Mall.Module.Miai
UpdateDate = DateTime.Now UpdateDate = DateTime.Now
}); });
} }
} }
} }
catch (Exception ex) catch (Exception ex)
...@@ -1887,6 +1901,12 @@ namespace Mall.Module.Miai ...@@ -1887,6 +1901,12 @@ namespace Mall.Module.Miai
var list = member_UserRepository.GetMiAiPageList(pageIndex, pageSize, out count, dmodel); var list = member_UserRepository.GetMiAiPageList(pageIndex, pageSize, out count, dmodel);
if (list.Any()) if (list.Any())
{ {
var groupList = member_GroupRepository.GetMemberGroupListRepository(new Model.Extend.User.RB_Member_Group_Extend()
{
TenantId = dmodel.TenantId,
MallBaseId = dmodel.MallBaseId
});
List<Model.Extend.User.RB_Member_Grade_Extend> gradeList = new List<Model.Extend.User.RB_Member_Grade_Extend>(); List<Model.Extend.User.RB_Member_Grade_Extend> gradeList = new List<Model.Extend.User.RB_Member_Grade_Extend>();
if (list.Where(x => x.MemberGrade > 0).Any()) if (list.Where(x => x.MemberGrade > 0).Any())
{ {
...@@ -1895,6 +1915,54 @@ namespace Mall.Module.Miai ...@@ -1895,6 +1915,54 @@ namespace Mall.Module.Miai
} }
foreach (var item in list) foreach (var item in list)
{ {
item.BelongGroupList = new List<Model.Extend.User.GroupItem> ();
item.LookGroupList = new List<Model.Extend.User.GroupItem>();
if (!string.IsNullOrEmpty(item.BelongGroupIds))
{
var b_group_ids = Common.ConvertHelper.StringToList(item.BelongGroupIds);
if (b_group_ids != null && b_group_ids.Count > 0)
{
foreach (var sItem in b_group_ids)
{
var tempGroup = groupList?.FirstOrDefault(qitem => qitem.GroupId == sItem);
if (tempGroup != null && tempGroup.GroupId > 0)
{
if (!(item.BelongGroupList.Where(qitem => qitem.GroupId == tempGroup.GroupId).Count() > 0))
{
item.BelongGroupList.Add(new Model.Extend.User.GroupItem()
{
GroupId = tempGroup.GroupId,
GroupName = tempGroup.GroupName
});
}
if (!string.IsNullOrEmpty(tempGroup.LookGroupIds))
{
var l_group_ids= Common.ConvertHelper.StringToList(tempGroup.LookGroupIds);
if (l_group_ids != null && l_group_ids.Count > 0)
{
foreach (var tItem in l_group_ids)
{
var l_Group = groupList?.FirstOrDefault(qitem => qitem.GroupId == tItem);
if (l_Group != null && l_Group.GroupId > 0)
{
if (!(item.LookGroupList.Where(qitem => qitem.GroupId == l_Group.GroupId).Count() > 0))
{
item.LookGroupList.Add(new Model.Extend.User.GroupItem()
{
GroupId = l_Group.GroupId,
GroupName = l_Group.GroupName
});
}
}
}
}
}
}
}
}
}
if (item.MemberGrade > 0) if (item.MemberGrade > 0)
{ {
item.MemberGradeName = gradeList.Where(x => x.Id == item.MemberGrade).FirstOrDefault()?.Name ?? ""; item.MemberGradeName = gradeList.Where(x => x.Id == item.MemberGrade).FirstOrDefault()?.Name ?? "";
...@@ -1953,7 +2021,8 @@ namespace Mall.Module.Miai ...@@ -1953,7 +2021,8 @@ namespace Mall.Module.Miai
/// <returns></returns> /// <returns></returns>
public bool SetMemberUserInfoForHT(Model.Extend.User.RB_Member_User_Extend demodel) public bool SetMemberUserInfoForHT(Model.Extend.User.RB_Member_User_Extend demodel)
{ {
Dictionary<string, object> files = new Dictionary<string, object>() { Dictionary<string, object> files = new Dictionary<string, object>()
{
{ nameof(Model.Entity.User.RB_Member_User.MemberGrade),demodel.MemberGrade}, { nameof(Model.Entity.User.RB_Member_User.MemberGrade),demodel.MemberGrade},
{ nameof(Model.Entity.User.RB_Member_User.SuperiorId),demodel.SuperiorId}, { nameof(Model.Entity.User.RB_Member_User.SuperiorId),demodel.SuperiorId},
{ nameof(Model.Entity.User.RB_Member_User.ContactWay),demodel.ContactWay}, { nameof(Model.Entity.User.RB_Member_User.ContactWay),demodel.ContactWay},
...@@ -1961,12 +2030,17 @@ namespace Mall.Module.Miai ...@@ -1961,12 +2030,17 @@ namespace Mall.Module.Miai
{ nameof(Model.Entity.User.RB_Member_User.AliasName),demodel.AliasName}, { nameof(Model.Entity.User.RB_Member_User.AliasName),demodel.AliasName},
{ nameof(Model.Entity.User.RB_Member_User.UpdateDate),demodel.UpdateDate}, { nameof(Model.Entity.User.RB_Member_User.UpdateDate),demodel.UpdateDate},
{ nameof(Model.Entity.User.RB_Member_User.PostId),demodel.PostId}, { nameof(Model.Entity.User.RB_Member_User.PostId),demodel.PostId},
{ nameof(Model.Entity.User.RB_Member_User.Name),demodel.Name}, { nameof(Model.Entity.User.RB_Member_User.Name),demodel.Name},
{ nameof(Model.Entity.User.RB_Member_User.Photo),demodel.Photo}, { nameof(Model.Entity.User.RB_Member_User.Photo),demodel.Photo},
{ nameof(Model.Entity.User.RB_Member_User.Blacklist),demodel.Blacklist}, { nameof(Model.Entity.User.RB_Member_User.Blacklist),demodel.Blacklist},
{ nameof(Model.Entity.User.RB_Member_User.IsShow),demodel.IsShow},
{ nameof(Model.Entity.User.RB_Member_User.BelongGroupIds),demodel.BelongGroupIds},
{ nameof(Model.Entity.User.RB_Member_User.LookTimes),demodel.LookTimes},
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(Model.Entity.User.RB_Member_User.Id), FiledName=nameof(Model.Entity.User.RB_Member_User.Id),
FiledValue=demodel.Id, FiledValue=demodel.Id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1990,6 +2064,17 @@ namespace Mall.Module.Miai ...@@ -1990,6 +2064,17 @@ namespace Mall.Module.Miai
return flag; return flag;
} }
/// <summary>
/// 批量修改用户分组
/// </summary>
/// <param name="BelongGroupIds"></param>
/// <param name="UserIds"></param>
/// <returns></returns>
public bool BatchSetMemberGroupModule(string BelongGroupIds,string UserIds)
{
return member_UserRepository.BatchUpdateMemberGroupRepository(BelongGroupIds, UserIds);
}
#endregion #endregion
...@@ -2110,7 +2195,7 @@ namespace Mall.Module.Miai ...@@ -2110,7 +2195,7 @@ namespace Mall.Module.Miai
/// <returns></returns> /// <returns></returns>
public bool AddOrUpdateDianZan(RB_MiAi_DianZan_Extend model) public bool AddOrUpdateDianZan(RB_MiAi_DianZan_Extend model)
{ {
bool flag = false; bool flag;
try try
{ {
int Id = 0; int Id = 0;
...@@ -2122,15 +2207,18 @@ namespace Mall.Module.Miai ...@@ -2122,15 +2207,18 @@ namespace Mall.Module.Miai
else else
{ {
Id = model.ID; Id = model.ID;
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_MiAi_DianZan_Extend.UpdateDate),System.DateTime.Now}, { nameof(RB_MiAi_DianZan_Extend.UpdateDate),System.DateTime.Now},
{ nameof(RB_MiAi_DianZan_Extend.Status),model.Status} { nameof(RB_MiAi_DianZan_Extend.Status),model.Status}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_MiAi_DianZan_Extend.ID), FiledName=nameof(RB_MiAi_DianZan_Extend.ID),
FiledValue=model.ID, FiledValue=model.ID,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
flag = miAiDianZanRepository.Update(keyValues, wheres); flag = miAiDianZanRepository.Update(keyValues, wheres);
......
Mall.Module.User/MemberGroupModule.cs 0 → 100644
View file @ 11e888dd
using Mall.Common.Enum;
using Mall.Model.Extend.User;
using Mall.Repository.User;
using System.Collections.Generic;
using VT.FW.DB;
using System.Linq;
namespace Mall.Module.User
{
/// <summary>
/// 用户分组处理类
/// </summary>
public class MemberGroupModule
{
/// <summary>
/// 用户分组仓储层对象
/// </summary>
private readonly RB_Member_GroupRepository member_GroupRepository = new RB_Member_GroupRepository();
/// <summary>
/// 获取用户分组分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Group_Extend> GetMemberGroupPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Member_Group_Extend query)
{
var list= member_GroupRepository.GetMemberGroupPageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0)
{
string groupIds = string.Join(",", list.Select(qitem => qitem.LookGroupIds));
List<int> idList = Common.ConvertHelper.StringToList(groupIds);
var groupList = GetMemberGroupListModule(new RB_Member_Group_Extend()
{
Q_GroupIds = string.Join(",", idList)
});
foreach (var item in list)
{
item.LookGroupList = new List<object>();
if (item.GroupIdList != null && item.GroupIdList.Count > 0)
{
foreach (var sItem in item.GroupIdList)
{
var tempGroup = groupList.Where(qitem => qitem.GroupId == sItem)?.FirstOrDefault();
if (tempGroup != null && tempGroup.GroupId > 0)
{
item.LookGroupList.Add(new
{
tempGroup.GroupId,
tempGroup.GroupName,
});
}
}
}
}
}
return list;
}
/// <summary>
/// 获取用户分组列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Group_Extend> GetMemberGroupListModule(RB_Member_Group_Extend query)
{
return member_GroupRepository.GetMemberGroupListRepository(query);
}
/// <summary>
/// 新增修改用户分组
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetMemberGroupModule(RB_Member_Group_Extend model)
{
bool flag;
if (model.GroupId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Member_Group_Extend.GroupName),model.GroupName },
{nameof(RB_Member_Group_Extend.LookGroupIds),model.LookGroupIds },
{nameof(RB_Member_Group_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Member_Group_Extend.UpdateDate),model.UpdateDate },
};
flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), model.GroupId));
}
else
{
var newId = member_GroupRepository.Insert(model);
model.GroupId = newId;
flag = newId > 0;
}
return flag;
}
/// <summary>
/// 根据编号获取用户分组实体
/// </summary>
/// <param name="GroupId"></param>
/// <returns></returns>
public RB_Member_Group_Extend GetMemberGroupModule(object GroupId)
{
var model = member_GroupRepository.GetEntity<RB_Member_Group_Extend>(GroupId);
return model;
}
/// <summary>
/// 设置默认分组
/// </summary>
/// <param name="GroupId"></param>
/// <param name="MallBaseId"></param>
/// <returns></returns>
public bool SetDefaultGroupModule(int GroupId,int MallBaseId)
{
bool flag = member_GroupRepository.UpdateIsDefaultRepository(MallBaseId);
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Member_Group_Extend.IsDefault),1 }
};
flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), GroupId));
return flag;
}
/// <summary>
/// 根据编号删除用户分组
/// </summary>
/// <param name="GroupId"></param>
/// <returns></returns>
public bool RemoveMemberGroupModule(object GroupId)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Member_Group_Extend.Status),(int)DateStateEnum.Delete },
};
bool flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), GroupId));
return flag;
}
}
}
Mall.Module.User/MemberLookModule.cs 0 → 100644
View file @ 11e888dd
using Mall.Model.Extend.User;
using Mall.Repository.User;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Module.User
{
/// <summary>
/// 用户查看微信日志处理类
/// </summary>
public class MemberLookModule
{
/// <summary>
/// 用户查看微信日志仓储层对象
/// </summary>
private readonly RB_Member_LookRepository member_LookRepository = new RB_Member_LookRepository();
/// <summary>
/// 获取用户查看微信日志分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Look_Extend> GetMemberLookPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Member_Look_Extend query)
{
return member_LookRepository.GetMemberLookPageRepository(pageIndex, pageSize, out rowsCount, query);
}
/// <summary>
/// 获取用户查看日志列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Look_Extend> GetMemberLookListModule(RB_Member_Look_Extend query)
{
return member_LookRepository.GetMemberLookListRepository(query);
}
/// <summary>
/// 新增用户查看日志
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool AddMemberLookModule(RB_Member_Look_Extend model)
{
var newId = member_LookRepository.Insert(model);
model.LookId = newId;
return newId > 0;
}
}
}
Mall.Module.User/UserModule.cs
View file @ 11e888dd
...@@ -5523,26 +5523,31 @@ namespace Mall.Module.User ...@@ -5523,26 +5523,31 @@ namespace Mall.Module.User
public object GetHpDistributorGoodsInfo(string categoryIds, decimal costPrice, int tenantId, int mallBaseId) public object GetHpDistributorGoodsInfo(string categoryIds, decimal costPrice, int tenantId, int mallBaseId)
{ {
//判断是否开启和平返佣 //判断是否开启和平返佣
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
FiledName=nameof(RB_Distributor_HPCommission_Extend.Status), new WhereHelper()
FiledValue=0, {
OperatorEnum=OperatorEnum.Equal FiledName=nameof(RB_Distributor_HPCommission_Extend.Status),
FiledValue=0,
OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
FiledName=nameof(RB_Distributor_HPCommission_Extend.Enabled), {
FiledValue=1, FiledName=nameof(RB_Distributor_HPCommission_Extend.Enabled),
OperatorEnum=OperatorEnum.Equal FiledValue=1,
OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
FiledName=nameof(RB_Distributor_HPCommission_Extend.TenantId), {
FiledValue=tenantId, FiledName=nameof(RB_Distributor_HPCommission_Extend.TenantId),
OperatorEnum=OperatorEnum.Equal FiledValue=tenantId,
OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
FiledName=nameof(RB_Distributor_HPCommission_Extend.MallBaseId), {
FiledValue=mallBaseId, FiledName=nameof(RB_Distributor_HPCommission_Extend.MallBaseId),
OperatorEnum=OperatorEnum.Equal FiledValue=mallBaseId,
OperatorEnum=OperatorEnum.Equal
} }
}; };
if (!distributor_HPCommissionRepository.Exists(wheres)) if (!distributor_HPCommissionRepository.Exists(wheres))
......
Mall.Repository/User/RB_Member_GroupRepository.cs 0 → 100644
View file @ 11e888dd
using Mall.Common.Enum;
using Mall.Model.Entity.User;
using Mall.Model.Extend.User;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VT.FW.DB.Dapper;
namespace Mall.Repository.User
{
/// <summary>
/// 用户分组仓储层
/// </summary>
public class RB_Member_GroupRepository : BaseRepository<RB_Member_Group>
{
/// <summary>
/// 获取用户分组分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Group_Extend> GetMemberGroupPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Member_Group_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Member_Group AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.GroupName))
{
builder.AppendFormat(" AND A.{0} LIKE @GroupName ", nameof(RB_Member_Group_Extend.GroupName));
parameters.Add("GroupName", "%" + query.GroupName.Trim() + "%");
}
}
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Member_Group_Extend.GroupId));
return GetPage<RB_Member_Group_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取用户分组列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Group_Extend> GetMemberGroupListRepository(RB_Member_Group_Extend query)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Member_Group AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.GroupName))
{
builder.AppendFormat(" AND A.{0} LIKE @GroupName ", nameof(RB_Member_Group_Extend.GroupName));
parameters.Add("GroupName", "%" + query.GroupName.Trim() + "%");
}
if (!string.IsNullOrEmpty(query.Q_GroupIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Member_Group_Extend.GroupId), query.Q_GroupIds);
}
if (query.IsQueryDefault == 1)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Member_Group_Extend.IsDefault), 1);
}
}
return Get<RB_Member_Group_Extend>(builder.ToString(), parameters).ToList();
}
/// <summary>
/// 修改默认分组
/// </summary>
/// <param name="MallBaseId"></param>
/// <returns></returns>
public bool UpdateIsDefaultRepository(int MallBaseId)
{
string sql = string.Format(" UPDATE RB_Member_Group SET IsDefault=0 WHERE MallBaseId={0} ", MallBaseId);
return base.Execute(sql)>0;
}
}
}
Mall.Repository/User/RB_Member_LookRepository.cs 0 → 100644
View file @ 11e888dd
using Mall.Model.Entity.User;
using Mall.Model.Extend.User;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.User
{
/// <summary>
/// 用户查看微信日志仓储层
/// </summary>
public class RB_Member_LookRepository:BaseRepository<RB_Member_Look>
{
/// <summary>
/// 获取用户查看微信日志分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Look_Extend> GetMemberLookPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Member_Look_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Member_Look AS A
WHERE 1=1
");
if (query != null)
{
if (query.TenantId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.MallBaseId), query.MallBaseId);
}
}
return GetPage<RB_Member_Look_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
/// <summary>
/// 获取用户查看日志列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Member_Look_Extend> GetMemberLookListRepository( RB_Member_Look_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Member_Look AS A
WHERE 1=1
");
if (query != null)
{
if (query.TenantId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Member_Look_Extend.MallBaseId), query.MallBaseId);
}
}
return Get<RB_Member_Look_Extend>(builder.ToString()).ToList();
}
}
}
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ 11e888dd
...@@ -609,9 +609,7 @@ select * from RB_Member_User where {where} order by CreateDate desc ...@@ -609,9 +609,7 @@ select * from RB_Member_User where {where} order by CreateDate desc
where += $@" and {nameof(RB_Member_User.SmallShopId)}=0"; where += $@" and {nameof(RB_Member_User.SmallShopId)}=0";
} }
} }
if (!string.IsNullOrEmpty(dmodel.UserIds)) if (!string.IsNullOrEmpty(dmodel.UserIds))
{ {
where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})"; where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
...@@ -1360,28 +1358,32 @@ FROM ...@@ -1360,28 +1358,32 @@ FROM
where += $@" and t.{nameof(RB_Member_MiaiUser_Extend.EducationType)} ={(int)dmodel.EducationType}"; where += $@" and t.{nameof(RB_Member_MiaiUser_Extend.EducationType)} ={(int)dmodel.EducationType}";
} }
//if (dmodel.IsEmptyUserPhoto == 1)
//{
// where += $@" and IFNULL(a.{nameof(RB_Member_User.Photo)},'')=''";
//}
//HK06-01新增查询条件 //HK06-01新增查询条件
if (dmodel.OpenId != null && !string.IsNullOrWhiteSpace(dmodel.OpenId)) if (dmodel.OpenId != null && !string.IsNullOrWhiteSpace(dmodel.OpenId))
{ {
where += $@" and t.{nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'"; where += $@" and t.{nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'";
} }
//if (dmodel.IsSelectCommpany == 1) if (dmodel.Q_BelongGroup_Ids != null && dmodel.Q_BelongGroup_Ids.Count > 0)
//{ {
// where += $@" and a.{nameof(RB_Member_User.Id)} between 5 and 100 "; string tempStr = "";
//} for (var i = 0; i < dmodel.Q_BelongGroup_Ids.Count; i++)
{
if (i > 0)
{
tempStr += " OR ";
}
tempStr += string.Format(" FIND_IN_SET('{0}',t.BelongGroupIds) ", dmodel.Q_BelongGroup_Ids[i]);
}
if (!string.IsNullOrWhiteSpace(tempStr))
{
where += string.Format(" AND ({0}) ", tempStr);
}
}
string orderBy = "t.CreateDate desc"; string orderBy = "t.CreateDate desc";
//if (dmodel.MinUserId > 0)
//{
// where += $@" and a.{nameof(RB_Member_User.Id)}>{dmodel.MinUserId}";
// orderBy = "a.Id asc";
//}
string sql = $@" string sql = $@"
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 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();
...@@ -1876,5 +1878,19 @@ GROUP BY u.Id)t"; ...@@ -1876,5 +1878,19 @@ GROUP BY u.Id)t";
return obj == null ? 0 : Convert.ToInt32(obj); return obj == null ? 0 : Convert.ToInt32(obj);
} }
#endregion #endregion
/// <summary>
/// 批量修改用户分组
/// </summary>
/// <param name="BelongGroupIds"></param>
/// <param name="UserIds"></param>
/// <returns></returns>
public bool BatchUpdateMemberGroupRepository(string BelongGroupIds, string UserIds)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(" UPDATE rb_member_user SET BelongGroupIds='{0}' WHERE Id IN({1}) ", BelongGroupIds, UserIds);
return base.Execute(builder.ToString()) > 0;
}
} }
} }
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ 11e888dd
...@@ -2612,7 +2612,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -2612,7 +2612,7 @@ namespace Mall.WebApi.Controllers.Education
var Id = parms.GetInt("Id", 0); var Id = parms.GetInt("Id", 0);
var ApplyForCancelStatus = parms.GetInt("ApplyForCancelStatus", 0);//申请取消审核状态 1同意 2拒绝 var ApplyForCancelStatus = parms.GetInt("ApplyForCancelStatus", 0);//申请取消审核状态 1同意 2拒绝
var RejectRemark = parms.GetStringValue("RejectRemark");//拒绝备注 var RejectRemark = parms.GetStringValue("RejectRemark");//拒绝备注
bool flag = false; bool flag;
if (Id <= 0) if (Id <= 0)
{ {
return ApiResult.ParamIsNull("请传递"); return ApiResult.ParamIsNull("请传递");
......
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @ 11e888dd
...@@ -28,6 +28,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -28,6 +28,12 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
private readonly MiaiModule miaiModule = new MiaiModule(); private readonly MiaiModule miaiModule = new MiaiModule();
private readonly Module.Education.PointModule pointModule = new Module.Education.PointModule(); private readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
/// <summary>
/// 用户查看微信日志处理类
/// </summary>
private readonly MemberLookModule memberLookModule = new MemberLookModule();
#region 活动版块 #region 活动版块
/// <summary> /// <summary>
/// 获取活动版块分页列表 /// 获取活动版块分页列表
...@@ -525,7 +531,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -525,7 +531,6 @@ namespace Mall.WebApi.Controllers.MallBase
#endregion #endregion
#region 星星商品 #region 星星商品
[HttpPost] [HttpPost]
public ApiResult GetStarsGoodsPageList() public ApiResult GetStarsGoodsPageList()
...@@ -776,7 +781,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -776,7 +781,6 @@ namespace Mall.WebApi.Controllers.MallBase
#endregion #endregion
#region 会员中心 #region 会员中心
/// <summary> /// <summary>
/// 获取用户分页列表 /// 获取用户分页列表
...@@ -810,6 +814,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -810,6 +814,12 @@ namespace Mall.WebApi.Controllers.MallBase
YearMoney = param.GetInt("YearMoney"), YearMoney = param.GetInt("YearMoney"),
EndYearMoney = param.GetInt("EndYearMoney"), EndYearMoney = param.GetInt("EndYearMoney"),
}; };
var groupIds = param.GetStringValue("GroupIdList");
if (!string.IsNullOrEmpty(groupIds))
{
var idList = JsonHelper.DeserializeObject<List<int>>(groupIds);
demodel.Q_BelongGroup_Ids = idList;
}
demodel.TenantId = Convert.ToInt32(parms.uid); demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
var list = miaiModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = miaiModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
...@@ -858,7 +868,11 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -858,7 +868,11 @@ namespace Mall.WebApi.Controllers.MallBase
x.IsFaTie, x.IsFaTie,
x.SuperiorName, x.SuperiorName,
x.SuperiorId, x.SuperiorId,
x.BaseInfoId x.BaseInfoId,
x.IsShow,
x.LookTimes,
x.LookGroupList,
x.BelongGroupList,
}); ; }); ;
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
...@@ -1073,7 +1087,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1073,7 +1087,6 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
var model = miaiModule.GetMemberUserInfo(UserId); var model = miaiModule.GetMemberUserInfo(UserId);
if (model.TenantId != Convert.ToInt32(requestParm.uid)) if (model.TenantId != Convert.ToInt32(requestParm.uid))
{ {
...@@ -1184,11 +1197,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1184,11 +1197,13 @@ namespace Mall.WebApi.Controllers.MallBase
DWProvince = oldBaseInfo.DWProvince ?? 0, DWProvince = oldBaseInfo.DWProvince ?? 0,
DWCity = oldBaseInfo.DWCity ?? 0, DWCity = oldBaseInfo.DWCity ?? 0,
DWDistrict = oldBaseInfo.DWDistrict ?? 0, DWDistrict = oldBaseInfo.DWDistrict ?? 0,
model.IsShow,
model.BelongGroupIds,
model.BelongGroupIdList,
model.LookTimes,
}); });
} }
/// <summary> /// <summary>
/// 后台更新用户信息 /// 后台更新用户信息
/// </summary> /// </summary>
...@@ -1197,7 +1212,30 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1197,7 +1212,30 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult SetMemberUserInfoForHT() public ApiResult SetMemberUserInfoForHT()
{ {
var parms = RequestParm; var parms = RequestParm;
RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(parms.msg.ToString()); var jobj = JObject.Parse(parms.msg.ToString());
RB_Member_User_Extend demodel = new RB_Member_User_Extend()
{
Id=jobj.GetInt("Id"),
MemberGrade=jobj.GetInt("MemberGrade"),
SuperiorId=jobj.GetInt("SuperiorId"),
ContactWay=jobj.GetStringValue("ContactWay"),
Remark=jobj.GetStringValue("Remark"),
AliasName=jobj.GetStringValue("AliasName"),
UpdateDate=DateTime.Now,
PostId=jobj.GetInt("PostId"),
Name=jobj.GetStringValue("Name"),
Photo=jobj.GetStringValue("Photo"),
Blacklist=jobj.GetInt("Blacklist"),
IsShow=jobj.GetInt("IsShow"),
LookTimes=jobj.GetInt("LookTimes"),
};
List<int> groupIds = new List<int>();
if (!string.IsNullOrEmpty(jobj.GetStringValue("BelongGroupIdList")))
{
groupIds = JsonHelper.DeserializeObject<List<int>>(jobj.GetStringValue("BelongGroupIdList"));
}
demodel.BelongGroupIds = string.Join(",", groupIds);
RB_MiAi_BaseInfo_Extend baseInfo = JsonConvert.DeserializeObject<RB_MiAi_BaseInfo_Extend>(parms.msg.ToString()); RB_MiAi_BaseInfo_Extend baseInfo = JsonConvert.DeserializeObject<RB_MiAi_BaseInfo_Extend>(parms.msg.ToString());
if (demodel.Id <= 0) if (demodel.Id <= 0)
{ {
...@@ -1252,10 +1290,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1252,10 +1290,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Failed("请选择定位省市区"); return ApiResult.Failed("请选择定位省市区");
} }
//if (baseInfo.YearMoney == 0)
//{
// return ApiResult.Failed("请输入年收入");
//}
if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0) if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
{ {
return ApiResult.Failed("请选择学历"); return ApiResult.Failed("请选择学历");
...@@ -1300,6 +1335,25 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1300,6 +1335,25 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
/// <summary>
/// 批量修改用户分组
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult BatchSetMemberGroup()
{
var jobj = JObject.Parse(RequestParm.msg.ToString());
string userIds = jobj.GetStringValue("UserIds");
List<int> groupIds = new List<int>();
if (!string.IsNullOrEmpty(jobj.GetStringValue("BelongGroupIdList")))
{
groupIds = JsonHelper.DeserializeObject<List<int>>(jobj.GetStringValue("BelongGroupIdList"));
}
string BelongGroupIds = string.Join(",", groupIds);
bool flag= miaiModule.BatchSetMemberGroupModule(BelongGroupIds, userIds);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary> /// <summary>
/// 更新用户的发帖权限 /// 更新用户的发帖权限
...@@ -1344,6 +1398,27 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1344,6 +1398,27 @@ namespace Mall.WebApi.Controllers.MallBase
#endregion
#region 用户查看微信日子处理类
/// <summary>
/// 获取用户分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult AddWechatLog()
{
JObject param = JObject.Parse(RequestParm.msg.ToString());
var model = new RB_Member_Look_Extend()
{
};
memberLookModule.AddMemberLookModule()
return ApiResult.Success("", pagelist);
}
#endregion #endregion
} }
......
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @ 11e888dd
...@@ -43,6 +43,9 @@ namespace Mall.WebApi.Controllers.User ...@@ -43,6 +43,9 @@ namespace Mall.WebApi.Controllers.User
private readonly Module.Education.ActivityModule activityModule = new Module.Education.ActivityModule(); private readonly Module.Education.ActivityModule activityModule = new Module.Education.ActivityModule();
private readonly Module.Reserve.ReserveModule reserveModule = new Module.Reserve.ReserveModule(); private readonly Module.Reserve.ReserveModule reserveModule = new Module.Reserve.ReserveModule();
private readonly Module.User.MemberGroupModule memberGroupModule = new MemberGroupModule();
#region 小程序登录 #region 小程序登录
/// <summary> /// <summary>
/// 登录注册 /// 登录注册
...@@ -77,6 +80,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -77,6 +80,8 @@ namespace Mall.WebApi.Controllers.User
CounponPassword = parms.GetInt("CounponPassword", 3), CounponPassword = parms.GetInt("CounponPassword", 3),
KeyWord = parms.GetStringValue("KeyWord"), KeyWord = parms.GetStringValue("KeyWord"),
EduSchoolId = parms.GetInt("EduSchoolId", 0), EduSchoolId = parms.GetInt("EduSchoolId", 0),
IsShow = 1,
LookTimes = 5,
}; };
if (requestParm.TenantId <= 0) if (requestParm.TenantId <= 0)
{ {
...@@ -94,8 +99,22 @@ namespace Mall.WebApi.Controllers.User ...@@ -94,8 +99,22 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull("请传递唯一码"); return ApiResult.ParamIsNull("请传递唯一码");
} }
//查询用户默认分组
var groupModel = memberGroupModule.GetMemberGroupListModule(new RB_Member_Group_Extend()
{
TenantId = requestParm.TenantId,
MallBaseId = requestParm.MallBaseId,
IsQueryDefault = 1
})?.FirstOrDefault();
if (groupModel != null && groupModel.GroupId > 0)
{
demodel.BelongGroupIds = groupModel?.GroupId.ToString();
//int LoginUserId = 0; }
else
{
demodel.BelongGroupIds = "";
}
bool IsLogin = false; bool IsLogin = false;
var opcache = UserReidsCache.GetMiniAppUsetOpenId(demodel.OpenId); var opcache = UserReidsCache.GetMiniAppUsetOpenId(demodel.OpenId);
if (opcache != null && !string.IsNullOrEmpty(opcache.UserOpenId)) if (opcache != null && !string.IsNullOrEmpty(opcache.UserOpenId))
...@@ -106,24 +125,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -106,24 +125,6 @@ namespace Mall.WebApi.Controllers.User
else else
{ {
IsLogin = true; IsLogin = true;
//if (string.IsNullOrEmpty(requestParm.token))
//{
// return ApiResult.ParamIsNull("请传递唯一码");
//}
//else
//{
// LoginUserId = JWTValidatGetUserId(requestParm.token);
// if (LoginUserId <= 0)
// {
// return ApiResult.ParamIsNull("请传递唯一码");
// }
// var loginModel = UserReidsCache.GetAppletUserLoginInfo(LoginUserId);
// demodel.OpenId = loginModel?.OpenId ?? "";
// if (string.IsNullOrEmpty(demodel.OpenId))
// {
// return ApiResult.ParamIsNull("请传递唯一码");
// }
//}
} }
Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend couponResult = new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend(); Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend couponResult = new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend();
...@@ -291,11 +292,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -291,11 +292,8 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo); return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
} }
} }
return ApiResult.CouponFailed(ResultCode.Fail, 1, ""); return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
// return ApiResult.Failed("注册失败，请联系管理员");
} }
else else
{ {
...@@ -304,7 +302,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -304,7 +302,6 @@ namespace Mall.WebApi.Controllers.User
if (umodel == null) if (umodel == null)
{ {
return ApiResult.CouponFailed(ResultCode.Fail, 1, ""); return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
// return ApiResult.Failed("未能查询到用户信息");
} }
if (umodel.Blacklist == 1) if (umodel.Blacklist == 1)
{ {
...@@ -398,9 +395,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -398,9 +395,7 @@ namespace Mall.WebApi.Controllers.User
}; };
activityModule.SetEduBaseInfo(eduBaseInfo); activityModule.SetEduBaseInfo(eduBaseInfo);
} }
} }
UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime); UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
if (isGiveCoupon) if (isGiveCoupon)
{ {
...@@ -410,9 +405,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -410,9 +405,6 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo); return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
} }
// return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
//return ApiResult.Success("", appletUserInfo);
} }
} }
...@@ -433,7 +425,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -433,7 +425,6 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull("请传递小程序id"); return ApiResult.ParamIsNull("请传递小程序id");
} }
var appletWeChatModel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = requestParm.MallBaseId }); var appletWeChatModel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = requestParm.MallBaseId });
if (appletWeChatModel == null) if (appletWeChatModel == null)
{ {
...@@ -457,37 +448,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -457,37 +448,8 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
/// <summary>
/// token校验
/// </summary>
/// <param name="actionContext"></param>
/// <param name="token"></param>
private int JWTValidatGetUserId( string token)
{
int UserID = 0;
if (!string.IsNullOrEmpty(token))
{
//解析token，校验是否失效
try
{
var user= ApiTokenHelper.ParsingToken(token);
Int32.TryParse((user?.uid ?? "0"), out UserID);
}
catch (Exception)
{
}
}
return UserID;
}
/// <summary> /// <summary>
/// 登录注册 /// 登录注册
/// </summary> /// </summary>
...@@ -510,7 +472,15 @@ namespace Mall.WebApi.Controllers.User ...@@ -510,7 +472,15 @@ namespace Mall.WebApi.Controllers.User
UserPageType = (Common.Enum.Goods.GoodsPageTypeEnum)parms.GetInt("UserPageType", 0), UserPageType = (Common.Enum.Goods.GoodsPageTypeEnum)parms.GetInt("UserPageType", 0),
CounponPassword = parms.GetInt("CounponPassword", 3), CounponPassword = parms.GetInt("CounponPassword", 3),
KeyWord = parms.GetStringValue("KeyWord"), KeyWord = parms.GetStringValue("KeyWord"),
IsShow=parms.GetInt("IsShow"),
LookTimes = parms.GetInt("LookTimes"),
}; };
List<int> groupIds = new List<int>();
if (!string.IsNullOrEmpty(parms.GetStringValue("BelongGroupIdList")))
{
groupIds = JsonHelper.DeserializeObject<List<int>>(parms.GetStringValue("BelongGroupIdList"));
}
demodel.BelongGroupIds = string.Join(",", groupIds);
Model.Extend.Miai.RB_MiAi_BaseInfo_Extend baseInfo = JsonConvert.DeserializeObject<Model.Extend.Miai.RB_MiAi_BaseInfo_Extend>(requestParm.msg.ToString()); Model.Extend.Miai.RB_MiAi_BaseInfo_Extend baseInfo = JsonConvert.DeserializeObject<Model.Extend.Miai.RB_MiAi_BaseInfo_Extend>(requestParm.msg.ToString());
if (requestParm.TenantId <= 0) if (requestParm.TenantId <= 0)
...@@ -552,10 +522,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -552,10 +522,7 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.Failed("请选择身高"); return ApiResult.Failed("请选择身高");
} }
//if (baseInfo.YearMoney == 0)
//{
// return ApiResult.Failed("请输入年收入");
//}
if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0) if (!baseInfo.EducationType.HasValue || (int)baseInfo.EducationType == 0)
{ {
return ApiResult.Failed("请选择学历"); return ApiResult.Failed("请选择学历");
...@@ -597,7 +564,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -597,7 +564,7 @@ namespace Mall.WebApi.Controllers.User
//验证是否新用户 //验证是否新用户
if (!userModule.ValidateUserOpenId(demodel.OpenId, demodel.Source, requestParm.TenantId, requestParm.MallBaseId)) if (!userModule.ValidateUserOpenId(demodel.OpenId, demodel.Source, requestParm.TenantId, requestParm.MallBaseId))
{ {
LogHelper.WriteInfo(demodel.OpenId + "，SuperiorId:" + (demodel.SuperiorId ?? 0));
//注册新用户 //注册新用户
if (string.IsNullOrEmpty(demodel.Name)) if (string.IsNullOrEmpty(demodel.Name))
{ {
...@@ -739,7 +706,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -739,7 +706,7 @@ namespace Mall.WebApi.Controllers.User
} }
return ApiResult.CouponFailed(ResultCode.Fail, 1, ""); return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
// return ApiResult.Failed("注册失败，请联系管理员");
} }
else else
{ {
...@@ -748,7 +715,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -748,7 +715,7 @@ namespace Mall.WebApi.Controllers.User
if (umodel == null) if (umodel == null)
{ {
return ApiResult.CouponFailed(ResultCode.Fail, 1, ""); return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
// return ApiResult.Failed("未能查询到用户信息"); ;
} }
if (umodel.Blacklist == 1) if (umodel.Blacklist == 1)
{ {
......
Mall.WebApi/Controllers/User/UserController.cs
View file @ 11e888dd
...@@ -50,6 +50,11 @@ namespace Mall.WebApi.Controllers.User ...@@ -50,6 +50,11 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
private readonly MiniprogramAdminModule adminModule = new MiniprogramAdminModule(); private readonly MiniprogramAdminModule adminModule = new MiniprogramAdminModule();
/// <summary>
/// 用户分组处理类对象
/// </summary>
private readonly MemberGroupModule memberGroupModule = new MemberGroupModule();
#region 用户管理 #region 用户管理
/// <summary> /// <summary>
/// 获取用户分页列表 /// 获取用户分页列表
...@@ -2513,7 +2518,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -2513,7 +2518,6 @@ namespace Mall.WebApi.Controllers.User
} }
#endregion #endregion
#region 用户转移 #region 用户转移
/// <summary> /// <summary>
...@@ -3646,5 +3650,137 @@ namespace Mall.WebApi.Controllers.User ...@@ -3646,5 +3650,137 @@ namespace Mall.WebApi.Controllers.User
UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
})); }));
} }
#region 用户分组管理
/// <summary>
/// 获取用户分组分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMemberGroupPage()
{
var parms = RequestParm;
JObject param = JObject.Parse(parms.msg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Member_Group_Extend demodel = new RB_Member_Group_Extend()
{
GroupName = param.GetStringValue("GroupName"),
};
demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId;
var list = memberGroupModule.GetMemberGroupPageModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
List<object> result = new List<object>();
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
result.Add(new
{
item.GroupId,
item.GroupName,
item.LookGroupIds,
item.GroupIdList,
item.LookGroupList,
item.IsDefault,
CreateDate = Common.ConvertHelper.FormatTime(item.CreateDate),
});
}
}
pagelist.pageData = result;
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取用户分组下拉列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMemberGroupList()
{
var parms = RequestParm;
JObject param = JObject.Parse(parms.msg.ToString());
RB_Member_Group_Extend demodel = new RB_Member_Group_Extend()
{
GroupName = param.GetStringValue("GroupName"),
};
demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId;
var list = memberGroupModule.GetMemberGroupListModule(demodel);
return ApiResult.Success("", list);
}
/// <summary>
/// 获取用户分组信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetMemberGroup()
{
var requestParm = RequestParm;
var parms = JObject.Parse(requestParm.msg.ToString());
RB_Member_Group_Extend model = new RB_Member_Group_Extend()
{
GroupId= parms.GetInt("GroupId", 0),
GroupName=parms.GetStringValue("GroupName"),
};
var GroupIdList = new List<int>();
if (!string.IsNullOrEmpty(parms.GetStringValue("GroupIdList")))
{
GroupIdList = JsonHelper.DeserializeObject<List<int>>(parms.GetStringValue("GroupIdList"));
}
model.LookGroupIds = string.Join(",", GroupIdList);
model.TenantId = requestParm.TenantId;
model.MallBaseId = requestParm.MallBaseId;
model.Status = Common.Enum.DateStateEnum.Normal;
model.CreateBy = requestParm.TenantId;
model.CreateDate = DateTime.Now;
model.UpdateBy = requestParm.TenantId;
model.UpdateDate = DateTime.Now;
var flag = memberGroupModule.SetMemberGroupModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取用户分组信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMemberGroup()
{
var parms = JObject.Parse(RequestParm.msg.ToString());
int GroupId = parms.GetInt("GroupId", 0);
var model = memberGroupModule.GetMemberGroupModule(GroupId);
return ApiResult.Success(data: model);
}
/// <summary>
/// 设置默认分组
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetDefaultGroup()
{
var parms = JObject.Parse(RequestParm.msg.ToString());
int GroupId = parms.GetInt("GroupId", 0);
var model = memberGroupModule.SetDefaultGroupModule(GroupId, RequestParm.MallBaseId);
return ApiResult.Success(data: model);
}
/// <summary>
/// 删除用户分组信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DeleteMemberGroup()
{
var parms = JObject.Parse(RequestParm.msg.ToString());
int GroupId = parms.GetInt("GroupId", 0);
var flag = memberGroupModule.RemoveMemberGroupModule(GroupId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
} }
} }
\ 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