12.28------代码修改

fullproject/src_v1/config.json

@@ -15,12 +15,7 @@
         "to": "wangjianghan@topnet.net.cn",
         "api": "http://10.171.112.160:19281/_send/_mail"
     },
-    "udpport": ":1482",
+    "udpport": ":1182",
     "nextNode": [
-        {
-            "addr": "172.17.145.163",
-            "port": 1483,
-            "memo": "创建项目索引new"
-        }
     ]
 }

fullproject/src_v1/project.go

@@ -2,8 +2,6 @@ package main
 
 import (
 	"log"
-	"strconv"
-
 	//	"log"
 	"math"
 	qu "qfw/util"
@@ -886,7 +884,7 @@ var PackageEle = []string{
 	"bidstatus",
 }
 
-func packageEle(map1 map[string]interface{}) (map[string]interface{}, float64, float64) {
+func packageEle(map1 map[string]interface{}, id string) (map[string]interface{}, float64, float64) {
 	budget := 0.0
 	bidamount := 0.0
 	p2 := map[string]interface{}{}
@@ -894,6 +892,10 @@ func packageEle(map1 map[string]interface{}) (map[string]interface{}, float64, f
 		if map1[k] != nil {
 			p2[k] = map1[k]
 		}
+		infoid := p2["infoid"]
+		if infoid == nil {
+			p2["infoid"] = id
+		}
 		if p2["budget"] != nil {
 			budget = budget + p2["budget"].(float64)
 		}
@@ -912,44 +914,34 @@ func PackageFormat(info *Info, project *ProjectInfo) (map[string]interface{}, fl
 		budget = project.Budget
 		bidamount = project.Bidamount
 		p1 = project.Package
-		ids := p1["ids"].([]string)
-		ids = append(ids, info.Id)
-		p1["ids"] = ids
-		for _, v := range info.Package {
+		for k, v := range info.Package {
 			if v1, ok := v.(map[string]interface{}); ok {
 				v2 := map[string]interface{}{}
-				v2, budget, bidamount = packageEle(v1)
+				v2, budget, bidamount = packageEle(v1, info.Id)
 				if v2["bidstatus"] == nil {
 					v2["bidstatus"] = info.SubType
 				}
-				n := 0
 				addFlag := false
-				for k, v3 := range p1 {
-					if k == "ids" {
-						continue
-					}
+				for k1, v3 := range p1 {
 					if v4, ok := v3.([]map[string]interface{}); ok {
 						if qu.ObjToString(v4[0]["origin"]) == qu.ObjToString(v2["origin"]) && qu.ObjToString(v4[0]["name"]) == qu.ObjToString(v2["name"]) {
 							v4 = append(v4, v2)
-							p1[k] = v4
+							p1[k1] = v4
 							addFlag = true
 							break
 						}
 					}
 				}
 				if !addFlag {
-					n++
-					m := len(ids) + n
-					p1[strconv.Itoa(m)] = []map[string]interface{}{v2}
+					p1[k] = []map[string]interface{}{v2}
 				}
 			}
 		}
 	} else {
-		p1["ids"] = []string{info.Id}
 		for k, v := range info.Package {
-			v1 := v.(map[string]interface{})
+			v1, _ := v.(map[string]interface{})
 			p2 := map[string]interface{}{}
-			p2, budget, bidamount = packageEle(v1)
+			p2, budget, bidamount = packageEle(v1, info.Id)
 			if p2["bidstatus"] == nil {
 				p2["bidstatus"] = info.SubType
 			}

fullproject/src_v1/task.go

@@ -465,9 +465,9 @@ var (
 func (p *ProjectTask) CommonMerge(tmp map[string]interface{}, info *Info) {
 	if info != nil && !((info.pnbval == 1 && info.Buyer != "") || info.pnbval == 0) {
 		if jsonData, ok := tmp["jsondata"].(map[string]interface{}); ok {
-			if jsonData != nil && jsonData["projecthref"] != nil {
+			proHref := util.ObjToString(jsonData["projecthref"])
+			if jsonData != nil && proHref != "" {
 				//projectHref字段合并
-				proHref := jsonData["projecthref"].(string)
 				tmp["projecthref"] = proHref
 				p.mapHrefLock.Lock()
 				pid := p.mapHref[proHref]
@@ -690,7 +690,7 @@ func (p *ProjectTask) fillInPlace(tmp map[string]interface{}) {
 		return
 	}
 
-	tmpSite, _ := tmp["site"].(string)
+	tmpSite := util.ObjToString(tmp["site"])
 	if tmpSite == "" {
 		return
 	}

fullproject/src_v1/update.go

@@ -356,7 +356,7 @@ func mergeProject(p *ProjectTask, pInfo *ProjectInfo, thisinfo *Info, set map[st
 		set["bidamount"] = pInfo.Bidamount
 	}
 
-	if thisinfo.Budget > 0 && pInfo.Budget < 1 { //多包的会有问题，没有进行合计。
+	if thisinfo.Budget > 0 && pInfo.Budget < 1 {
 		pInfo.Budget = thisinfo.Budget
 		set["budget"] = pInfo.Budget
 	}
@@ -398,18 +398,16 @@ func mergeProject(p *ProjectTask, pInfo *ProjectInfo, thisinfo *Info, set map[st
 
 	if thisinfo.HasPackage {
 		pkg, _, _ := PackageFormat(thisinfo, pInfo)
+		set["multipackage"] = 1
 		pInfo.Package = pkg
+	}else {
+		set["multipackage"] = 0
 	}
 
 	set["mpn"] = pInfo.MPN
 	set["mpc"] = pInfo.MPC
 	set["pici"] = p.pici
 
-	if thisinfo.HasPackage {
-		set["multipackage"] = 1
-	} else {
-		set["multipackage"] = 0
-	}
 	return set
 }