|
@@ -1035,14 +1035,13 @@ func (f *Front) GroupImportData() {
|
|
m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
|
|
m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
|
|
}
|
|
}
|
|
if update["v_baseinfo.s_winner"] != nil {
|
|
if update["v_baseinfo.s_winner"] != nil {
|
|
- m["s_winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
|
|
|
|
|
|
+ m["winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
|
|
}
|
|
}
|
|
m["is_push"] = qu.IntAll(update["is_push"])
|
|
m["is_push"] = qu.IntAll(update["is_push"])
|
|
if qu.IntAll(update["is_push"]) == 1 {
|
|
if qu.IntAll(update["is_push"]) == 1 {
|
|
isPush = 1
|
|
isPush = 1
|
|
}
|
|
}
|
|
- //packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
|
|
|
|
- packageM[fmt.Sprint(c1)] = m
|
|
|
|
|
|
+ packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
|
|
update["v_baseinfo.package"] = packageM
|
|
update["v_baseinfo.package"] = packageM
|
|
if s := qu.ObjToString(baseinfo["tagname"]); s != "" && qu.ObjToString(update["v_baseinfo.tagname"]) != "" {
|
|
if s := qu.ObjToString(baseinfo["tagname"]); s != "" && qu.ObjToString(update["v_baseinfo.tagname"]) != "" {
|
|
update["v_baseinfo.tagname"] = s + "," + qu.ObjToString(update["v_baseinfo.tagname"])
|
|
update["v_baseinfo.tagname"] = s + "," + qu.ObjToString(update["v_baseinfo.tagname"])
|
|
@@ -1058,17 +1057,19 @@ func (f *Front) GroupImportData() {
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
c1 = 0
|
|
c1 = 0
|
|
- isPush = 0
|
|
|
|
packageM = make(map[string]interface{})
|
|
packageM = make(map[string]interface{})
|
|
m := make(map[string]interface{})
|
|
m := make(map[string]interface{})
|
|
if update["v_baseinfo.bidamount"] != nil {
|
|
if update["v_baseinfo.bidamount"] != nil {
|
|
m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
|
|
m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
|
|
}
|
|
}
|
|
if update["v_baseinfo.s_winner"] != nil {
|
|
if update["v_baseinfo.s_winner"] != nil {
|
|
- m["s_winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
|
|
|
|
|
|
+ m["winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
|
|
}
|
|
}
|
|
- //packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
|
|
|
|
- packageM[fmt.Sprint(c1)] = m
|
|
|
|
|
|
+ m["is_push"] = qu.IntAll(update["is_push"])
|
|
|
|
+ if qu.IntAll(update["is_push"]) == 1 {
|
|
|
|
+ isPush = 1
|
|
|
|
+ }
|
|
|
|
+ packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
|
|
update["v_baseinfo.package"] = packageM
|
|
update["v_baseinfo.package"] = packageM
|
|
c1++
|
|
c1++
|
|
}
|
|
}
|