|
@@ -341,7 +341,7 @@ func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job, isSite
|
|
|
if value, ok := e.SiteMerge.Load(codeSite); ok {
|
|
|
isSite = value.(bool)
|
|
|
}
|
|
|
- if isSite{
|
|
|
+ if isSite {
|
|
|
//是否配置站点
|
|
|
exp, isSite := e.Luacodes.Load(codeSite)
|
|
|
if isSite {
|
|
@@ -593,6 +593,7 @@ func (e *ExtractTask) ExtractDetail(j *ju.Job, isSite bool, codeSite string) {
|
|
|
if istrue, ok := data[len(data)-1].(bool); istrue && ok {
|
|
|
j.Result[key][i].IsTrue = true
|
|
|
} else {
|
|
|
+ j.Result[key][i].Value = data[0]
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
@@ -2065,7 +2066,10 @@ func resetWinnerorder(j *ju.Job) {
|
|
|
if maxlen > 0 {
|
|
|
winners = append(winners, &ju.ExtField{Code: "winnerorder", Field: "winner", ExtFrom: "j.Winnerorder", Value: j.Winnerorder[0]["entname"], Score: 0.5})
|
|
|
if j.Winnerorder[0]["price"] != nil {
|
|
|
- bidamounts = append(bidamounts, &ju.ExtField{Code: "winnerorder", Field: "bidamount", ExtFrom: "j.Winnerorder", Value: j.Winnerorder[0]["price"], Score: 0.5})
|
|
|
+ tmpPrice := clear.ObjToMoney([]interface{}{j.Winnerorder[0]["price"],""})
|
|
|
+ if tmpPrice[len(tmpPrice)-1].(bool){
|
|
|
+ bidamounts = append(bidamounts, &ju.ExtField{Code: "winnerorder", Field: "bidamount", ExtFrom: "j.Winnerorder",SourceValue:j.Winnerorder[0]["price"], Value: tmpPrice[0], Score: 0.5})
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if j.Result["winner"] == nil && len(winners) > 0 {
|