liumiaomiao 3 yıl önce
ebeveyn
işleme
72a8bfb76c

+ 1 - 2
src/entnichePc.json

@@ -1,5 +1,4 @@
 {
 	"entnichePcUser": [14595,442,1686,1685,1711],
-	"hideEntnicheMenu": [1711,442],
-	"privateDataPhone": "18530014520,13525530909,13938299083"
+	"hideEntnicheMenu": [1711,442]
 }

+ 2 - 1
src/jfw/front/dataExport.go

@@ -888,7 +888,8 @@ func (this *DataExport) GetPcEntAuth() {
 				}
 			}
 		}
-		if strings.Contains(config.EntnichePcConf.PrivateDataPhone, phone) {
+		userCount := public.Mysql.CountBySql("select count(1) from privatedata where phone=?", phone)
+		if userCount > 0 {
 			privatedata = true
 		}
 	}

+ 5 - 1
src/jfw/front/shorturl.go

@@ -179,13 +179,17 @@ func (s *Short) Article(stype, id string) error {
 		//判断用户是否是vip
 		res, _ = public.MQFW.FindById("user", userId, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
 	}
-	isVip, isMember, isEntniche := false, false, false
+	isVip, isMember, isEntniche, privatedata := false, false, false, false
 
 	isVip = util.IntAll((*res)["i_vip_status"]) == 1 || util.IntAll((*res)["i_vip_status"]) == 2
 	isMember = util.IntAll((*res)["i_member_status"]) > 0
 
 	if phone, _ := util.If(util.ObjToString((*res)["s_phone"]) != "", util.ObjToString((*res)["s_phone"]), util.ObjToString((*res)["s_m_phone"])).(string); phone != "" {
 		isEntniche = public.Mysql.CountBySql(`SELECT count(1) from entniche_user a INNER JOIN entniche_info b on (a.phone=? and a.power=1 and a.ent_id=b.id and b.status>0)`, phone) > 0
+		privatedata = public.Mysql.CountBySql(`select count(1) from privatedata where phone = ?`, phone) > 0
+	}
+	if !isEntniche && privatedata {
+		isEntniche = true
 	}
 	s.T["isVip"] = isVip
 	s.T["isMember"] = isMember

+ 7 - 1
src/jfw/modules/publicapply/src/bidcollection/entity/entity.go

@@ -429,7 +429,7 @@ func GetCollList(c *util.CollList, userid string) map[string]interface{} {
 
 //是否是付费用户 -bool: true:是 fasle:不是
 func Power(userid string) (bool, map[string]interface{}) {
-	isVip, isMember, isEnt := false, false, false
+	isVip, isMember, isEnt, privatedata := false, false, false, false
 	vipstatus := 0
 	phone := ""
 	var registedate int64
@@ -468,6 +468,11 @@ func Power(userid string) (bool, map[string]interface{}) {
 			// if db.Mysql.CountBySql(`select count(1) from entniche_user where phone = ? and power =1`, phone) > 0 {
 			// 	isEnt = true
 			// }
+			//广州移动判断
+			privatedataCount := db.Mysql.CountBySql(`select count(1) from privatedata where phone = ?`, phone)
+			if privatedataCount > 0 {
+				privatedata = true
+			}
 		}
 		registedate, _ = (*data)["l_registedate"].(int64)
 	}
@@ -475,6 +480,7 @@ func Power(userid string) (bool, map[string]interface{}) {
 		"vip":         vipstatus,
 		"member":      isMember,
 		"entniche":    isEnt,
+		"privatedata": privatedata,
 		"registedate": registedate,
 	}
 }

+ 2 - 1
src/web/templates/pc/biddetail_rec.html

@@ -1249,6 +1249,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 			bidmember = res.data.member
 			entniche = res.data.entniche
 			vip = res.data.vip
+      privatedata = res.data.privatedata
 			var subType = {{.T.obj.subtype}}
 			// if(subType == '采购意向' && !bidmember && !entniche && vip <=0){
 			// 	$(".com-prebuilt").removeClass("hidden");
@@ -1258,7 +1259,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 				$(".tip-box .tip-text").eq(0).text('采购意向项目全公开,抢先获知采购项目需求,')
 				$(".tip-box .tip-text").eq(1).text('提前主动介入,中标几率更高!')
 			}
-			if ((subType == '拟建' || subType == '采购意向') && !bidmember && !entniche && vip <=0){
+			if ((subType == '拟建' || subType == '采购意向') && !bidmember && !entniche && vip <=0 && !privatedata){
 				$(".com-prebuilt").removeClass("hidden");
 				$(".com-prebuilt").css('height', '408px')
 				$('.original-text').remove()