WH01243 hace 1 año
padre
commit
e3930b8f4c
Se han modificado 1 ficheros con 20 adiciones y 28 borrados
  1. 20 28
      clueSync/jobutil.go

+ 20 - 28
clueSync/jobutil.go

@@ -81,7 +81,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 		positionId := gconv.Int64((*uCount)["position_id"])
 		if positionId == 0 {
 			//线索变更
-			ok, data, saleData = FindPosition(positionId, "", false)
+			ok, data, saleData = FindPosition(0, "")
 			if !ok {
 				log.Println(positionId, "用户查询失败")
 				return false
@@ -120,7 +120,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 			}
 			if trailstatus == "01" || trailstatus == "03" || trailstatus == "04" {
 				//变更销售员
-				ok, data, saleData = FindPosition(positionId, "", false)
+				ok, data, saleData = FindPosition(positionId, trailstatus)
 				if !ok {
 					log.Println(positionId, "用户查询失败")
 					return false
@@ -128,7 +128,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 				UpdateClue(*uCount, saleData, "", "", uId, "5", "169", "新增线索", "主动咨询客服留资客户", company, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), "", gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, true, demand)
 			} else {
 				//线索变更
-				ok, data, saleData = FindPosition(positionId, trailstatus, false)
+				ok, data, saleData = FindPosition(positionId, "")
 				if !ok {
 					log.Println(positionId, "用户查询失败")
 					return false
@@ -138,7 +138,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 		}
 	} else {
 		//新增线索
-		ok, data, _ = FindPosition(0, "", false)
+		ok, data, _ = FindPosition(0, "")
 		if !ok {
 			return false
 		}
@@ -311,14 +311,8 @@ func FindNumber(moudle string) string {
 }
 
 // 人员查询
-func FindPosition(positionId int64, trailstatus string, full bool) (bool, map[string]interface{}, []map[string]interface{}) {
+func FindPosition(positionId int64, trailstatus string) (bool, map[string]interface{}, []map[string]interface{}) {
 	allData := []map[string]interface{}{}
-	//查询是否满了
-	if positionId != 0 {
-		if FindUpperLimit(gconv.String(positionId), "", false) {
-			full = true
-		}
-	}
 	//查询两个部门高级管理员
 	//查询两个部门所有人员标识
 	//电销三部
@@ -361,7 +355,7 @@ FROM
 		v["type"] = 3
 		personName := gconv.String(v["name"])
 		id := gconv.Int64(v["position_id"])
-		if id == positionId && !full {
+		if id == positionId {
 			if personName == "孙鹏" {
 				v["orderStatus"] = 2
 			}
@@ -381,7 +375,7 @@ FROM
 		v["type"] = 1
 		personName := gconv.String(v["name"])
 		id := gconv.Int64(v["position_id"])
-		if id == positionId && !full {
+		if id == positionId {
 			if personName == "沈炳毅" {
 				v["orderStatus"] = 2
 			}
@@ -402,25 +396,23 @@ FROM
 			return false, map[string]interface{}{}, allData
 		}
 		positiontype := gconv.Int64(administrators["type"])
-		if full {
+		if trailstatus == "01" || trailstatus == "03" || trailstatus == "04" {
 			switch positiontype {
 			case 1:
-				if trailstatus == "01" || trailstatus == "03" || trailstatus == "04" {
-					//找他上级
-					positionId1 := gconv.String(administrators1["position_id"])
-					administrators = administrators1
-					if FindUpperLimit(positionId1, "", false) {
-						return false, map[string]interface{}{}, allData
-					}
+				//找他上级
+				positionId1 := gconv.String(administrators1["position_id"])
+				administrators = administrators1
+				if FindUpperLimit(positionId1, "", false) {
+					log.Println("商机分配1已满", positionId1)
+					return false, map[string]interface{}{}, allData
 				}
 			case 3:
-				if trailstatus == "01" || trailstatus == "03" || trailstatus == "04" {
-					//找他上级
-					positionId1 := gconv.String(administrators3["position_id"])
-					administrators = administrators3
-					if FindUpperLimit(positionId1, "", false) {
-						return false, map[string]interface{}{}, allData
-					}
+				//找他上级
+				positionId1 := gconv.String(administrators3["position_id"])
+				administrators = administrators3
+				if FindUpperLimit(positionId1, "", false) {
+					log.Println("商机分配3已满", positionId1)
+					return false, map[string]interface{}{}, allData
 				}
 			}
 		} else {