提交

service/balanceService.go

@@ -117,38 +117,22 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
 		} else if detailedData.ResourceType == "高级字段包" {
 			dataDesc = 1
 		}
-		url = url + "/data/dedupAndSave/" + fmt.Sprint(time.Now().Unix()) + "?dataDesc=" + fmt.Sprint(dataDesc) + "&personId=" + detailedData.UserId + "&infoId=" + infoId + "&accountId=" + detailedData.AccountId
-		log.Println(url)
-		res, urlerr := http.PostForm(url, nil)
-		if urlerr != nil {
-			return entity.ErrorCode, "去重失败", 0
+		var appheader = "application/x-www-form-urlencoded"
+		param := "dataDesc=" + fmt.Sprint(dataDesc) + "&personId=" + detailedData.UserId + "&infoId=" + infoId + "&accountId=" + detailedData.AccountId
+		resp, status, _ := HttpPost_M(url+"/data/dedupAndSave/"+fmt.Sprint(time.Now().Unix()), appheader, param, 20)
+		log.Println(resp, status)
+		if status != 200 && (resp == nil || len(resp) <= 0) {
+			return entity.ErrorCode, "请求去重接口出错", 0
 		}
-		log.Println(urlerr)
-		defer res.Body.Close()
-		body, _ := ioutil.ReadAll(res.Body)
-		dat := entity.Dedup{}
-		_ = json.Unmarshal([]byte(body), &dat)
-		log.Println(res, dat, url)
-		if dat.Code == 0 {
-			deductionNumb = dat.Data.NewCount
-			deductionNumbs = dat.Data.NewCount
-			var appheader = "application/x-www-form-urlencoded"
-			param := "dataDesc=" + fmt.Sprint(dataDesc) + "&personId=" + detailedData.UserId + "&infoId=" + infoId + "&accountId=" + detailedData.AccountId
-			resp, status, _ := HttpPost_M(url+"/data/dedupAndSave/"+fmt.Sprint(time.Now().Unix()), appheader, param, 20)
-			log.Println(resp, status)
-			if status != 200 && (resp == nil || len(resp) <= 0) {
-				return entity.ErrorCode, "请求去重接口出错", 0
-			}
-			data := resp["data"].(map[string]interface{})
-			if fmt.Sprint(resp["code"]) == "0" {
-				deductionNumb, _ = strconv.ParseInt(fmt.Sprint(data["newCount"]), 10, 64)
-				deductionNumbs, _ = strconv.ParseInt(fmt.Sprint(data["newCount"]), 10, 64)
-				if fmt.Sprint(data["totalCount"]) == "0" {
-					return entity.ErrorCode, "去重失败", 0
-				}
-			} else {
+		data := resp["data"].(map[string]interface{})
+		if fmt.Sprint(resp["code"]) == "0" {
+			deductionNumb, _ = strconv.ParseInt(fmt.Sprint(data["newCount"]), 10, 64)
+			deductionNumbs, _ = strconv.ParseInt(fmt.Sprint(data["newCount"]), 10, 64)
+			if fmt.Sprint(data["totalCount"]) == "0" {
 				return entity.ErrorCode, "去重失败", 0
 			}
+		} else {
+			return entity.ErrorCode, "去重失败", 0
 		}
 	}