Преглед на файлове

fix:三级页面跳转画像采用短id

duxin преди 1 година
родител
ревизия
86ddddbfab
променени са 2 файла, в които са добавени 8 реда и са изтрити 6 реда
  1. 3 3
      src/jfw/front/frontRouter.go
  2. 5 3
      src/jfw/front/shorturl.go

+ 3 - 3
src/jfw/front/frontRouter.go

@@ -230,7 +230,7 @@ func (this *CommonRouter) doPcBigPage(pageSign, types string) error {
 		if strings.Contains(pageSign, "ent_ser_portrait") || strings.Contains(pageSign, "ent_portrait") {
 			urlArr := strings.Split(pageSign, "_portrait/")
 			entId := encrypt.DecodeArticleId2ByCheck(urlArr[len(urlArr)-1])[0]
-			if seoId := esSeoId(true, entId); seoId != "" {
+			if seoId := EsSeoId(true, entId); seoId != "" {
 				return this.Redirect(fmt.Sprintf("/qy/%s.html", seoId))
 			}
 		} else if strings.Contains(pageSign, "unit_portrayal") {
@@ -239,7 +239,7 @@ func (this *CommonRouter) doPcBigPage(pageSign, types string) error {
 			// 解码 URL 编码的字符串
 			buyer, _ := url.QueryUnescape(urlArr[len(urlArr)-1])
 			//buyer := this.GetString("buyer")
-			if seoId := esSeoId(false, buyer); seoId != "" {
+			if seoId := EsSeoId(false, buyer); seoId != "" {
 				return this.Redirect(fmt.Sprintf("/dw/%s.html", seoId))
 			}
 		}
@@ -247,7 +247,7 @@ func (this *CommonRouter) doPcBigPage(pageSign, types string) error {
 	return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))
 }
 
-func esSeoId(isWinner bool, idName string) string {
+func EsSeoId(isWinner bool, idName string) string {
 	if idName == "" {
 		return idName
 	}

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

@@ -814,6 +814,7 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 	if href != "" && userId != "" {
 		obj["originalShow"] = true
 	}
+	obj["buyerSeoId"] = EsSeoId(false, util.InterfaceToStr(obj["buyer"]))
 	//大会员中标企业跳转至画像
 	if obj["entidlist"] != nil {
 		if s_winner := util.ObjToString(obj["s_winner"]); s_winner != "" {
@@ -825,11 +826,11 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 				for _, v := range swinnerArr {
 					winnerMap[v] = ""
 					//临时更改为企业名称查询企业id
-					rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, v, v))
+					rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","nseo_id","capital","company_phone"],"size":1}`, v, v))
 					if rData != nil && len(*rData) == 1 {
 						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
 							entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
-							winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+							winnerMap[v] = (*rData)[0]["nseo_id"]
 						}
 					}
 				}
@@ -839,7 +840,8 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 					if vstr == "-" {
 						continue
 					}
-					winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
+					entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString(k)))
+					winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
 				}
 			}
 			obj["entId"] = entIdArr