|
@@ -684,19 +684,19 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
|
|
|
try {
|
|
|
//查询 快手利润表 时间段内的 所有账户
|
|
|
- List<Map<String,Object>> list = reportSettlementMapper.getProfitKuaiShouAccountCost(null,paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
+ List<Map<String,Object>> list = reportSettlementMapper.getProfitKuaiShouAgentAccount(paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
if (Check.isNull(list)){
|
|
|
return Result.errorMsg("暂无数据");
|
|
|
}
|
|
|
List<ProfitReportKuaiShouVo> resultList = new ArrayList<>(list.size());
|
|
|
- for (Map<String, Object> map : list) {
|
|
|
+ for (Map<String, Object> mapList : list) {
|
|
|
//查看该账户 状态信息
|
|
|
QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
|
sysLogQw.eq("log_type", 2);
|
|
|
//操作类型
|
|
|
sysLogQw.eq("operate_type", 10001);
|
|
|
sysLogQw.eq("log_content", "0");//0开 1关
|
|
|
- sysLogQw.eq("request_param", map.get("accountId").toString());
|
|
|
+ sysLogQw.eq("request_param", mapList.get("account_id").toString());
|
|
|
sysLogQw.orderByDesc("create_time");
|
|
|
sysLogQw.last("limit 1");
|
|
|
SysLog sysLog = sysLogMapper.selectOne(sysLogQw);
|
|
@@ -711,8 +711,9 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //查询账户数据信息
|
|
|
+ Map<String,Object> map = reportSettlementMapper.getProfitKuaiShouAccountCost(mapList.get("account_id").toString(),paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
ProfitReportKuaiShouVo voSource = new ProfitReportKuaiShouVo();
|
|
|
-
|
|
|
voSource.setAccountId(map.getOrDefault("accountId", "") + "");//账户id
|
|
|
voSource.setProductName( !Check.isNull(map.get("productName")) ? map.getOrDefault("productName", "") + "" : "");//产品名称
|
|
|
voSource.setKsId(map.getOrDefault("ksId", "") + "");//快手id
|