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

udp_winner/main.go

@@ -72,7 +72,6 @@ func init() {
 	initRdis()
 	initMongo()
 	initReg()
-
 }
 
 func main() {

udp_winner/timedTaskAgency.go

@@ -283,7 +283,7 @@ func AddAgency(overid string, tmp map[string]interface{}) string {
 			}
 		}
 		var tmpperson, agencytel string
-		if tmppersona, ok := tmp["agencyperson"].(string); ok && tmpperson != "" && Reg_person.MatchString(tmpperson) && !Reg_xing.MatchString(tmpperson) {
+		if tmppersona, ok := tmp["agencyperson"].(string); ok && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
 			tmpperson = tmppersona
 		}
 		if tmpperson != "" {
@@ -365,7 +365,7 @@ func TimedTaskAgency() {
 					rdb.Do("SELECT", redis_agency_db)
 					if _, err := redis.String(rdb.Do("GET", erragency)); err == nil {
 						//增量合并
-						Add(tmpId, tmp)
+						AddAgency(tmpId, tmp)
 						//存在的话删除tmp mongo表
 						if DeletedCount := FClient.Del("agency_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !DeletedCount {
 							log.Println("删除临时表err:", DeletedCount)

udp_winner/timedTaskBuyer.go

@@ -318,7 +318,7 @@ func AddBuyer(overid string, tmp map[string]interface{}) string {
 			}
 		}
 		var tmpperson, buyertel string
-		if tmppersona, ok := tmp["buyerperson"].(string); ok && tmpperson != "" && Reg_person.MatchString(tmpperson) && !Reg_xing.MatchString(tmpperson) {
+		if tmppersona, ok := tmp["buyerperson"].(string); ok && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
 			tmpperson = tmppersona
 		}
 		if tmpperson != "" {
@@ -399,7 +399,7 @@ func TimedTaskBuyer() {
 					rdb.Do("SELECT", redis_buyer_db)
 					if _, err := redis.String(rdb.Do("GET", errbuyer)); err == nil {
 						//增量合并
-						Add(tmpId, tmp)
+						AddBuyer(tmpId, tmp)
 						//存在的话删除tmp mongo表
 						if DeletedCount := FClient.Del("buyer_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !DeletedCount {
 							log.Println("删除临时表err:", DeletedCount)

udp_winner/timedTaskWinner.go

@@ -298,7 +298,7 @@ func Add(overid string, tmp map[string]interface{}) string {
 			}
 		}
 		var tmpperson, winnertel string
-		if tmppersona, ok := tmp["winnerperson"].(string); ok && tmpperson != "" && Reg_person.MatchString(tmpperson) && !Reg_xing.MatchString(tmpperson) {
+		if tmppersona, ok := tmp["winnerperson"].(string); ok && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
 			tmpperson = tmppersona
 		}
 		if tmpperson != "" {