|
@@ -99,12 +99,12 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
Map<String,Object> kuaishouMap = new HashMap<>();
|
|
|
for (String month : quarterStr ){
|
|
|
//头条
|
|
|
- JSONObject bytedanceJson = designerMapper.getHotVideoData(userId,roleName,"1",yearTime,month);
|
|
|
+ JSONObject bytedanceJson = designerMapper.getHotVideoData(userId,roleName,1,Integer.valueOf(yearTime),Integer.valueOf(month));
|
|
|
bytedanceJson.put("monthTime",month);
|
|
|
byteDanceList.add(bytedanceJson);
|
|
|
bytedanceMap.put("byteDance",byteDanceList);
|
|
|
//快手
|
|
|
- JSONObject kuaishouJson = designerMapper.getHotVideoData(userId,roleName,"2",yearTime,month);
|
|
|
+ JSONObject kuaishouJson = designerMapper.getHotVideoData(userId,roleName,2,Integer.valueOf(yearTime),Integer.valueOf(month));
|
|
|
kuaishouJson.put("monthTime",month);
|
|
|
kuaishouList.add(kuaishouJson);
|
|
|
kuaishouMap.put("kuaishou",kuaishouList);
|
|
@@ -130,13 +130,13 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
Map<String,Object> bytedanceMap = new HashMap<>();
|
|
|
Map<String,Object> kuaishouMap = new HashMap<>();
|
|
|
//头条
|
|
|
- List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId,yearTime,month);
|
|
|
+ List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId,Integer.valueOf(yearTime),Integer.valueOf(month));
|
|
|
bytedanceMap.put("monthTime",month );
|
|
|
bytedanceMap.put("yearTime",timeMap.get("yearTime")+"" );
|
|
|
bytedanceMap.put("byteDance",bytedanceJson);
|
|
|
byteDanceList.add(bytedanceMap);
|
|
|
//快手
|
|
|
- List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId,yearTime,month);
|
|
|
+ List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId,Integer.valueOf(yearTime),Integer.valueOf(month));
|
|
|
kuaishouMap.put("monthTime",month );
|
|
|
bytedanceMap.put("yearTime",timeMap.get("yearTime")+"" );
|
|
|
kuaishouMap.put("kuaiShou",kuaishouJson);
|
|
@@ -251,7 +251,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
JSONObject userFrozen = designerMapper.getUserFrozenInfo(userId);
|
|
|
|
|
|
//季度 分媒体 素材消耗
|
|
|
- List<JSONObject> quarterCost = designerMapper.getDesignerBytedanceAndKuaishouQuaterCost(userId,yearTime,monthTime);
|
|
|
+ List<JSONObject> quarterCost = designerMapper.getDesignerBytedanceAndKuaishouQuaterCost(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
|
|
|
userFrozen.put("quarterCostList",quarterCost);
|
|
|
|
|
|
//季度素材 总消耗
|
|
@@ -259,7 +259,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
userFrozen.put("tatolQuarterCost",tatolCost);
|
|
|
|
|
|
//管理消耗
|
|
|
- JSONObject leaderCost = designerMapper.getDesignerManagerLeaderCost(userId,yearTime,monthTime);
|
|
|
+ JSONObject leaderCost = designerMapper.getDesignerManagerLeaderCost(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
|
|
|
userFrozen.put("leaderCost",leaderCost.getString("cost"));
|
|
|
|
|
|
|
|
@@ -274,7 +274,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
userFrozen.put("materialCostQualifiedFlag",materialCostQualifiedFlag);
|
|
|
|
|
|
//爆款素材数量
|
|
|
- JSONObject hotVideoNum = designerMapper.getUserHotMaterialQuarter(userId,yearTime,monthTime);
|
|
|
+ JSONObject hotVideoNum = designerMapper.getUserHotMaterialQuarter(userId,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
|
|
|
int hotVideoN = Check.isNull(hotVideoNum) ? 0 : hotVideoNum.getInteger("hotVideoNum");
|
|
|
userFrozen.put("hotVideoNum",hotVideoN);
|
|
|
|
|
@@ -310,11 +310,11 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
|
for (String month : quarterStr ) {
|
|
|
JSONObject commissionJson = new JSONObject();
|
|
|
//头条提成
|
|
|
- List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId, timeMap.get("yearTime") + "", month);
|
|
|
+ List<JSONObject> bytedanceJson = designerMapper.getDesignerAchievementsBytedance(userId, Integer.valueOf(timeMap.get("yearTime") + ""), Integer.valueOf(month));
|
|
|
Double bytedanceCommission = bytedanceJson.stream().mapToDouble(json -> json.getDouble("commission")).reduce(Double::sum).orElse(new Double("0"));
|
|
|
|
|
|
//快手提成
|
|
|
- List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId, timeMap.get("yearTime") + "", month);
|
|
|
+ List<JSONObject> kuaishouJson = designerMapper.getDesignerAchievementsKuaishou(userId, Integer.valueOf(timeMap.get("yearTime") + ""), Integer.valueOf(month));
|
|
|
Double kuaishouCommission = kuaishouJson.stream().mapToDouble(json -> json.getDouble("commission")).reduce(Double::sum).orElse(new Double("0"));
|
|
|
|
|
|
commissionJson.put("monthTime", month);
|