|
|
@@ -984,6 +984,7 @@ func (f *Front) GroupImportData() {
|
|
|
lastid := ""
|
|
|
c1 := 0 // 多包第n条数据
|
|
|
packageM := make(map[string]interface{}) // 记录多包信息，多行用到
|
|
|
+ isPush := 0
|
|
|
for rn, row := range rows {
|
|
|
update := make(map[string]interface{})
|
|
|
del := make(map[string]interface{})
|
|
|
@@ -1037,6 +1038,9 @@ func (f *Front) GroupImportData() {
|
|
|
m["s_winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
|
|
|
}
|
|
|
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)}
|
|
|
packageM[fmt.Sprint(c1)] = m
|
|
|
update["v_baseinfo.package"] = packageM
|
|
|
@@ -1054,6 +1058,7 @@ func (f *Front) GroupImportData() {
|
|
|
}
|
|
|
} else {
|
|
|
c1 = 0
|
|
|
+ isPush = 0
|
|
|
packageM = make(map[string]interface{})
|
|
|
m := make(map[string]interface{})
|
|
|
if update["v_baseinfo.bidamount"] != nil {
|
|
|
@@ -1070,6 +1075,10 @@ func (f *Front) GroupImportData() {
|
|
|
} else {
|
|
|
count++
|
|
|
c1 = 0
|
|
|
+ isPush = 0
|
|
|
+ }
|
|
|
+ if qu.IntAll(update["v_baseinfo.multipackage"]) == 1 && isPush == 1 {
|
|
|
+ update["is_push"] = 1
|
|
|
}
|
|
|
lastid = id
|
|
|
if len(del) > 0 {
|
