|
@@ -523,19 +523,20 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
|
|
|
try {
|
|
try {
|
|
//查询 头条利润表 时间段内 所有 账户
|
|
//查询 头条利润表 时间段内 所有 账户
|
|
- List<Map<String,Object>> list = reportSettlementMapper.getProfitBytedanceAccountCost(null,paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
|
|
|
+
|
|
|
|
+ List<Map<String,Object>> list = reportSettlementMapper.getProfitBytedanceAccount(paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
if (Check.isNull(list)){
|
|
if (Check.isNull(list)){
|
|
return Result.errorMsg("暂无数据");
|
|
return Result.errorMsg("暂无数据");
|
|
}
|
|
}
|
|
List<ProfitReportBytedanceVo> resultList = new ArrayList<>(list.size());
|
|
List<ProfitReportBytedanceVo> resultList = new ArrayList<>(list.size());
|
|
- for (Map<String, Object> map : list) {
|
|
|
|
|
|
+ for (Map<String, Object> mapList : list) {
|
|
//查看该账户 状态信息
|
|
//查看该账户 状态信息
|
|
QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
sysLogQw.eq("log_type", 2);
|
|
sysLogQw.eq("log_type", 2);
|
|
//操作类型
|
|
//操作类型
|
|
sysLogQw.eq("operate_type", 10001);
|
|
sysLogQw.eq("operate_type", 10001);
|
|
sysLogQw.eq("log_content", "0");//0开 1关
|
|
sysLogQw.eq("log_content", "0");//0开 1关
|
|
- sysLogQw.eq("request_param", map.get("accountId").toString());
|
|
|
|
|
|
+ sysLogQw.eq("request_param", mapList.get("accountId").toString());
|
|
sysLogQw.orderByDesc("create_time");
|
|
sysLogQw.orderByDesc("create_time");
|
|
sysLogQw.last("limit 1");
|
|
sysLogQw.last("limit 1");
|
|
SysLog sysLog = sysLogMapper.selectOne(sysLogQw);
|
|
SysLog sysLog = sysLogMapper.selectOne(sysLogQw);
|
|
@@ -549,6 +550,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //查看账户数据
|
|
|
|
+ Map<String,Object> map = reportSettlementMapper.getProfitBytedanceAccountCost(mapList.get("accountId").toString(),paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
|
|
|
ProfitReportBytedanceVo voSource = new ProfitReportBytedanceVo();
|
|
ProfitReportBytedanceVo voSource = new ProfitReportBytedanceVo();
|
|
voSource.setAccountId(map.get("accountId")+"");
|
|
voSource.setAccountId(map.get("accountId")+"");
|