|
@@ -16,9 +16,7 @@ import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportHourlyAccountMap
|
|
import cn.com.ctop.kuaishou.modules.report.service.IEtlKuaishouReportAccountHourlyService;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IEtlKuaishouReportAccountHourlyService;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
-import org.apache.shiro.SecurityUtils;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
-import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -140,11 +138,14 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
public Result<Object> getMaxChargeAccountId(Long accountId, String userId) {
|
|
public Result<Object> getMaxChargeAccountId(Long accountId, String userId) {
|
|
if (Check.isNull(accountId)) {
|
|
if (Check.isNull(accountId)) {
|
|
accountId = etlDailyAccountMapper.getMaxChargeAccountId(userId);
|
|
accountId = etlDailyAccountMapper.getMaxChargeAccountId(userId);
|
|
|
|
+ if (Check.isNull(accountId)) {
|
|
|
|
+ accountId = etlDailyAccountMapper.getMaxCharge();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
JSONObject obj = new JSONObject();
|
|
JSONObject obj = new JSONObject();
|
|
CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
|
|
CtopOauthToken oauthToken = oauthTokenService.getTokenByAccountId(accountId);
|
|
if (Check.isNull(oauthToken)) {
|
|
if (Check.isNull(oauthToken)) {
|
|
- return Result.error("未获取到账户信息");
|
|
|
|
|
|
+ return Result.error("未获取到账户信息,accountId:" + accountId);
|
|
}
|
|
}
|
|
JSONObject fundJson = iKuaishouInterfaceService.fundGet(oauthToken);
|
|
JSONObject fundJson = iKuaishouInterfaceService.fundGet(oauthToken);
|
|
if (!Check.isNull(fundJson)) {
|
|
if (!Check.isNull(fundJson)) {
|