|
@@ -522,7 +522,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
List<ProfitReportBytedanceVo> resultList = new ArrayList<>(list.size());
|
|
|
for (Map<String, Object> mapList : list) {
|
|
|
//查看该账户 状态信息
|
|
|
- QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
|
+ /*QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
|
sysLogQw.eq("log_type", 2);
|
|
|
//操作类型
|
|
|
sysLogQw.eq("operate_type", 10001);
|
|
@@ -537,10 +537,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
int crate = Integer.valueOf(createMonth);
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
int month = cal.get(Calendar.MONTH) + 1;
|
|
|
- if ( crate != month || crate != month-1 ){
|
|
|
- continue;
|
|
|
- }
|
|
|
- }
|
|
|
+ }*/
|
|
|
//查看账户数据
|
|
|
Map<String,Object> map = reportSettlementMapper.getProfitBytedanceAccountCost(mapList.get("accountId").toString(),paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
|
|
@@ -683,7 +680,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
List<ProfitReportKuaiShouVo> resultList = new ArrayList<>(list.size());
|
|
|
for (Map<String, Object> mapList : list) {
|
|
|
//查看该账户 状态信息
|
|
|
- QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
|
+ /* QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
|
|
|
sysLogQw.eq("log_type", 2);
|
|
|
//操作类型
|
|
|
sysLogQw.eq("operate_type", 10001);
|
|
@@ -695,13 +692,11 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
if (!Check.isNull(sysLog)) {
|
|
|
SimpleDateFormat m = new SimpleDateFormat("MM");
|
|
|
String createMonth = m.format(sysLog.getCreateTime());
|
|
|
- int crate = Integer.valueOf(createMonth);
|
|
|
+ int crate = Integer.parseInt(createMonth);
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
int month = cal.get(Calendar.MONTH) + 1;
|
|
|
- if ( crate != month || crate != month-1 ){
|
|
|
- continue;
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+ }*/
|
|
|
|
|
|
//查询账户数据信息
|
|
|
Map<String,Object> map = reportSettlementMapper.getProfitKuaiShouAccountCost(mapList.get("account_id").toString(),paramsVo.getStartTime(),paramsVo.getEndTime());
|