|
@@ -3316,8 +3316,11 @@ public class GameDataServiceImpl implements IGameDataService {
|
|
.map(Long::parseLong)
|
|
.map(Long::parseLong)
|
|
.toArray(Long[]::new);
|
|
.toArray(Long[]::new);
|
|
}
|
|
}
|
|
- //计算游戏首日复充总计
|
|
|
|
- formatFirstNewUserAgainTotal(voAgainData, usersIdTotal);
|
|
|
|
|
|
+ //voAgainData有值时进行映射的取值处理
|
|
|
|
+ if (StringUtils.isNotBlank(voAgainData.getDa1())) {
|
|
|
|
+ //计算游戏首日复充总计
|
|
|
|
+ formatFirstNewUserAgainTotal(voAgainData, usersIdTotal);
|
|
|
|
+ }
|
|
//将两个对象的属性结合
|
|
//将两个对象的属性结合
|
|
copyNullProperties(voAgainData, voGameData);
|
|
copyNullProperties(voAgainData, voGameData);
|
|
//返回
|
|
//返回
|