|
@@ -1,5 +1,6 @@
|
|
package com.ruixuan.report.service.impl;
|
|
package com.ruixuan.report.service.impl;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.ruixuan.common.core.domain.entity.SysUser;
|
|
import com.ruixuan.common.core.domain.entity.SysUser;
|
|
import com.ruixuan.common.utils.Check;
|
|
import com.ruixuan.common.utils.Check;
|
|
@@ -300,12 +301,10 @@ public class KuaishouLiveAccountReportServiceImpl implements IKuaishouLiveAccoun
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<JSONObject> getAccountDataReport(JSONObject request) {
|
|
|
|
- String startDate = request.getString("startDate");
|
|
|
|
- String endDate = request.getString("endDate");
|
|
|
|
|
|
+ public List<JSONObject> getAccountDataReport(Long userId, String accountIdList, String startDate, String endDate) {
|
|
//整理入参时间
|
|
//整理入参时间
|
|
Map<String, Object> map = getDateTime(startDate, endDate);
|
|
Map<String, Object> map = getDateTime(startDate, endDate);
|
|
- map.put("accountIdList", request.getJSONArray("accountIdList"));
|
|
|
|
|
|
+ map.put("accountIdList", JSONArray.parseArray(accountIdList));
|
|
String type = map.get("type").toString();
|
|
String type = map.get("type").toString();
|
|
String filedAll = JsonResourceUtil.joinAllFiled(AccountReportConstants.getKuaishouAccountReport());
|
|
String filedAll = JsonResourceUtil.joinAllFiled(AccountReportConstants.getKuaishouAccountReport());
|
|
System.out.println(filedAll);
|
|
System.out.println(filedAll);
|