Selaa lähdekoodia

修改内容:推广

shishaosong 1 vuosi sitten
vanhempi
commit
e69f69ee68

+ 4 - 2
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameDataServiceImpl.java

@@ -673,9 +673,9 @@ public class GameDataServiceImpl implements IGameDataService {
                     List<AdsEverydayWater> adsEverydayWaters = collect.get(item.getGameId());
                     if (!CollectionUtils.isEmpty(adsEverydayWaters)) {
                         List<RechargeTemplateVO> rechargeTemplateVOList = new ArrayList<>(10);
-
                         List<PlayerTemplateVO> playerTemplateVOS = new ArrayList<>(10);
-                        adsEverydayWaters.forEach(adsEverydayWater -> {
+
+                        adsEverydayWaters.stream().filter(amountOrder -> null != amountOrder.getAmountOrderBy()).forEach(adsEverydayWater -> {
                             if (StringUtils.isNotBlank(adsEverydayWater.getAmountOrderBy())) {
                                 rechargeTemplateVOList.add(RechargeTemplateVO.builder()
                                         .amountCount(adsEverydayWater.getAmountCount())
@@ -684,6 +684,8 @@ public class GameDataServiceImpl implements IGameDataService {
                                         .amountPost(adsEverydayWater.getAmountPost())
                                         .build());
                             }
+                        });
+                        adsEverydayWaters.stream().filter(playerOrder -> null != playerOrder.getUserOrderBy()).forEach(adsEverydayWater -> {
                             if (StringUtils.isNotBlank(adsEverydayWater.getUserOrderBy())) {
                                 playerTemplateVOS.add(PlayerTemplateVO.builder()
                                         .userId(adsEverydayWater.getUserId())