|
@@ -55,36 +55,39 @@ var mysqlTables = map[string]string{
|
|
|
|
|
|
func GetRoleNewestInfoService(AppId, MgoUserId string, NewUserId, AccountId, EntId, EntUserId, PositionType, PositionId int64) (roleNewestInfo *NewestInfo, flag string) {
|
|
func GetRoleNewestInfoService(AppId, MgoUserId string, NewUserId, AccountId, EntId, EntUserId, PositionType, PositionId int64) (roleNewestInfo *NewestInfo, flag string) {
|
|
powerCheck := IC.Middleground.PowerCheckCenter.Check(AppId, MgoUserId, NewUserId, AccountId, EntId, PositionType, PositionId)
|
|
powerCheck := IC.Middleground.PowerCheckCenter.Check(AppId, MgoUserId, NewUserId, AccountId, EntId, PositionType, PositionId)
|
|
|
|
+ thisUserId := MC.If(PositionType == 1, MC.InterfaceToStr(EntUserId), MC.InterfaceToStr(NewUserId)).(string)
|
|
|
|
+ thisNewUserId := MC.If(PositionType == 1, EntUserId, NewUserId).(int64)
|
|
if powerCheck.Member.Status > 0 {
|
|
if powerCheck.Member.Status > 0 {
|
|
// 大会员
|
|
// 大会员
|
|
flag = "m"
|
|
flag = "m"
|
|
- if PositionType == int64(1) {
|
|
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
- } else {
|
|
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "m", NewUserId)
|
|
|
|
- }
|
|
|
|
|
|
+ //if PositionType == int64(1) {
|
|
|
|
+ // roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
+ //} else {
|
|
|
|
+ // roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "m", NewUserId)
|
|
|
|
+ //}
|
|
} else if powerCheck.Entniche.Status > 0 && powerCheck.Entniche.PowerSource != 1 && powerCheck.Entniche.IsEntPower == 1 {
|
|
} else if powerCheck.Entniche.Status > 0 && powerCheck.Entniche.PowerSource != 1 && powerCheck.Entniche.IsEntPower == 1 {
|
|
// 商机管理
|
|
// 商机管理
|
|
flag = "e"
|
|
flag = "e"
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
|
|
+ //roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
} else if powerCheck.Vip.Status > 0 {
|
|
} else if powerCheck.Vip.Status > 0 {
|
|
// 超级订阅
|
|
// 超级订阅
|
|
flag = "v"
|
|
flag = "v"
|
|
- if PositionType == int64(1) {
|
|
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
- } else {
|
|
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "v", NewUserId)
|
|
|
|
- }
|
|
|
|
|
|
+ //if PositionType == int64(1) {
|
|
|
|
+ // roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
+ //} else {
|
|
|
|
+ // roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "v", NewUserId)
|
|
|
|
+ //}
|
|
} else {
|
|
} else {
|
|
// 普通用户
|
|
// 普通用户
|
|
flag = "f"
|
|
flag = "f"
|
|
- if PositionType == int64(1) {
|
|
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
- } else {
|
|
|
|
- roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "f", NewUserId)
|
|
|
|
- }
|
|
|
|
|
|
+ //if PositionType == int64(1) {
|
|
|
|
+ // roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
|
|
|
|
+ //} else {
|
|
|
|
+ // roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "f", NewUserId)
|
|
|
|
+ //}
|
|
}
|
|
}
|
|
- return roleNewestInfo, flag
|
|
|
|
|
|
+ thisUserType := MC.If(PositionType == 1, "e", flag).(string)
|
|
|
|
+ return GetNewestInfo(thisUserId, thisUserType, thisNewUserId), flag
|
|
}
|
|
}
|
|
func GetNewestInfo(userId, userType string, newUserId int64) *NewestInfo {
|
|
func GetNewestInfo(userId, userType string, newUserId int64) *NewestInfo {
|
|
nt := &NewestInfo{
|
|
nt := &NewestInfo{
|