|
@@ -256,7 +256,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public Result synchronousAccountTransactionDay(String startDate, String endDate) {
|
|
public Result synchronousAccountTransactionDay(String startDate, String endDate) {
|
|
- log.info("开始同步账号日流水");
|
|
|
|
|
|
+ log.info("开始同步账号日流水---日期{}---{}",startDate,endDate);
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
|
|
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
|
|
Calendar ca = Calendar.getInstance();
|
|
Calendar ca = Calendar.getInstance();
|
|
@@ -265,6 +265,8 @@ public class AgentManagementServiceImpl implements AgentManagementService {
|
|
|
|
|
|
try {
|
|
try {
|
|
List<String> accountIdList = ctopAgentAccountMapper.getAllAccountId();
|
|
List<String> accountIdList = ctopAgentAccountMapper.getAllAccountId();
|
|
|
|
+// List<String> accountIdList = new ArrayList<>();
|
|
|
|
+// accountIdList.add("1732060564940808");
|
|
if (!accountIdList.isEmpty()) {
|
|
if (!accountIdList.isEmpty()) {
|
|
accountIdList.stream().forEach(str -> {
|
|
accountIdList.stream().forEach(str -> {
|
|
List<TransactionDay> transactionDetailsList = new ArrayList<>();
|
|
List<TransactionDay> transactionDetailsList = new ArrayList<>();
|
|
@@ -291,6 +293,11 @@ public class AgentManagementServiceImpl implements AgentManagementService {
|
|
dataList.stream().forEach(ob -> {
|
|
dataList.stream().forEach(ob -> {
|
|
TransactionDay transactionDay = JSONObject.toJavaObject((JSON) ob, TransactionDay.class);
|
|
TransactionDay transactionDay = JSONObject.toJavaObject((JSON) ob, TransactionDay.class);
|
|
List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(), transactionDay.getAdvertiserId());
|
|
List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(), transactionDay.getAdvertiserId());
|
|
|
|
+
|
|
|
|
+ if (advertiserIdList.size() > 1){
|
|
|
|
+ ctopAccountTransactionDayMapper.deleteAccountTransactionById(advertiserIdList.get(0));
|
|
|
|
+ log.info("----------->删除重复数据。accountId:{},date:{}",transactionDay.getAdvertiserId(),transactionDay.getDate());
|
|
|
|
+ }
|
|
//订单号不存在
|
|
//订单号不存在
|
|
if (advertiserIdList.isEmpty() || advertiserIdList.size() <= 0) {
|
|
if (advertiserIdList.isEmpty() || advertiserIdList.size() <= 0) {
|
|
transactionDetailsList.add(transactionDay);
|
|
transactionDetailsList.add(transactionDay);
|
|
@@ -309,6 +316,10 @@ public class AgentManagementServiceImpl implements AgentManagementService {
|
|
TransactionDay transactionDay = JSONObject.toJavaObject((JSON) obj, TransactionDay.class);
|
|
TransactionDay transactionDay = JSONObject.toJavaObject((JSON) obj, TransactionDay.class);
|
|
List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(), transactionDay.getAdvertiserId());
|
|
List<String> advertiserIdList = ctopAccountTransactionDayMapper.getAdvertiserIdByDate(transactionDay.getDate(), transactionDay.getAdvertiserId());
|
|
|
|
|
|
|
|
+ if (advertiserIdList.size() > 1){
|
|
|
|
+ ctopAccountTransactionDayMapper.deleteAccountTransactionById(advertiserIdList.get(0));
|
|
|
|
+ }
|
|
|
|
+
|
|
//订单号不存在
|
|
//订单号不存在
|
|
if (advertiserIdList.isEmpty() || advertiserIdList.size() <= 0) {
|
|
if (advertiserIdList.isEmpty() || advertiserIdList.size() <= 0) {
|
|
transactionDetailsList.add(transactionDay);
|
|
transactionDetailsList.add(transactionDay);
|
|
@@ -401,8 +412,9 @@ public class AgentManagementServiceImpl implements AgentManagementService {
|
|
* @create: 2021-07-14
|
|
* @create: 2021-07-14
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
- public String getToken() {
|
|
|
|
- CtopOauthToken ctopOauthToken = ctopAgentAccountMapper.selectByAccountId(Long.parseLong(ADVERTISER_ID));
|
|
|
|
|
|
+ public String getToken(long advertiserId) {
|
|
|
|
+// CtopOauthToken ctopOauthToken = ctopAgentAccountMapper.selectByAccountId(Long.parseLong(ADVERTISER_ID));
|
|
|
|
+ CtopOauthToken ctopOauthToken = ctopAgentAccountMapper.selectByAccountId(advertiserId);
|
|
if (ctopOauthToken != null) {
|
|
if (ctopOauthToken != null) {
|
|
return ctopOauthToken.getAccessToken();
|
|
return ctopOauthToken.getAccessToken();
|
|
} else {
|
|
} else {
|
|
@@ -441,7 +453,7 @@ public class AgentManagementServiceImpl implements AgentManagementService {
|
|
* @create: 2021-07-14
|
|
* @create: 2021-07-14
|
|
*/
|
|
*/
|
|
public JSONObject sendHttpRequest(Map data, String apiUrl) {
|
|
public JSONObject sendHttpRequest(Map data, String apiUrl) {
|
|
- String access_token = getToken();
|
|
|
|
|
|
+ String access_token = getToken(Long.parseLong(data.get("advertiser_id").toString()));
|
|
// 构造请求
|
|
// 构造请求
|
|
HttpEntityEnclosingRequestBase httpEntity = new HttpEntityEnclosingRequestBase() {
|
|
HttpEntityEnclosingRequestBase httpEntity = new HttpEntityEnclosingRequestBase() {
|
|
@Override
|
|
@Override
|