feat : 支付模块修改

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/GamePayWayListVO.java

@@ -12,10 +12,10 @@ import lombok.Data;
 public class GamePayWayListVO {
 
     @ApiModelProperty(notes = "主键id")
-    private String id;
+    private Long id;
 
     @ApiModelProperty(notes = "游戏id")
-    private String gameId;
+    private Long gameId;
 
     @ApiModelProperty(notes = "游戏名称")
     private String gameName;
@@ -27,7 +27,7 @@ public class GamePayWayListVO {
     private String gameCategory;
 
     @ApiModelProperty(notes = "支付方式id")
-    private Integer payWayCode;
+    private Long payWayId;
 
     @ApiModelProperty(notes = "支付方式名称")
     private String payWayName;

game-module/game-manage/src/main/java/com/zanxiang/manage/service/GameService.java

@@ -138,4 +138,11 @@ public interface GameService extends IService<Game> {
      * @return {@link Map}<{@link Long}, {@link GameDTO}>
      */
     Map<Long, GameDTO> gameMap(Collection<Long> gameIds);
+
+    /**
+     * 游戏列表
+     *
+     * @return {@link Map}<{@link Long}, {@link GameDTO}>
+     */
+    Map<Long, GameDTO> gameMap();
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GamePayWayServiceImpl.java

@@ -9,6 +9,8 @@ import com.zanxiang.common.enums.StatusEnum;
 import com.zanxiang.common.exception.ParamNullException;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
+import com.zanxiang.manage.domain.dto.GameCategoryDTO;
+import com.zanxiang.manage.domain.dto.GameDTO;
 import com.zanxiang.manage.domain.params.GameAnalogPayParam;
 import com.zanxiang.manage.domain.params.GamePayWayListParam;
 import com.zanxiang.manage.domain.params.GamePayWayParam;
@@ -49,6 +51,12 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
     @Autowired
     private GameStrategyService gameStrategyService;
 
+    @Autowired
+    private GameCategoryService gameCategoryService;
+
+    @Autowired
+    private GameService gameService;
+
     @Override
     public List<GamePayWayVO> getByGameId(Long gameId) {
         List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
@@ -80,17 +88,30 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
 
     @Override
     public IPage<GamePayWayListVO> list(GamePayWayListParam param) {
+        Map<Long, GameCategoryDTO> gameCategoryMap = gameCategoryService.gameCategoryMap();
+        Map<Long, GameDTO> gameMap = gameService.gameMap();
         return super.page(param.toPage(), new LambdaQueryWrapper<GamePayWay>()
                 .eq(param.getGameId() != null, GamePayWay::getGameId, param.getGameId())
                 .eq(param.getPayWayId() != null, GamePayWay::getPayWayId, param.getPayWayId())
-                .eq(param.getStatus() != null, GamePayWay::getStatus, param.getStatus())).convert(this::toVO);
+                .eq(param.getStatus() != null, GamePayWay::getStatus, param.getStatus()))
+                .convert(gamePayWay -> this.toVO(gameMap, gameCategoryMap, gamePayWay));
     }
 
-    private GamePayWayListVO toVO(GamePayWay gamePayWay) {
+    private GamePayWayListVO toVO(Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap, GamePayWay gamePayWay) {
         if (gamePayWay == null) {
             return null;
         }
-        return BeanUtils.copy(gamePayWay, GamePayWayListVO.class);
+        GamePayWayListVO gamePayWayListVO = BeanUtils.copy(gamePayWay, GamePayWayListVO.class);
+        GameDTO gameDTO = gameMap.get(gamePayWayListVO.getGameId());
+        if (gameDTO != null) {
+            gamePayWayListVO.setGameName(gameDTO.getName());
+            GameCategoryDTO gameCategoryDTO = gameCategoryMap.get(gameDTO.getCategory());
+            if (gameCategoryDTO != null) {
+                gamePayWayListVO.setGameCategoryId(gameCategoryDTO.getId());
+                gamePayWayListVO.setGameCategory(gameCategoryDTO.getName());
+            }
+        }
+        return gamePayWayListVO;
     }
 
     /**

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameServiceImpl.java

@@ -560,6 +560,21 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements Ga
         return gameDTOList.stream().collect(Collectors.toMap(GameDTO::getId, Function.identity()));
     }
 
+    /**
+     * 游戏列表
+     *
+     * @return {@link Map}<{@link Long}, {@link GameDTO}>
+     */
+    @Override
+    public Map<Long, GameDTO> gameMap() {
+        List<Game> gameList = super.list();
+        if (CollectionUtils.isEmpty(gameList)) {
+            return Collections.emptyMap();
+        }
+        List<GameDTO> gameDTOList = BeanUtils.copyList(gameList, GameDTO.class);
+        return gameDTOList.stream().collect(Collectors.toMap(GameDTO::getId, Function.identity()));
+    }
+
     /**
      * 根据主键id删除
      *