Jelajahi Sumber

修改排序

kk 3 minggu lalu
induk
melakukan
bac3722244

+ 2 - 0
game-business/src/main/java/com/game/business/controller/AppUserAgentController.java

@@ -255,6 +255,8 @@ public class AppUserAgentController extends BaseController
             }
         }
 
+        gameCommissionVOList = gameCommissionVOList.stream().sorted(Comparator.comparingLong(AppGameCommissionVO::getGameId)).collect(Collectors.toList());
+
         appUserAgentVO.setCommissions(gameCommissionVOList);
 
         return HttpRet.success("查询成功", appUserAgentVO);

+ 5 - 0
game-business/src/main/java/com/game/business/service/impl/AppUserAgentServiceImpl.java

@@ -18,6 +18,7 @@ import com.game.business.dto.AppAgentTeamDto;
 import com.game.business.dto.AppUserTeamTranserDto;
 import com.game.business.service.*;
 import com.game.business.vo.AppAgentTeamVo;
+import com.game.business.vo.AppGameCommissionVO;
 import com.game.common.constant.AppSceneType;
 import com.game.common.constant.finance.FinTranAddedInfo;
 import com.game.common.constant.finance.FinTranType1;
@@ -238,6 +239,7 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
                                 commission.setPid(e.getPid());
                             }
                         });
+
                         e.setGameCommissionList(commissionList);
                     }else if(null != gameList && gameList.size() > 0){
                         e.setGameCommissionList(gameList.stream().map(j->{
@@ -250,6 +252,9 @@ public class AppUserAgentServiceImpl extends ServiceImpl<AppUserAgentMapper, App
                             return gameCommission;
                         }).collect(Collectors.toList()));
                     }
+
+                    e.setGameCommissionList(e.getGameCommissionList().stream().sorted(Comparator.comparingLong(AppGameCommission::getGameId)).collect(Collectors.toList()));
+
                     if(!teamDto.getPid().equals(e.getUserId())) {
                         //非当前用户则统计整条线用户数据
                         List<AppUserCount> appUserCountList = appUserCountService.getAppUserCountNew(e.getUserId(), teamDto.getBeginTime(), teamDto.getEndTime());