feat : 游戏列表修改

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

@@ -1,7 +1,10 @@
 package com.zanxiang.manage.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author : lingfeng
@@ -9,13 +12,16 @@ import lombok.Data;
  * @description : 游戏支付方式
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class GamePayWayVO {
 
     /**
      * 主键id
      */
     @ApiModelProperty(notes = "支付方式id")
-    private String id;
+    private Long id;
 
     /**
      * 支付方式自定义别名（为空时则展示支付方式+游戏名称）

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

@@ -4,30 +4,26 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.DeleteEnum;
-import com.zanxiang.common.enums.PayWayEnum;
-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.dto.PayDeviceDTO;
 import com.zanxiang.manage.domain.params.GamePayWayListParam;
 import com.zanxiang.manage.domain.params.GamePayWayParam;
-import com.zanxiang.manage.domain.vo.*;
+import com.zanxiang.manage.domain.vo.GamePayWayListVO;
+import com.zanxiang.manage.domain.vo.GamePayWayVO;
 import com.zanxiang.manage.service.*;
-import com.zanxiang.module.util.JsonUtil;
-import com.zanxiang.mybatis.entity.*;
+import com.zanxiang.mybatis.entity.GamePayWay;
 import com.zanxiang.mybatis.mapper.GamePayWayMapper;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -57,12 +53,24 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
     @Autowired
     private GameService gameService;
 
+    @Autowired
+    private PayDeviceService payDeviceService;
+
     @Override
     public List<GamePayWayVO> getByGameId(Long gameId) {
         List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
-                .eq(GamePayWay::getGameId, gameId)
-                .select(GamePayWay::getId, GamePayWay::getPayName));
-        return BeanUtils.copyList(gamePayWayList, GamePayWayVO.class);
+                .eq(GamePayWay::getGameId, gameId));
+        if (CollectionUtils.isEmpty(gamePayWayList)) {
+            return Collections.emptyList();
+        }
+        List<Long> payDeviceIdList = gamePayWayList.stream().map(GamePayWay::getPayDeviceId).distinct().collect(Collectors.toList());
+        Map<Long, PayDeviceDTO> payDeviceMap = payDeviceService.payDeviceMap();
+        List<GamePayWayVO> list = new ArrayList<>();
+        payDeviceIdList.forEach(payDeviceId -> GamePayWayVO.builder()
+                .id(payDeviceId)
+                .payWayName(payDeviceMap.get(payDeviceId).getPayDeviceName())
+                .build());
+        return list;
     }