|
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
@@ -50,7 +51,7 @@ public class CallbackController {
|
|
private IKuaishouInterfaceService kuaishouInterfaceService;
|
|
private IKuaishouInterfaceService kuaishouInterfaceService;
|
|
@Autowired
|
|
@Autowired
|
|
private IBindAccountAuthService bindAccountAuthService;
|
|
private IBindAccountAuthService bindAccountAuthService;
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private UserAllocationMapper allocationMapper;
|
|
private UserAllocationMapper allocationMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private ICtopOauthTokenService ctopOauthTokenService;
|
|
private ICtopOauthTokenService ctopOauthTokenService;
|
|
@@ -147,6 +148,7 @@ public class CallbackController {
|
|
//创建人
|
|
//创建人
|
|
String userId = json.getString("userId");
|
|
String userId = json.getString("userId");
|
|
Long projectId = json.getLong("projectId");
|
|
Long projectId = json.getLong("projectId");
|
|
|
|
+ String authBeginTime = json.getString("authBeginTime");
|
|
BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
|
|
BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
|
|
BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
|
|
BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
|
|
String systemType = json.getString("systemType");
|
|
String systemType = json.getString("systemType");
|
|
@@ -185,6 +187,7 @@ public class CallbackController {
|
|
userAllocation.setSystemType(systemType);
|
|
userAllocation.setSystemType(systemType);
|
|
// 获取快手昵称
|
|
// 获取快手昵称
|
|
userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
|
|
userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
|
|
|
|
+ userAllocation.setAuthBeginTime(authBeginTime);
|
|
userAllocation.setMediaId(mediaId);
|
|
userAllocation.setMediaId(mediaId);
|
|
userAllocation.setAccountId(accountId);
|
|
userAllocation.setAccountId(accountId);
|
|
userAllocation.setProjectId(projectId);
|
|
userAllocation.setProjectId(projectId);
|
|
@@ -274,6 +277,7 @@ public class CallbackController {
|
|
String userId = json.getString("userId");
|
|
String userId = json.getString("userId");
|
|
//创建人
|
|
//创建人
|
|
String userName = json.getString("userName");
|
|
String userName = json.getString("userName");
|
|
|
|
+ String authBeginTime = json.getString("authBeginTime");
|
|
Long projectId = json.getLong("projectId");
|
|
Long projectId = json.getLong("projectId");
|
|
BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
|
|
BigDecimal warningProportion = json.getBigDecimal("WarningProportion");
|
|
BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
|
|
BigDecimal warningAmount = json.getBigDecimal("WarningAmount");
|
|
@@ -339,6 +343,7 @@ public class CallbackController {
|
|
userAllocation.setProjectId(projectId);
|
|
userAllocation.setProjectId(projectId);
|
|
userAllocation.setSystemType(systemType);
|
|
userAllocation.setSystemType(systemType);
|
|
userAllocation.setAuthName((String) advertiserDataMap.get("name"));
|
|
userAllocation.setAuthName((String) advertiserDataMap.get("name"));
|
|
|
|
+ userAllocation.setAuthBeginTime(authBeginTime);
|
|
userAllocation.setAdvertiserId(advertiserId);
|
|
userAllocation.setAdvertiserId(advertiserId);
|
|
userAllocation.setWarningProportion(warningProportion);
|
|
userAllocation.setWarningProportion(warningProportion);
|
|
userAllocation.setWarningAmount(warningAmount);
|
|
userAllocation.setWarningAmount(warningAmount);
|
|
@@ -391,6 +396,7 @@ public class CallbackController {
|
|
userAllocation.setProjectId(projectId);
|
|
userAllocation.setProjectId(projectId);
|
|
userAllocation.setSystemType(systemType);
|
|
userAllocation.setSystemType(systemType);
|
|
userAllocation.setAuthName((String) advertiserDataMap.get("name"));
|
|
userAllocation.setAuthName((String) advertiserDataMap.get("name"));
|
|
|
|
+ userAllocation.setAuthBeginTime(authBeginTime);
|
|
userAllocation.setAdvertiserId(advertiserId);
|
|
userAllocation.setAdvertiserId(advertiserId);
|
|
userAllocation.setWarningProportion(warningProportion);
|
|
userAllocation.setWarningProportion(warningProportion);
|
|
userAllocation.setWarningAmount(warningAmount);
|
|
userAllocation.setWarningAmount(warningAmount);
|