|
@@ -39,6 +39,7 @@ import java.io.IOException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
|
+import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -63,7 +64,6 @@ public class BindAccountLoginController {
|
|
private ICreateInternalService createInternalService;
|
|
private ICreateInternalService createInternalService;
|
|
|
|
|
|
/**
|
|
/**
|
|
- *
|
|
|
|
* @param json
|
|
* @param json
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -72,7 +72,6 @@ public class BindAccountLoginController {
|
|
Result<IPage<BindAccountLogin>> result = new Result<>();
|
|
Result<IPage<BindAccountLogin>> result = new Result<>();
|
|
String advertiserId = json.getString("advertiserId");
|
|
String advertiserId = json.getString("advertiserId");
|
|
if (Check.isNull(advertiserId)) {
|
|
if (Check.isNull(advertiserId)) {
|
|
- System.err.println("advertiserId不能为空");
|
|
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -84,8 +83,17 @@ public class BindAccountLoginController {
|
|
String advertiserName = json.getString("advertiser_name");
|
|
String advertiserName = json.getString("advertiser_name");
|
|
//账号
|
|
//账号
|
|
String accountName = json.getString("accountName");
|
|
String accountName = json.getString("accountName");
|
|
- boolean trueOrFalse = createInternalService.bindLogin(advertiserId, accountName, password, loginType, userId, advertiserName);
|
|
|
|
|
|
+ Map<String, Object> stringObjectMap = createInternalService.bindLogin(advertiserId, accountName, password, loginType, userId, advertiserName);
|
|
|
|
+ Boolean trueOrFalse = (Boolean) stringObjectMap.get("success");
|
|
if (trueOrFalse) {
|
|
if (trueOrFalse) {
|
|
|
|
+ Map<String, Object> deleteMap = new HashMap<>();
|
|
|
|
+ deleteMap.put("account_name", accountName);
|
|
|
|
+ deleteMap.put("user_id", userId);
|
|
|
|
+ deleteMap.put("advertiser_id", advertiserId);
|
|
|
|
+ userAllocationMapper.deleteByMap(deleteMap);
|
|
|
|
+
|
|
|
|
+ Long accountId = (Long) stringObjectMap.get("accountId");
|
|
|
|
+
|
|
String realName = json.getString("realName");
|
|
String realName = json.getString("realName");
|
|
//部门id
|
|
//部门id
|
|
String departmentId = json.getString("departmentId");
|
|
String departmentId = json.getString("departmentId");
|
|
@@ -97,6 +105,7 @@ public class BindAccountLoginController {
|
|
userAllocation.setDistributionName(distributionName);
|
|
userAllocation.setDistributionName(distributionName);
|
|
userAllocation.setUserId(userId);
|
|
userAllocation.setUserId(userId);
|
|
userAllocation.setAdvertiserId(advertiserId);
|
|
userAllocation.setAdvertiserId(advertiserId);
|
|
|
|
+ userAllocation.setAccountId(accountId);
|
|
userAllocation.setDepartmentId(departmentId);
|
|
userAllocation.setDepartmentId(departmentId);
|
|
userAllocation.setAdvertiserName(advertiserName);
|
|
userAllocation.setAdvertiserName(advertiserName);
|
|
userAllocation.setAccountName(accountName);
|
|
userAllocation.setAccountName(accountName);
|