Kaynağa Gözat

:fix:修改玩家列表bug

zhangxianyu 11 ay önce
ebeveyn
işleme
4ae87e2427

+ 4 - 4
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/component/DataPowerComponent.java

@@ -61,13 +61,13 @@ public class DataPowerComponent {
             return Tuple2.with(new ArrayList<>(subUserIds), null);
             return Tuple2.with(new ArrayList<>(subUserIds), null);
         }
         }
         GameAuthUserVO userGameInfo = gameAuthRpc.getGameAuthByUserIds().getData();
         GameAuthUserVO userGameInfo = gameAuthRpc.getGameAuthByUserIds().getData();
+        log.error("11111, userId :{}, userGameInfo : {}", SecurityUtil.getUserId(), JsonUtil.toString(userGameInfo));
         List<Long> gameIdList = userGameInfo.getGameIdList();
         List<Long> gameIdList = userGameInfo.getGameIdList();
-        String str = gameIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
-        log.error("RPC查询出的游戏{}", str);
+//        String str = gameIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
         //原有的游戏ID添加通包游戏的权限
         //原有的游戏ID添加通包游戏的权限
         List<Long> gameIds = getFullGameIdList(userGameInfo.getGameIdList());
         List<Long> gameIds = getFullGameIdList(userGameInfo.getGameIdList());
-        String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
-        log.error("RPC查询出的游戏{}", strIds);
+//        String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+        log.error("22222, userId :{},gameIds : {}",SecurityUtil.getUserId(), JsonUtil.toString(gameIds));
         if (CollectionUtils.isEmpty(gameIds)) {
         if (CollectionUtils.isEmpty(gameIds)) {
             throw new BaseException("没有游戏查看权限,请联系管理员指派游戏权限");
             throw new BaseException("没有游戏查看权限,请联系管理员指派游戏权限");
         }
         }

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

@@ -2,6 +2,7 @@ package com.zanxiang.game.data.serve.service.impl;
 
 
 import com.github.sd4324530.jtuple.Tuple2;
 import com.github.sd4324530.jtuple.Tuple2;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.CaseFormat;
+import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.data.serve.component.DataPowerComponent;
 import com.zanxiang.game.data.serve.component.DataPowerComponent;
 import com.zanxiang.game.data.serve.pojo.dto.AdsOrderDetailDTO;
 import com.zanxiang.game.data.serve.pojo.dto.AdsOrderDetailDTO;
 import com.zanxiang.game.data.serve.pojo.dto.AdsOrderDetailListDTO;
 import com.zanxiang.game.data.serve.pojo.dto.AdsOrderDetailListDTO;
@@ -14,6 +15,7 @@ import com.zanxiang.game.data.serve.pojo.vo.AdsOrderDetailVO;
 import com.zanxiang.game.data.serve.pojo.vo.OrderCPDetailVO;
 import com.zanxiang.game.data.serve.pojo.vo.OrderCPDetailVO;
 import com.zanxiang.game.data.serve.service.IAdsOrderDetailService;
 import com.zanxiang.game.data.serve.service.IAdsOrderDetailService;
 import com.zanxiang.game.data.serve.utils.Page;
 import com.zanxiang.game.data.serve.utils.Page;
+import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -45,8 +47,8 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
         List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(Long.parseLong(dto.getPitcherId()));
         List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(Long.parseLong(dto.getPitcherId()));
         List<Long> gameIds = CollectionUtils.isEmpty(dto.getGameId()) ? poerInfo.second : dto.getGameId();
         List<Long> gameIds = CollectionUtils.isEmpty(dto.getGameId()) ? poerInfo.second : dto.getGameId();
-        String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
-        log.error("最终游戏gameIds:{}", strIds);
+//        String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+        log.error("33333, userId:{},gameIds : {}", SecurityUtil.getUserId(),JsonUtil.toString(gameIds));
         Criteria cri = Cnd.cri();
         Criteria cri = Cnd.cri();
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
             cri.where().andEquals("source_system", dto.getSourceSystem());