Bladeren bron

潜在客户

wangshan 4 jaren geleden
bovenliggende
commit
2185d50f54

+ 2 - 1
src/jfw/modules/bigmember/src/service/analysis/esquery.go

@@ -228,7 +228,8 @@ func PCQuery(area map[string]interface{}, industry []string, buyerclass []string
 	multi_match := `{"multi_match": {"query": %s,"type": "phrase", "fields": [%s]}}`
 	query := `{"query":{"bool":{"must":[%s],"must_not": [{"term": {"buyer": ""}}],"should":[%s],"minimum_should_match": %d}},"size": 0,%s}`
 	query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
-	query_aggs := `"aggs": {"group_field": {"terms": {"field": %s,"size": %d%s},"aggs": {"count": {"sum": {"field": "budget"}},"group_area": {"terms": {"field": "area","size": 1}},"group_city": {"terms": {"field": "city","size": 1}}}}}`
+	//21.1.20  为和画像保持一致  数据组要求 budget 改成 bidamount
+	query_aggs := `"aggs": {"group_field": {"terms": {"field": %s,"size": %d%s},"aggs": {"count": {"sum": {"field": "bidamount"}},"group_area": {"terms": {"field": "area","size": 1}},"group_city": {"terms": {"field": "city","size": 1}}}}}`
 	query_sort := `,"order": {"count": "desc"}`
 	query_bool_must := `{"terms":{"%s":[%s]}}`
 	bools := []string{}

+ 2 - 2
src/jfw/modules/bigmember/src/service/analysis/potential.go

@@ -368,7 +368,7 @@ func analysisData(res []map[string]interface{}, mycs map[string]interface{}, omy
 			continue
 		}
 		enters = append(enters, key_val)
-		if (k+1)%20 == 0 {
+		if (k+1)%20 == 0 || len(res) == k+1 {
 			//获取企业或者采购单位的省份和城市
 			var pcData = []map[string]interface{}{}
 			if pcor == "C" { //潜在客户 查检索库buyer
@@ -400,7 +400,7 @@ func analysisData(res []map[string]interface{}, mycs map[string]interface{}, omy
 		}
 		//并发查询企业库是否包含此企业信息
 		entersFifty = append(entersFifty, key_val)
-		if (k+1)%50 == 0 {
+		if (k+1)%50 == 0 || len(res) == k+1 {
 			wg.Add(1)
 			go func(entersFifty []string) {
 				EnterQYXY = append(EnterQYXY, entity.GetEntInfoByQYXY(entersFifty)...)

+ 2 - 2
src/web/staticres/js/login.js

@@ -340,10 +340,10 @@ var logic = function(data,num){
 		}
 		var hhtml = "<img "
 		if(data.redisheadimg==null||data.redisheadimg==undefined||data.redisheadimg=="<nil>"){
-			data.redisheadimg==""
+			data.redisheadimg = ""
 		}
 		if(data.s_headimage==null||data.s_headimage==undefined||data.s_headimage=="<nil>"){
-			data.s_headimage==""
+			data.s_headimage = ""
 		}
 		if(data.redisheadimg!=""){
 			hhtml+="src='"+data.redisheadimg+"' class='imgShow nomalheadimg'"

+ 1 - 1
src/web/templates/course/pc/reseverCourse.html

@@ -438,7 +438,7 @@
 								}else{
 									window.location.href = '/front/course/publicToPublic?code=' + r.data.code;
 								}
-							}else if(r.error.indexOf("需要登录")>-1){
+							}else if(r.errMsg&&r.errMsg.indexOf("需要登录")>-1){
 								$("#bidLogin").modal("show");
 							}else{
                                 $('.pay_btn button').removeAttr("disabled");