|  | @@ -173,7 +173,6 @@ public class CallbackController {
 | 
	
		
			
				|  |  |                      if (!Check.isNull(checkUserAllocation)) {
 | 
	
		
			
				|  |  |                          return "授权失败,该账号已被:" + checkUserAllocation.getUserName() + " 绑定!";
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  | -                    String projectName = json.getString("projectName");
 | 
	
		
			
				|  |  |                      UserAllocation userAllocation = new UserAllocation();
 | 
	
		
			
				|  |  |                      userAllocation.setUserName(userName);
 | 
	
		
			
				|  |  |                      userAllocation.setUserId(userId);
 | 
	
	
		
			
				|  | @@ -184,14 +183,11 @@ public class CallbackController {
 | 
	
		
			
				|  |  |                      if ((Integer) advertiseBaseInfoMap.get("code") == 0) {
 | 
	
		
			
				|  |  |                          userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  | -               //     userAllocation.setAdvertiserName(advertiserName);
 | 
	
		
			
				|  |  |                      userAllocation.setMediaId(mediaId);
 | 
	
		
			
				|  |  |                      userAllocation.setAccountId(accountId);
 | 
	
		
			
				|  |  |                      userAllocation.setProjectId(projectId);
 | 
	
		
			
				|  |  | -                 //   userAllocation.setProjectName(projectName);
 | 
	
		
			
				|  |  |                      userAllocation.setWarningProportion(warningProportion);
 | 
	
		
			
				|  |  |                      userAllocation.setWarningAmount(warningAmount);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |                      userAllocation.setCreateTime(new Date());
 | 
	
		
			
				|  |  |                      userAllocation.setUpdateTime(new Date());
 | 
	
		
			
				|  |  |                      allocationMapper.deleteById(userAllocation.getId());
 | 
	
	
		
			
				|  | @@ -273,26 +269,20 @@ public class CallbackController {
 | 
	
		
			
				|  |  |              // 媒体类型: 1 头条 2 快手
 | 
	
		
			
				|  |  |              String mediaId = json.getString("mediaId");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -            // 广告主名称
 | 
	
		
			
				|  |  | -            String advertiserName = json.getString("advertiser_name");
 | 
	
		
			
				|  |  |              //创建人
 | 
	
		
			
				|  |  |              String userId = json.getString("userId");
 | 
	
		
			
				|  |  |              //创建人
 | 
	
		
			
				|  |  |              String userName = json.getString("userName");
 | 
	
		
			
				|  |  |              Long projectId = json.getLong("projectId");
 | 
	
		
			
				|  |  | -            String projectName = json.getString("projectName");
 | 
	
		
			
				|  |  |              BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
 | 
	
		
			
				|  |  |              BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |              JSONObject data = resultObject.getJSONObject("data");
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |              if (Check.isNull(data)) {
 | 
	
		
			
				|  |  |                  returnMap.put("code", -1);
 | 
	
		
			
				|  |  |                  returnMap.put("desc", "返回信息为空");
 | 
	
		
			
				|  |  |                  return returnMap;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |              data.remove("advertiser_id");
 | 
	
		
			
				|  |  |              JSONArray advertiser_ids = data.getJSONArray("advertiser_ids");
 | 
	
		
			
				|  |  |              if (Check.isNull(advertiser_ids)) {
 | 
	
	
		
			
				|  | @@ -344,10 +334,8 @@ public class CallbackController {
 | 
	
		
			
				|  |  |                              userAllocation.setUserId(userId);
 | 
	
		
			
				|  |  |                              userAllocation.setUserName(userName);
 | 
	
		
			
				|  |  |                              userAllocation.setAccountId(token.getAccountId());
 | 
	
		
			
				|  |  | -                       //     userAllocation.setAdvertiserName(advertiserName);
 | 
	
		
			
				|  |  |                              userAllocation.setMediaId(mediaId);
 | 
	
		
			
				|  |  |                              userAllocation.setProjectId(projectId);
 | 
	
		
			
				|  |  | -                         //   userAllocation.setProjectName(projectName);
 | 
	
		
			
				|  |  |                              userAllocation.setSystemType(systemType);
 | 
	
		
			
				|  |  |                              userAllocation.setAuthName((String) advertiserDataMap.get("name"));
 | 
	
		
			
				|  |  |                              userAllocation.setAdvertiserId(advertiserId);
 | 
	
	
		
			
				|  | @@ -398,10 +386,8 @@ public class CallbackController {
 | 
	
		
			
				|  |  |                      userAllocation.setUserId(userId);
 | 
	
		
			
				|  |  |                      userAllocation.setUserName(userName);
 | 
	
		
			
				|  |  |                      userAllocation.setAccountId(token.getAccountId());
 | 
	
		
			
				|  |  | -               //     userAllocation.setAdvertiserName(advertiserName);
 | 
	
		
			
				|  |  |                      userAllocation.setMediaId(mediaId);
 | 
	
		
			
				|  |  |                      userAllocation.setProjectId(projectId);
 | 
	
		
			
				|  |  | -                //    userAllocation.setProjectName(projectName);
 | 
	
		
			
				|  |  |                      userAllocation.setSystemType(systemType);
 | 
	
		
			
				|  |  |                      userAllocation.setAuthName((String) advertiserDataMap.get("name"));
 | 
	
		
			
				|  |  |                      userAllocation.setAdvertiserId(advertiserId);
 |