提交

src/jfw/front/supsearch.go

@@ -248,59 +248,15 @@ func (p *Pcsearch) PcSearchIndex() error {
 	//高级筛选 仅vip用户可查询
 	var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 	var buyerclass string = ""                    //采购单位类别
-	var selectTypeArr []string                    //筛选查询内容
 	selectType := p.GetString("selectType")
-	isPayedUser := jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser()
+
+	vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+	isPayedUser := vipStatus.IsPayedUser()
+	queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
 	if isPayedUser {
 		buyerclass = p.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
-
-		switch selectType {
-		case "content":
-			selectTypeArr = append(selectTypeArr, "detail")
-			break
-		case "buyer":
-			selectTypeArr = append(selectTypeArr, "mbuyer")
-			break
-		case "winner":
-			selectTypeArr = append(selectTypeArr, "mwinner")
-			break
-		case "agency":
-			selectTypeArr = append(selectTypeArr, "magency")
-			break
-		case "file":
-			selectTypeArr = append(selectTypeArr, "filetext")
-			break
-		case "all":
-			selectTypeArr = append(selectTypeArr, "title", "detail", "mbuyer", "mwinner", "magency", "filetext")
-			break
-		}
-	} else {
-		if selectType == "winner" || selectType == "all" {
-			isOldUser := func() bool { //查询是否是老用户
-				user, _ := public.MQFW.FindById("user", userId, `{"l_registedate":1}`)
-				if user == nil || len(*user) == 0 {
-					return false
-				}
-				registerData, ok := (*user)["l_registedate"].(int64)
-				if ok && registerData < 9999 {
-					return true
-				}
-				return false
-			}()
-			if selectType == "all" {
-				if isOldUser {
-					selectTypeArr = append(selectTypeArr, "title", "detail", "mwinner")
-				}
-			} else if isOldUser { //查询中标企业且是老用户
-				selectTypeArr = append(selectTypeArr, "mwinner")
-			}
-		} else if selectType == "content" {
-			selectTypeArr = append(selectTypeArr, "detail")
-		}
 	}
-	//selectType := "title"
-	//全部(all)、标题(title)  正文(content)  会员: 采购单位(buyer) 中标企业(winner) 招标代理机构(agency) 附件(file)
 
 	//历史导出数据回显
 	if strings.Contains(p.Url(), "?goback") {
@@ -328,7 +284,7 @@ func (p *Pcsearch) PcSearchIndex() error {
 	secondKWS := ""
 	if len(s_word) > 0 || len(industry) > 0 {
 		status = 2
-		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, selectTypeArr, bidSearch_field_1)
+		count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, queryItems, bidSearch_field_1)
 		listSize := 0
 		if list != nil {
 			listSize = len(*list)

src/jfw/front/swordfish.go

@@ -119,54 +119,13 @@ func (m *Front) PcAjaxReq() {
 	//高级筛选 仅vip用户可查询
 	var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 	var buyerclass string = ""                    //采购单位类别
-	var selectTypeArr []string                    //筛选查询内容
-	if jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser() {
+
+	vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+	isPayedUser := vipStatus.IsPayedUser()
+	queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+	if isPayedUser {
 		buyerclass = m.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
-
-		switch selectType {
-		case "content":
-			selectTypeArr = append(selectTypeArr, "detail")
-			break
-		case "buyer":
-			selectTypeArr = append(selectTypeArr, "mbuyer")
-			break
-		case "winner":
-			selectTypeArr = append(selectTypeArr, "mwinner")
-			break
-		case "agency":
-			selectTypeArr = append(selectTypeArr, "magency")
-			break
-		case "file":
-			selectTypeArr = append(selectTypeArr, "filetext")
-			break
-		case "all":
-			selectTypeArr = append(selectTypeArr, "title", "detail", "mbuyer", "mwinner", "magency", "filetext")
-			break
-		}
-	} else {
-		if selectType == "winner" || selectType == "all" {
-			isOldUser := func() bool { //查询是否是老用户
-				user, _ := public.MQFW.FindById("user", userId, `{"l_registedate":1}`)
-				if user == nil || len(*user) == 0 {
-					return false
-				}
-				registerData, ok := (*user)["l_registedate"].(int64)
-				if ok && registerData < 9999 {
-					return true
-				}
-				return false
-			}()
-			if selectType == "all" {
-				if isOldUser {
-					selectTypeArr = append(selectTypeArr, "title", "detail", "mwinner")
-				}
-			} else if isOldUser { //查询中标企业且是老用户
-				selectTypeArr = append(selectTypeArr, "mwinner")
-			}
-		} else if selectType == "content" {
-			selectTypeArr = append(selectTypeArr, "detail")
-		}
 	}
 
 	m.SetSession("selectType", selectType)
@@ -195,7 +154,7 @@ func (m *Front) PcAjaxReq() {
 	if len(s_word) > 0 || len(industry) > 0 {
 		if reqType == "filter" {
 			if status == 1 {
-				count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, selectTypeArr, field)
+				count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, bidsearch.SearchPageSize_PC, true, queryItems, field)
 			}
 		} else if reqType == "bidSearch" {
 			//全文检索限制
@@ -210,7 +169,7 @@ func (m *Front) PcAjaxReq() {
 				if limitFlag {
 					if start == 0 {
 						limit_count := public.Lst.TotalPage * bidsearch.SearchPageSize_PC
-						count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, limit_count, true, selectTypeArr, field)
+						count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, 0, limit_count, true, queryItems, field)
 						if totalPage > int64(public.Lst.TotalPage) {
 							totalPage = int64(public.Lst.TotalPage)
 						}
@@ -219,7 +178,7 @@ func (m *Front) PcAjaxReq() {
 						}
 					}
 				} else {
-					count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, start, bidsearch.SearchPageSize_PC, true, selectTypeArr, field)
+					count, totalPage, list = bidsearch.GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, start, bidsearch.SearchPageSize_PC, true, queryItems, field)
 				}
 				listSize := 0
 				if list != nil {
@@ -482,53 +441,13 @@ func (m *Front) WxsearchlistPaging() {
 			//高级筛选 仅vip用户可查询
 			var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 			var buyerclass string = ""                    //采购单位类别
-			var selectTypeArr []string
-			if jy.GetVipState(public.Mysql, public.MQFW, userId).IsPayedUser() { //超级订阅、大会员、商机管理
+
+			vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+			isPayedUser := vipStatus.IsPayedUser()
+			queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
-				switch selectType {
-				case "content":
-					selectTypeArr = append(selectTypeArr, "detail")
-					break
-				case "buyer":
-					selectTypeArr = append(selectTypeArr, "mbuyer")
-					break
-				case "winner":
-					selectTypeArr = append(selectTypeArr, "mwinner")
-					break
-				case "agency":
-					selectTypeArr = append(selectTypeArr, "magency")
-					break
-				case "file":
-					selectTypeArr = append(selectTypeArr, "filetext")
-					break
-				case "all":
-					selectTypeArr = append(selectTypeArr, "title", "detail", "mbuyer", "mwinner", "magency", "filetext")
-					break
-				}
-			} else {
-				if selectType == "winner" || selectType == "all" {
-					isOldUser := func() bool { //查询是否是老用户
-						user, _ := public.MQFW.FindById("user", userId, `{"l_registedate":1}`)
-						if user == nil || len(*user) == 0 {
-							return false
-						}
-						registerData, ok := (*user)["l_registedate"].(int64)
-						if ok && registerData < 9999 {
-							return true
-						}
-						return false
-					}()
-					if selectType == "all" {
-						if isOldUser {
-							selectTypeArr = append(selectTypeArr, "title", "detail", "mwinner")
-						}
-					} else if isOldUser { //查询中标企业且是老用户
-						selectTypeArr = append(selectTypeArr, "mwinner")
-					}
-				} else if selectType == "content" {
-					selectTypeArr = append(selectTypeArr, "detail")
-				}
 			}
 
 			//全文检索限制
@@ -543,10 +462,10 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_WX, selectTypeArr, filed)
+						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_WX, queryItems, filed)
 					}
 				} else {
-					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_WX, selectTypeArr, filed)
+					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_WX, queryItems, filed)
 				}
 				listSize := 0
 				if list != nil {

src/jfw/modules/app/src/app/front/swordfish.go

@@ -273,54 +273,15 @@ func (m *Front) WxsearchlistPaging() {
 			//高级筛选 仅vip用户可查询
 			var hasBuyerTel, hasWinnerTel string = "", "" //是否有采购单位电话、是否有中标单位电话 y:有 n:没有
 			buyerclass := ""                              //采购单位类别
-			var selectTypeArr []string
-			if jy.GetVipState(public.Mysql, public.MQFW, userid).IsPayedUser() {
+
+			vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userid)
+			isPayedUser := vipStatus.IsPayedUser()
+			queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
-				switch selectType {
-				case "content":
-					selectTypeArr = append(selectTypeArr, "detail")
-					break
-				case "buyer":
-					selectTypeArr = append(selectTypeArr, "mbuyer")
-					break
-				case "winner":
-					selectTypeArr = append(selectTypeArr, "mwinner")
-					break
-				case "agency":
-					selectTypeArr = append(selectTypeArr, "magency")
-					break
-				case "file":
-					selectTypeArr = append(selectTypeArr, "filetext")
-					break
-				case "all":
-					selectTypeArr = append(selectTypeArr, "title", "detail", "mbuyer", "mwinner", "magency", "filetext")
-					break
-				}
-			} else {
-				if selectType == "winner" || selectType == "all" {
-					isOldUser := func() bool { //查询是否是老用户
-						user, _ := public.MQFW.FindById("user", userid, `{"l_registedate":1}`)
-						if user == nil || len(*user) == 0 {
-							return false
-						}
-						registerData, ok := (*user)["l_registedate"].(int64)
-						if ok && registerData < 9999 {
-							return true
-						}
-						return false
-					}()
-					if selectType == "all" {
-						if isOldUser {
-							selectTypeArr = append(selectTypeArr, "title", "detail", "mwinner")
-						}
-					} else if isOldUser { //查询中标企业且是老用户
-						selectTypeArr = append(selectTypeArr, "mwinner")
-					}
-				} else if selectType == "content" {
-					selectTypeArr = append(selectTypeArr, "detail")
-				}
 			}
+			//校验是否有大会员中标企业查询权限
 			if jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW).CheckBigVipBackPower("search") {
 				winner = m.GetString("winner")
 			}
@@ -341,10 +302,10 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_APP, selectTypeArr, feld)
+						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_APP, queryItems, feld)
 					}
 				} else {
-					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_APP, selectTypeArr, feld)
+					list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, pageNum, bidsearch.SearchPageSize_APP, queryItems, feld)
 				}
 				listSize := 0
 				if list != nil {

src/jfw/modules/common/src/qfw/util/bidsearch/search.go

@@ -63,28 +63,6 @@ func GetPcBidSearchData(searchvalue, area, publishtime, subtype, industry, minpr
 	} else {
 		findfields = fmt.Sprintf(`"%s"`, strings.Join(selectTypeArr, "\",\""))
 	}
-	//switch selectType {
-	//case "content":
-	//	findfields = `"detail"`
-	//	break
-	//case "buyer":
-	//	findfields = `"mbuyer"`
-	//	break
-	//case "winner":
-	//	findfields = `"mwinner"`
-	//	break
-	//case "agency":
-	//	findfields = `"magency"`
-	//	break
-	//case "file":
-	//	findfields = `"filetext"`
-	//	break
-	//case "all":
-	//	findfields = `"title","detail","mbuyer","mwinner","magency","filetext"`
-	//	break
-	//default:
-	//	findfields = `"title"`
-	//}
 	qstr := GetSearchQuery(searchvalue, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, GetBidSearchQuery(area, publishtime, subtype, winner, buyerclass))
 	if isGetCount && qstr != "" && start == 0 {
 		count = elastic.Count(INDEX, TYPE, qstr)

src/jfw/modules/common/src/qfw/util/jy/payUser.go

@@ -8,15 +8,16 @@ import (
 
 //是否是付费用户
 type VipState struct {
-	VipState  int //超级订阅状态(1普通 2升级版)
-	BigMember int //大会员状态
-	EntMember int //商机管理用户状态
+	VipState     int   //超级订阅状态(1普通 2升级版)
+	BigMember    int   //大会员状态
+	EntMember    int   //商机管理用户状态
+	registerData int64 //注册时间
 }
 
 func GetVipState(mysql *mysql.Mysql, mg mongodb.MongodbSim, userId string) (vs *VipState) {
 	vs = &VipState{}
 	phone := ""
-	data, ok := mg.FindById("user", userId, `"i_member_status":1,"i_vip_status":1,"s_m_phone":1,"s_phone":1,"o_vipjy":1`)
+	data, ok := mg.FindById("user", userId, `"i_member_status":1,"i_vip_status":1,"s_m_phone":1,"s_phone":1,"o_vipjy":1,"l_registedate":1`)
 	if data != nil && len(*data) > 0 && ok {
 		i_vip_status := qu.IntAll((*data)["i_vip_status"])
 		if i_vip_status > 1 {
@@ -42,10 +43,53 @@ func GetVipState(mysql *mysql.Mysql, mg mongodb.MongodbSim, userId string) (vs *
 				vs.EntMember = 1
 			}
 		}
+		vs.registerData, _ = ((*data)["l_registedate"]).(int64)
 	}
 	return
 }
 
+//是否是付费账户
 func (vs *VipState) IsPayedUser() bool {
 	return vs.VipState > 0 || vs.BigMember > 0 || vs.EntMember > 0
 }
+
+//免费 标题(title)  正文(content) 老用户【中标企业(winner)】
+//付费用户 全部(all)、标题(title)  正文(content)  会员: 采购单位(buyer) 中标企业(winner) 招标代理机构(agency) 附件(file)
+func (vs *VipState) GetQueryItems(selectType string, limitOldTime int64) (items []string) {
+	if vs.IsPayedUser() {
+		switch selectType {
+		case "content":
+			items = append(items, "detail")
+			break
+		case "buyer":
+			items = append(items, "mbuyer")
+			break
+		case "winner":
+			items = append(items, "mwinner")
+			break
+		case "agency":
+			items = append(items, "magency")
+			break
+		case "file":
+			items = append(items, "filetext")
+			break
+		case "all":
+			items = append(items, "title", "detail", "mbuyer", "mwinner", "magency", "filetext")
+			break
+		}
+		return
+	}
+	if selectType == "winner" || selectType == "all" {
+		isOldUser := vs.registerData < limitOldTime
+		if selectType == "all" {
+			if isOldUser {
+				items = append(items, "title", "detail", "mwinner")
+			}
+		} else if isOldUser { //查询中标企业且是老用户
+			items = append(items, "mwinner")
+		}
+	} else if selectType == "content" {
+		items = append(items, "detail")
+	}
+	return
+}