|
|
@@ -4,7 +4,6 @@ import (
|
|
|
"encoding/json"
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
- "log"
|
|
|
"models"
|
|
|
"qfw/util"
|
|
|
"qfw/util/elastic"
|
|
|
@@ -228,7 +227,7 @@ func Utiltags(tag map[string]interface{}) string {
|
|
|
if err != nil {
|
|
|
return "json err:" + err.Error()
|
|
|
}
|
|
|
- log.Println("前端数据", tab)
|
|
|
+ //log.Println("前端数据", tab)
|
|
|
QueryObjecct := sql.QueryObjecct{}
|
|
|
ffBoolObject := sql.BoolObject{}
|
|
|
adsBoolObect := sql.NewEsObject{}
|
|
|
@@ -665,23 +664,13 @@ func method2(newEsObject sql.NewEsObject, keyword, keymatch string, tmps []strin
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- log.Println("+++++++", tmps, keymatch)
|
|
|
if len(tmps) == 1 && (strings.Contains(keymatch, "6") || strings.Contains(keymatch, "7")) {
|
|
|
var notkeyline interface{}
|
|
|
if tmps[0] == "buyer" {
|
|
|
- // notkeyline = append(notkeyline, sql.BuyerMatch{
|
|
|
- // Buyer: &sql.Buyer{Buyer: notKeyWordArr},
|
|
|
- // })
|
|
|
notkeyline = sql.BuyerMatch{
|
|
|
Buyer: &sql.Buyer{Buyer: notKeyWordArr},
|
|
|
}
|
|
|
- //toptypeSubtype := sql.ToptypeSubtype{}
|
|
|
- //toptypeSubtype.Toptype = strings.Split(tab.Stoptype, ",")
|
|
|
- //ffBoolObject.Must = append(ffBoolObject.Must, sql.ToptypeSubtypeMust{&toptypeSubtype})
|
|
|
} else if tmps[0] == "s_winner" {
|
|
|
- // notkeyline = append(notkeyline, sql.WinnerMatch{
|
|
|
- // Winner: &sql.Winner{Winner: notKeyWordArr},
|
|
|
- // })
|
|
|
notkeyline = sql.WinnerMatch{
|
|
|
Winner: &sql.Winner{Winner: notKeyWordArr},
|
|
|
}
|
