Merge branch 'dev/v3.1.19_fu' of jianyu/salesLeads into feature/v3.1.19

src/service/action/info.go

@@ -724,7 +724,7 @@ func (i *Info) AppNewUerSales() {
 				if qu.InterfaceToStr(infoMap["phone"]) == "" {
 					infoMap["phone"] = data.Data.Free.Phone
 				}
-				if products != "" {
+				if products != "" || area != "" {
 					keyWord := strings.Split(products, ",")
 					//
 					key := []string{}
@@ -764,7 +764,7 @@ func (i *Info) AppNewUerSales() {
 						o_area, areaB := (*oJy)["o_area"].(map[string]interface{})
 						a_key, keyB := (*oJy)["a_key"].([]interface{})
 
-						if !keyB || a_key == nil || len(a_key) == 0 {
+						if (!keyB || a_key == nil || len(a_key) == 0) && len(key) > 0 {
 							//不存在关键词 填充
 							var arryMap []map[string]interface{}
 							for _, v := range key {
@@ -783,7 +783,7 @@ func (i *Info) AppNewUerSales() {
 							}
 							m["o_jy"] = (*oJy)
 						}
-						if !areaB || len(o_area) <= 0 {
+						if (!areaB || len(o_area) <= 0) && area != "" {
 							(*oJy)["o_area"] = map[string]interface{}{
 								area: []interface{}{},
 							}
@@ -847,6 +847,9 @@ func (i *Info) AppNewUerSales() {
 func processArea(areaStr string) (area string) {
 	areaStrList := strings.Split(areaStr, ",")
 	for i := 0; i < len(areaStrList); i++ {
+		if areaStrList[i] == "广州" {
+			areaStrList[i] = "广东"
+		}
 		if areaStrList[i] != "" && areaStrList[i] != "全国" {
 			area = areaStrList[i]
 			return
@@ -869,6 +872,9 @@ func SetLog(userid, types string) {
 }
 
 func Items(jy, m map[string]interface{}, keyWord []string, types string) {
+	if len(keyWord) == 0 {
+		return
+	}
 	var (
 		upUser bool
 	)