Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

udpcreateindex/src/config.json

@@ -57,7 +57,7 @@
     "detaillength": 50000,
     "project": {
         "db": "mxs",
-        "collect": "projectset",
+        "collect": "test2",
         "index": "projectset_v5",
         "type": "projectset"
     },

udpcreateindex/src/main.go

@@ -152,25 +152,25 @@ func init() {
 		for k, v := range bidding["indexfieldsmap"].(map[string]interface{}) {
 			biddingIndexFieldsMap[k] = util.ObjToString(v)
 		}
-		util.Debug(biddingIndexFieldsMap)
+		log.Println(biddingIndexFieldsMap)
 	}
 	if bidding["projectinfomap"] != nil {
 		for k, v := range bidding["projectinfomap"].(map[string]interface{}) {
 			projectinfoFieldsMap[k] = util.ObjToString(v)
 		}
-		util.Debug(projectinfoFieldsMap)
+		log.Println(projectinfoFieldsMap)
 	}
 	if bidding["purchasinglistmap"] != nil {
 		for k, v := range bidding["purchasinglistmap"].(map[string]interface{}) {
 			purchasinglistFieldsMap[k] = util.ObjToString(v)
 		}
-		util.Debug(purchasinglistFieldsMap)
+		log.Println(purchasinglistFieldsMap)
 	}
 	if bidding["winnerordermap"] != nil {
 		for k, v := range bidding["winnerordermap"].(map[string]interface{}) {
 			winnerorderlistFieldsMap[k] = util.ObjToString(v)
 		}
-		util.Debug(winnerorderlistFieldsMap)
+		log.Println(winnerorderlistFieldsMap)
 	}
 	log.Println(projectinfoFields)
 	log.Println(purchasinglistFields)

udpcreateindex/src/projectindex.go

@@ -119,11 +119,13 @@ func projectTask(data []byte, project, mapInfo map[string]interface{}) {
 		}
 		//不生索引字段
 		delete(tmp, "package")
-		delete(tmp, "winnerorder")
+		//delete(tmp, "winnerorder")
 		delete(tmp, "infofield")
 		list := tmp["list"].([]interface{})
 		for _, m := range list {
 			tmpM := m.(map[string]interface{})
+			//删除purchasing
+			delete(tmpM, "purchasing")
 			if bidamount, ok := tmpM["bidamount"].(string); ok && len(bidamount) > 0 { //bidamount为string类型，转成float
 				tmpB := util.Float64All(tmpM["bidamount"])
 				tmpM["bidamount"] = tmpB