|
@@ -14,6 +14,7 @@ import (
|
|
|
"jfw/public"
|
|
|
"log"
|
|
|
"qfw/util"
|
|
|
+ "qfw/util/elastic"
|
|
|
"qfw/util/jy"
|
|
|
"qfw/util/redis"
|
|
|
|
|
@@ -125,31 +126,20 @@ func (s *Short) Article(stype, id string) error {
|
|
|
//获取打赏文案
|
|
|
//util.ReadConfig(&config.Sysconfig)
|
|
|
if obj["entidlist"] != nil { //大会员中标企业跳转至画像
|
|
|
-
|
|
|
- if winner := util.ObjToString(obj["winner"]); winner != "" {
|
|
|
- s_winner := util.ObjToString(obj["s_winner"])
|
|
|
- idObjs, _ := obj["entidlist"].([]interface{})
|
|
|
- winnerId := ""
|
|
|
- if names := strings.Split(s_winner, ","); len(names) > 1 {
|
|
|
- index := 0
|
|
|
- for i := 0; i < len(names); i++ {
|
|
|
- if names[i] == winner {
|
|
|
- index = i
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- if len(idObjs) > index {
|
|
|
- winnerId = util.ObjToString(idObjs[index])
|
|
|
+ entIdArr, winnerMap := []string{}, map[string]interface{}{}
|
|
|
+ for _, v := range strings.Split(util.ObjToString(obj["s_winner"]), ",") {
|
|
|
+ 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))
|
|
|
+ if rData != nil && len(*rData) == 1 {
|
|
|
+ if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
|
|
|
+ entIdArr = append(entIdArr, util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
|
|
|
+ winnerMap[v] = util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
|
|
|
}
|
|
|
- } else { //中标企业仅一个
|
|
|
- if len(idObjs) > 0 {
|
|
|
- winnerId = util.ObjToString(idObjs[0])
|
|
|
- }
|
|
|
- }
|
|
|
- if winnerId != "" && winnerId != "-" {
|
|
|
- obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
|
|
|
}
|
|
|
}
|
|
|
+ obj["entId"] = entIdArr
|
|
|
+ obj["winnerMap"] = winnerMap
|
|
|
}
|
|
|
s.T["userId"] = se.Encode2Hex(userId) //加密用户userid
|
|
|
if false && obj["winnertel"] == nil && isbid(obj["subtype"]) {
|