|
@@ -3,7 +3,10 @@ package org.jeecg.modules.ctop.service.impl;
|
|
|
import cn.com.ctop.common.module.entity.Project;
|
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
|
import cn.com.ctop.common.module.mapper.UserAllocationMapper;
|
|
|
-import cn.com.ctop.common.module.service.*;
|
|
|
+import cn.com.ctop.common.module.service.IProductService;
|
|
|
+import cn.com.ctop.common.module.service.IProjectService;
|
|
|
+import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
|
+import cn.com.ctop.common.module.service.ISysUserService;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -96,7 +99,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
|
|
|
//视频报表
|
|
|
@Override
|
|
|
- public List<ProjectMember> getProjects(List<Integer> mediaIds,String userId) {
|
|
|
+ public List<ProjectMember> getProjects(List<Integer> mediaIds, String userId) {
|
|
|
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
// String userId = sysUser.getId();
|
|
|
String roleCode = memberMapper.getRoleCodeByUserId(userId);
|
|
@@ -153,6 +156,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
|
|
|
return projectMemberList;
|
|
|
}
|
|
|
+
|
|
|
@Override
|
|
|
public List<Map<String, Object>> getProjectAccountByUserId(String userId, String mediaType) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
@@ -410,6 +414,9 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
}
|
|
|
member.setMediaId(projectJson.getString("mediaId"));
|
|
|
member.setMaxBid(projectJson.getLong("maxBid"));
|
|
|
+ member.setBidType(projectJson.getString("bidType"));
|
|
|
+ member.setOcpxActionType(projectJson.getString("ocpxActionType"));
|
|
|
+ member.setDeepConversionType(projectJson.getString("deepConversionType"));
|
|
|
String advertiserId = projectJson.getString("advertiserId");
|
|
|
member.setAdvertiserId(advertiserId);
|
|
|
if (!Check.isNullMap(advertiserMap)) {
|