:fix:修改订单bug

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

@@ -46,9 +46,13 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
     public Page<AdsOrderDetailVO> listOfPage(AdsOrderDetailListDTO dto) {
         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> gameIds = CollectionUtils.isEmpty(dto.getGameId()) ? poerInfo.second : dto.getGameId();
-//        String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
-        log.error("33333, userId:{},gameIds : {}", SecurityUtil.getUserId(),JsonUtil.toString(gameIds));
+        List<Long> paramGameIds = dto.getGameId();
+        if (CollectionUtils.isNotEmpty(paramGameIds)) {
+            //将paramGameIds中不在authGameIds中的游戏id过滤掉
+            paramGameIds.retainAll(poerInfo.second);
+        } else {
+            paramGameIds = poerInfo.second;
+        }
         Criteria cri = Cnd.cri();
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
@@ -74,8 +78,8 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
         if (StringUtils.isNotBlank(dto.getSourceServerName())) {
             cri.where().andLike("source_server_name", dto.getSourceServerName());
         }
-        if (gameIds != null) {
-            cri.where().andInList("order_game_id", gameIds);
+        if (paramGameIds != null) {
+            cri.where().andInList("order_game_id", paramGameIds);
         }
         if (CollectionUtils.isNotEmpty(dto.getChannelId())) {
             cri.where().andInStrList("agent_id", dto.getChannelId());
@@ -150,7 +154,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
             }
         }
         //添加判断，除去BG的数据 BG的数据在我们这找不到用户以及渠道
-        if(StringUtils.isNotEmpty(dto.getSourceSystem())&&dto.getSourceSystem().contains("BG")){
+        if (StringUtils.isNotEmpty(dto.getSourceSystem()) && dto.getSourceSystem().contains("BG")) {
             cri.where().andNotIsNull("agent_name");
             cri.where().andNotIsNull("username");
         }
@@ -297,7 +301,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
             }
         }
         //添加判断，除去BG的数据 BG的数据在我们这找不到用户以及渠道
-        if(StringUtils.isNotEmpty(dto.getSourceSystem())&&dto.getSourceSystem().contains("BG")){
+        if (StringUtils.isNotEmpty(dto.getSourceSystem()) && dto.getSourceSystem().contains("BG")) {
             cri.where().andNotIsNull("agent_name");
             cri.where().andNotIsNull("username");
         }
@@ -331,6 +335,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
 
     /**
      * 订单详情列表
+     *
      * @param gameOrder 原始表中的数据
      * @return AdsOrderDetailVO
      */
@@ -347,6 +352,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
 
     /**
      * cp回调信息
+     *
      * @param tPayCallCpLog 原始表中的数据
      * @return OrderCPDetailVO
      */
@@ -359,6 +365,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
 
     /**
      * 查询订单列表sql
+     *
      * @return String
      */
     private String getOrderDetailSql() {
@@ -530,6 +537,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
 
     /**
      * 查询订单列表记录数sql
+     *
      * @return String
      */
     private String getCountSql() {
@@ -701,6 +709,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
 
     /**
      * 查询订单总计
+     *
      * @return String
      */
     private String getOrderDetailTotalSql() {

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameListServiceImpl.java

@@ -1,10 +1,12 @@
 package com.zanxiang.game.data.serve.service.impl;
 
 import com.github.sd4324530.jtuple.Tuple2;
+import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.data.serve.component.DataPowerComponent;
 import com.zanxiang.game.data.serve.pojo.dto.ChoiceListDTO;
 import com.zanxiang.game.data.serve.pojo.vo.GameListVO;
 import com.zanxiang.game.data.serve.service.IGameListService;
+import com.zanxiang.module.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -44,6 +46,7 @@ public class GameListServiceImpl implements IGameListService {
     public GameListVO getGameList(ChoiceListDTO dto) {
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
         List<Long> gameIds = poerInfo.second;
+        log.error("userId:{},下拉框游戏列表gameIds:{}", SecurityUtil.getUserId(),JsonUtil.toString(gameIds));
         if (CollectionUtils.isEmpty(gameIds)) {
             return null;
         }
@@ -57,7 +60,10 @@ public class GameListServiceImpl implements IGameListService {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
         Criteria gameCri = Cnd.cri();
-        gameCri.where().andInList("a.id", gameIds);
+        if(CollectionUtils.isNotEmpty(gameIds)){
+            gameCri.where().andInList("a.id", gameIds);
+        }
+
         //查询游戏列表
         Sql gameListSql = Sqls.create("""
                 SELECT