分支合并

entity/user.go

@@ -1,14 +1,15 @@
 package entity
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/redis"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	MC "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/redis"
 )
 
 const (
@@ -52,14 +53,10 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 	//查询用户信息
 	data, ok := Mgo.FindById("user", userId, `{"s_phone":1,"s_m_phone":1,i_member_status":1,"s_member_mainid":1,"i_member_sub_status":1,"i_vip_status":1,"o_vipjy":1,"o_jy":1,"l_registedate":1}`)
 	if ok && *data != nil && len(*data) > 0 {
-<<<<<<< HEAD
 		var (
 			isFree = true
 			//domainBool = false //第一版领域化权限判断
 		)
-=======
-		var isFree = true
->>>>>>> master
 		phone, _ := MC.If((*data)["s_phone"] != nil, (*data)["s_phone"], (*data)["s_m_phone"]).(string)
 		if phone != "" {
 			//同一个手机号 多个商机管理角色 其中一个是企业管理员或者部门管理员 查的时候按角色权重排序
@@ -98,10 +95,7 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 			if memberStatus := MC.IntAll((*data)["i_member_status"]); memberStatus > 0 || bigMemberOff {
 				userId := userId
 				if memberStatus > 0 {
-<<<<<<< HEAD
 					//domainBool = true
-=======
->>>>>>> master
 					isFree = false
 					UserPowerMap["0"] = memberStatus
 					//是否是子账号 而且 子账号被启用
@@ -119,10 +113,6 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 			}
 			//VIP用户
 			if vipStatus := MC.IntAll((*data)["i_vip_status"]); vipStatus > 0 {
-<<<<<<< HEAD
-				//domainBool = true
-=======
->>>>>>> master
 				isFree = false
 				UserPowerMap["200"] = vipStatus
 				if vipSet := MC.ObjToMap((*data)["o_vipjy"]); vipSet != nil {
@@ -147,7 +137,6 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 			if Mysql.CountBySql(`select count(*) from privatedata where phone = ?`, phone) > 0 {
 				UserPowerMap["400"] = 1
 			}
-<<<<<<< HEAD
 			//领域化产品权限
 			//第一版：必须是大会员或者超级订阅用户 且留资 留资表：capital_retention；source = 'medical_domain',未留资提示留资信息
 			//第二版：调资源中台rpc获取用户是否有使用领域化产品的权限 无权限则去购买
@@ -161,8 +150,6 @@ func AutoUserPowerInfo(userId, appId string, internalTime int, bigMemberOff bool
 			//UserPowerMap["500"] = 1
 			//}
 			//}
-=======
->>>>>>> master
 		}
 		if UserPowerMap != nil {
 			bytes, err := json.Marshal(UserPowerMap)