fix : 项目结构整理修改完成

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/ServerInfo.java

@@ -0,0 +1,7 @@
+package com.zanxiang.game.module.base;
+
+public class ServerInfo {
+
+    public static final String SERVER_NAME = "game-module";
+    public static final String SERVER_DUBBO_NAME = "game-module-dubbo";
+}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/BanStatusEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/BanStatusEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/CpStatusEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/CpStatusEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/DeleteEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/DeleteEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/HttpStatusEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/HttpStatusEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/OsEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/OsEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/PayApplicationTypeEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/PayApplicationTypeEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/PayDeviceEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/PayDeviceEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/PayWayEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/PayWayEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/PromoAccountTypeEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/PromoAccountTypeEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/PromoMediaTypeEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/PromoMediaTypeEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/PromoProviderEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/PromoProviderEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/StatusEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/StatusEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/BeanUtils.java

@@ -1,48 +0,0 @@
-package com.zanxiang.game.module.base.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Bean 工具类
- *
- * @author ruoyi
- */
-public class BeanUtils extends org.springframework.beans.BeanUtils {
-
-    /**
-     * 对象浅拷贝
-     *
-     * @param source 源
-     * @param target 目标
-     * @return {@link T}
-     */
-    public static <T> T copy(Object source, Class<T> target) {
-        if (source == null) {
-            return null;
-        }
-        T obj = instantiateClass(target);
-        copyProperties(source, obj);
-        return obj;
-    }
-
-    /**
-     * 对象浅拷贝
-     *
-     * @param sourceList 源列表
-     * @param target     目标
-     * @return {@link List}<{@link T}>
-     */
-    public static <T> List<T> copyList(Collection sourceList, Class<T> target) {
-        if (sourceList == null || sourceList.isEmpty()) {
-            return Collections.emptyList();
-        }
-        List<T> objs = new ArrayList<>(sourceList.size());
-        for (Object source : sourceList) {
-            objs.add(copy(source, target));
-        }
-        return objs;
-    }
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/ChoiceController.java

@@ -1,12 +1,12 @@
 package com.zanxiang.game.module.manage.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.enums.*;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.*;
 import com.zanxiang.game.module.manage.enums.GameStrategyTypeEnum;
 import com.zanxiang.game.module.manage.enums.VipLevelEnum;
 import com.zanxiang.game.module.manage.pojo.vo.*;
 import com.zanxiang.game.module.manage.service.*;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : lingfeng
@@ -76,7 +77,9 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:choiceVipLevel:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = VipLevelChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<VipLevelChoiceVO>> vipLevelChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(VipLevelEnum.values()), VipLevelChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(VipLevelEnum.values())
+                .map(vipLevelEnum -> BeanUtil.copy(vipLevelEnum, VipLevelChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 
     @ApiOperation(value = "操作系统选择列表")
@@ -84,7 +87,9 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:choiceOsType:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = SystemChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<SystemChoiceVO>> systemChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(OsEnum.values()), SystemChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(OsEnum.values())
+                .map(osEnum -> BeanUtil.copy(osEnum, SystemChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 
     @ApiOperation(value = "cp选择列表")
@@ -172,7 +177,9 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:promoMediaTypeChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaTypeChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<PromoMediaTypeChoiceVO>> promoMediaTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PromoMediaTypeEnum.values()), PromoMediaTypeChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(PromoMediaTypeEnum.values())
+                .map(promoMediaTypeEnum -> BeanUtil.copy(promoMediaTypeEnum, PromoMediaTypeChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 
     @ApiOperation(value = "推广媒体选择列表")
@@ -188,7 +195,9 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:promoAccountTypeChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<PromoAccountTypeChoiceVO>> promoAccountTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PromoAccountTypeEnum.values()), PromoAccountTypeChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(PromoAccountTypeEnum.values())
+                .map(promoAccountTypeEnum -> BeanUtil.copy(promoAccountTypeEnum, PromoAccountTypeChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 
     @ApiOperation(value = "推广账号联动选择列表")
@@ -212,7 +221,9 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:promoProviderChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoProviderChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<PromoProviderChoiceVO>> promoProviderChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PromoProviderEnum.values()), PromoProviderChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(PromoProviderEnum.values())
+                .map(promoProviderEnum -> BeanUtil.copy(promoProviderEnum, PromoProviderChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 
     @ApiOperation(value = "支付应用类型选择列表")
@@ -220,7 +231,9 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:payApplicationTypeChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = ApplicationTypeChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<ApplicationTypeChoiceVO>> applicationTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PayApplicationTypeEnum.values()), ApplicationTypeChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(PayApplicationTypeEnum.values())
+                .map(payApplicationTypeEnum -> BeanUtil.copy(payApplicationTypeEnum, ApplicationTypeChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 
     @ApiOperation(value = "支付应用选择列表")
@@ -244,6 +257,8 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:gamePayStrategyChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GamePayStrategyChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<GamePayStrategyChoiceVO>> gamePayStrategyChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(GameStrategyTypeEnum.values()), GamePayStrategyChoiceVO.class));
+        return ResultVO.ok(Arrays.stream(GameStrategyTypeEnum.values())
+                .map(gameStrategyTypeEnum -> BeanUtil.copy(gameStrategyTypeEnum, GamePayStrategyChoiceVO.class))
+                .collect(Collectors.toList()));
     }
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.CpDTO;
 import com.zanxiang.game.module.manage.pojo.params.CpAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.CpListParam;
@@ -14,6 +13,7 @@ import com.zanxiang.game.module.manage.pojo.vo.CpVO;
 import com.zanxiang.game.module.manage.service.ICpService;
 import com.zanxiang.game.module.mybatis.entity.Cp;
 import com.zanxiang.game.module.mybatis.mapper.CpMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -96,13 +96,13 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements ICpServi
         if (Objects.isNull(cp)) {
             return null;
         }
-        return BeanUtils.copy(cp, CpVO.class);
+        return BeanUtil.copy(cp, CpVO.class);
     }
 
     @Override
     public List<CpChoiceVO> choiceList() {
         List<Cp> cpList = super.list(new LambdaQueryWrapper<Cp>().select(Cp::getId, Cp::getCpName));
-        return BeanUtils.copyList(cpList, CpChoiceVO.class);
+        return cpList.stream().map(cp -> BeanUtil.copy(cp, CpChoiceVO.class)).collect(Collectors.toList());
     }
 
     @Override
@@ -111,7 +111,7 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements ICpServi
         if (CollectionUtils.isEmpty(cpList)) {
             return Collections.emptyMap();
         }
-        List<CpDTO> cpDTOList = BeanUtils.copyList(cpList, CpDTO.class);
+        List<CpDTO> cpDTOList = cpList.stream().map(cp -> BeanUtil.copy(cp, CpDTO.class)).collect(Collectors.toList());
         return cpDTOList.stream().collect(Collectors.toMap(CpDTO::getId, Function.identity()));
     }
 

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

@@ -4,7 +4,6 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.GameAppletDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.GameAccountUpdateParam;
@@ -66,7 +65,7 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
             vo.setGameId(id);
             return vo;
         }
-        return BeanUtils.copy(gameApplet, GameAccountVO.class);
+        return BeanUtil.copy(gameApplet, GameAccountVO.class);
     }
 
     @Override

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

@@ -3,12 +3,12 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.pojo.vo.GameCategoryChoiceVO;
 import com.zanxiang.game.module.manage.service.IGameCategoryService;
 import com.zanxiang.game.module.mybatis.entity.GameCategory;
 import com.zanxiang.game.module.mybatis.mapper.GameCategoryMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -34,12 +34,14 @@ public class GameCategoryServiceImpl extends ServiceImpl<GameCategoryMapper, Gam
         if (gameCategory == null) {
             throw new BaseException("参数错误, 游戏应用类型不存在");
         }
-        return BeanUtils.copy(gameCategory, GameCategoryDTO.class);
+        return BeanUtil.copy(gameCategory, GameCategoryDTO.class);
     }
 
     @Override
     public List<GameCategoryChoiceVO> gameCategoryChoiceList() {
-        return BeanUtils.copyList(super.list(), GameCategoryChoiceVO.class);
+        return super.list().stream()
+                .map(gameCategory -> BeanUtil.copy(gameCategory, GameCategoryChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -49,8 +51,9 @@ public class GameCategoryServiceImpl extends ServiceImpl<GameCategoryMapper, Gam
         if (CollectionUtils.isEmpty(gameCategoryList)) {
             return Collections.emptyMap();
         }
-        List<GameCategoryDTO> gameCategoryDTOList = BeanUtils.copyList(gameCategoryList, GameCategoryDTO.class);
-        return gameCategoryDTOList.stream().collect(Collectors.toMap(GameCategoryDTO::getId, Function.identity()));
+        return gameCategoryList.stream()
+                .map(gameCategory -> BeanUtil.copy(gameCategory, GameCategoryDTO.class))
+                .collect(Collectors.toMap(GameCategoryDTO::getId, Function.identity()));
     }
 
 }

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

@@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.enums.GameStrategyTypeEnum;
 import com.zanxiang.game.module.manage.pojo.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
@@ -17,6 +16,7 @@ import com.zanxiang.game.module.manage.pojo.vo.GamePayStrategyListVO;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.GamePayStrategy;
 import com.zanxiang.game.module.mybatis.mapper.GameStrategyMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,7 +112,7 @@ public class GamePayStrategyServiceImpl extends ServiceImpl<GameStrategyMapper,
 
     private GamePayStrategyListVO toVO(Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap,
                                        GamePayStrategy gamePayStrategy, Map<String, PayMerchantDTO> payMerchantMap) {
-        GamePayStrategyListVO gamePayStrategyListVO = BeanUtils.copy(gamePayStrategy, GamePayStrategyListVO.class);
+        GamePayStrategyListVO gamePayStrategyListVO = BeanUtil.copy(gamePayStrategy, GamePayStrategyListVO.class);
         if (gamePayStrategyListVO == null) {
             return null;
         }

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

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PayDeviceEnum;
-import com.zanxiang.game.module.base.enums.PayWayEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayDeviceEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayWayEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.GamePayWayAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GamePayWayListParam;
@@ -18,6 +17,7 @@ import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.GameApplet;
 import com.zanxiang.game.module.mybatis.entity.GamePayWay;
 import com.zanxiang.game.module.mybatis.mapper.GamePayWayMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -177,7 +177,7 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
 
     private GamePayWayListVO toVO(Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap, GamePayWay gamePayWay,
                                   Map<String, PayMerchantDTO> payMerchantMap, Map<Long, PayWayDTO> payWayMap, Map<Long, PayDeviceDTO> payDeviceMap) {
-        GamePayWayListVO gamePayWayListVO = BeanUtils.copy(gamePayWay, GamePayWayListVO.class);
+        GamePayWayListVO gamePayWayListVO = BeanUtil.copy(gamePayWay, GamePayWayListVO.class);
         if (gamePayWayListVO == null) {
             return null;
         }
@@ -276,7 +276,9 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
             return Collections.emptyMap();
         }
         List<Long> payDeviceIdList = gamePayWayList.stream().map(GamePayWay::getPayDeviceId).distinct().collect(Collectors.toList());
-        List<PayDeviceDTO> payDeviceDTOList = BeanUtils.copyList(payDeviceService.listByIds(payDeviceIdList), PayDeviceDTO.class);
+        List<PayDeviceDTO> payDeviceDTOList = payDeviceService.listByIds(payDeviceIdList).stream()
+                .map(payDevice -> BeanUtil.copy(payDevice, PayDeviceDTO.class))
+                .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(payDeviceDTOList)) {
             return Collections.emptyMap();
         }

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

@@ -3,7 +3,6 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.enums.GameCategoryEnum;
 import com.zanxiang.game.module.manage.pojo.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
@@ -15,6 +14,7 @@ import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.mybatis.entity.Game;
 import com.zanxiang.game.module.mybatis.entity.GamePicture;
 import com.zanxiang.game.module.mybatis.mapper.GamePictureMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,7 +44,7 @@ public class GamePictureServiceImpl extends ServiceImpl<GamePictureMapper, GameP
         if (gamePicture == null) {
             gamePicture = GamePicture.builder().gameId(gameId).build();
         }
-        GamePictureVO gamePictureVO = BeanUtils.copy(gamePicture, GamePictureVO.class);
+        GamePictureVO gamePictureVO = BeanUtil.copy(gamePicture, GamePictureVO.class);
         GameDTO gameDTO = gameService.getById(gameId);
         gamePictureVO.setNeedAuth(gameDTO.getNeedAuth());
         gamePictureVO.setDownloadCount(gameDTO.getDownloadCount());

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.enums.GameStatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
@@ -55,7 +54,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
     @Override
     public GameDockVO getGameDock(Long id) {
         Game game = super.getById(id);
-        GameDockVO gameDockVO = BeanUtils.copy(game, GameDockVO.class);
+        GameDockVO gameDockVO = BeanUtil.copy(game, GameDockVO.class);
         if (gameDockVO == null) {
             return null;
         }
@@ -103,7 +102,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
     @Override
     public GameRelationVO getGameRelation(Long id) {
         Game game = super.getById(id);
-        GameRelationVO gameRelationVO = BeanUtils.copy(game, GameRelationVO.class);
+        GameRelationVO gameRelationVO = BeanUtil.copy(game, GameRelationVO.class);
         if (gameRelationVO == null) {
             return null;
         }
@@ -190,14 +189,14 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
     }
 
     @Override
-    public List<GameInfoVO> infoByIds(Collection<Long>  gameIds) {
+    public List<GameInfoVO> infoByIds(Collection<Long> gameIds) {
         return listByIds(gameIds).stream().map(game -> BeanUtil.copy(game, GameInfoVO.class)).collect(Collectors.toList());
     }
 
     @Override
     public GameInfoVO getGameInfo(Long gameId) {
         Game game = super.getById(gameId);
-        GameInfoVO gameInfoVO = BeanUtils.copy(game, GameInfoVO.class);
+        GameInfoVO gameInfoVO = BeanUtil.copy(game, GameInfoVO.class);
         if (gameInfoVO == null) {
             return null;
         }
@@ -210,8 +209,10 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         if (Strings.isNotBlank(game.getTags())) {
             String[] split = game.getTags().split(",");
             List<Long> idList = Arrays.stream(split).map(Long::valueOf).collect(Collectors.toList());
-            List<GameTagVO> gameTagVOList = gameTagService.listByIds(idList);
-            gameInfoVO.setClassifyList(BeanUtils.copyList(gameTagVOList, GameTagChoiceVO.class));
+            List<GameTagChoiceVO> gameTagChoiceVOList = gameTagService.listByIds(idList).stream()
+                    .map(gameTagVO -> BeanUtil.copy(gameTagVO, GameTagChoiceVO.class))
+                    .collect(Collectors.toList());
+            gameInfoVO.setClassifyList(gameTagChoiceVOList);
         }
         if (game.getCategory() != null) {
             GameCategoryDTO gameCategoryDTO = gameCategoryService.getById(game.getCategory());
@@ -370,7 +371,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
 
     private GameListVO toVo(Game game, Map<Long, String> cpMap, Map<Long, GameCategoryDTO> gameCategoryMap,
                             Map<Long, String> gameMap, Map<Long, GameTagDTO> gameTagMap) {
-        GameListVO gameListVO = BeanUtils.copy(game, GameListVO.class);
+        GameListVO gameListVO = BeanUtil.copy(game, GameListVO.class);
         if (gameListVO == null) {
             return null;
         }
@@ -418,8 +419,11 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
 
     @Override
     public List<GameChoiceVO> choiceList() {
-        List<Game> gameList = super.list(new LambdaQueryWrapper<Game>().select(Game::getId, Game::getName, Game::getCategory));
-        return BeanUtils.copyList(gameList, GameChoiceVO.class);
+        return super.list(new LambdaQueryWrapper<Game>()
+                .select(Game::getId, Game::getName, Game::getCategory))
+                .stream()
+                .map(game -> BeanUtil.copy(game, GameChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -427,7 +431,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         if (id == null) {
             return null;
         }
-        return BeanUtils.copy(super.getById(id), GameDTO.class);
+        return BeanUtil.copy(super.getById(id), GameDTO.class);
     }
 
     @Override
@@ -447,13 +451,12 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         if (cpId == null && gameId == null && gameCategoryId == null) {
             return Collections.emptyList();
         }
-        List<Game> gameList = super.list(new LambdaQueryWrapper<Game>()
+        return super.list(new LambdaQueryWrapper<Game>()
                 .eq(cpId != null, Game::getCpId, cpId)
                 .eq(gameId != null, Game::getId, gameId)
                 .eq(gameCategoryId != null, Game::getCategory, gameCategoryId)
                 .select(Game::getId, Game::getCpId, Game::getName, Game::getCategory)
-        );
-        return BeanUtils.copyList(gameList, GameDTO.class);
+        ).stream().map(game -> BeanUtil.copy(game, GameDTO.class)).collect(Collectors.toList());
     }
 
     @Override
@@ -465,8 +468,8 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         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()));
+        return gameList.stream().map(game -> BeanUtil.copy(game, GameDTO.class))
+                .collect(Collectors.toMap(GameDTO::getId, Function.identity()));
     }
 
     @Override
@@ -475,8 +478,9 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         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()));
+        return gameList.stream()
+                .map(game -> BeanUtil.copy(game, GameDTO.class))
+                .collect(Collectors.toMap(GameDTO::getId, Function.identity()));
     }
 
     @Override

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.GameTagDTO;
 import com.zanxiang.game.module.manage.pojo.params.GameTagAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GameTagListParam;
@@ -16,6 +15,7 @@ import com.zanxiang.game.module.manage.pojo.vo.GameTagVO;
 import com.zanxiang.game.module.manage.service.IGameTagService;
 import com.zanxiang.game.module.mybatis.entity.GameTag;
 import com.zanxiang.game.module.mybatis.mapper.GameTagMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -41,12 +41,12 @@ public class GameTagServiceImpl extends ServiceImpl<GameTagMapper, GameTag> impl
         if (CollectionUtils.isEmpty(ids)) {
             return Collections.emptyList();
         }
-        return BeanUtils.copyList(super.listByIds(ids), GameTagVO.class);
+        return super.listByIds(ids).stream().map(gameTag -> BeanUtil.copy(gameTag, GameTagVO.class)).collect(Collectors.toList());
     }
 
     @Override
     public List<GameTagChoiceVO> gameTagsChoiceList() {
-        return BeanUtils.copyList(super.list(), GameTagChoiceVO.class);
+        return super.list().stream().map(gameTag -> BeanUtil.copy(gameTag, GameTagChoiceVO.class)).collect(Collectors.toList());
     }
 
     @Override
@@ -56,7 +56,8 @@ public class GameTagServiceImpl extends ServiceImpl<GameTagMapper, GameTag> impl
         if (CollectionUtils.isEmpty(gameTagList)) {
             return Collections.emptyMap();
         }
-        List<GameTagDTO> gameTagDTOList = BeanUtils.copyList(gameTagList, GameTagDTO.class);
+        List<GameTagDTO> gameTagDTOList = gameTagList.stream().map(gameTag -> BeanUtil.copy(gameTag, GameTagDTO.class))
+                .collect(Collectors.toList());
         return gameTagDTOList.stream().collect(Collectors.toMap(GameTagDTO::getId, Function.identity()));
     }
 
@@ -89,7 +90,7 @@ public class GameTagServiceImpl extends ServiceImpl<GameTagMapper, GameTag> impl
     }
 
     private GameTagVO toVo(GameTag gameTag) {
-        GameTagVO gameTagVO = BeanUtils.copy(gameTag, GameTagVO.class);
+        GameTagVO gameTagVO = BeanUtil.copy(gameTag, GameTagVO.class);
         if (Objects.isNull(gameTagVO)) {
             return null;
         }

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.GameUserRoleListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameUserRoleListVO;
@@ -17,6 +16,7 @@ import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.game.module.mybatis.entity.GameUserRole;
 import com.zanxiang.game.module.mybatis.mapper.GameUserRoleMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +58,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
     @Override
     public GameUserRoleDTO getByRoleId(String roleId) {
         GameUserRole gameUserRole = super.getOne(new LambdaQueryWrapper<GameUserRole>().eq(GameUserRole::getRoleId, roleId));
-        return BeanUtils.copy(gameUserRole, GameUserRoleDTO.class);
+        return BeanUtil.copy(gameUserRole, GameUserRoleDTO.class);
     }
 
     @Override
@@ -69,7 +69,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         }
         List<GameUserRoleVO> list = new ArrayList<>();
         gameUserRoleList.forEach(role -> {
-            GameUserRoleVO gameUserRoleVO = BeanUtils.copy(role, GameUserRoleVO.class);
+            GameUserRoleVO gameUserRoleVO = BeanUtil.copy(role, GameUserRoleVO.class);
             if (gameUserRoleVO == null) {
                 return;
             }
@@ -144,7 +144,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
 
     private GameUserRoleListVO toVo(GameUserRole gameUserRole, Map<Long, UserDTO> userMap, Map<Long, GameDTO> gameMap,
                                     Map<Long, CpDTO> cpMap, Map<Long, GameCategoryDTO> categoryMap, Map<Long, AgentDTO> agentMap) {
-        GameUserRoleListVO gameUserRoleListVO = BeanUtils.copy(gameUserRole, GameUserRoleListVO.class);
+        GameUserRoleListVO gameUserRoleListVO = BeanUtil.copy(gameUserRole, GameUserRoleListVO.class);
         if (Objects.isNull(gameUserRoleListVO)) {
             return null;
         }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.GameUserListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameUserListVO;
@@ -14,6 +13,7 @@ import com.zanxiang.game.module.manage.pojo.vo.GameUserVO;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.GameUser;
 import com.zanxiang.game.module.mybatis.mapper.GameUserMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,7 +95,7 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
 
     private GameUserListVO toVo(GameUser gameUser, Map<Long, UserDTO> userMap, Map<Long, GameDTO> gameMap, Map<Long, AgentDTO> agentMap,
                                 Map<Long, CpDTO> cpMap, Map<Long, GameCategoryDTO> gameCategoryMap) {
-        GameUserListVO gameUserListVO = BeanUtils.copy(gameUser, GameUserListVO.class);
+        GameUserListVO gameUserListVO = BeanUtil.copy(gameUser, GameUserListVO.class);
         if (Objects.isNull(gameUserListVO)) {
             return null;
         }
@@ -133,6 +133,6 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
 
     @Override
     public GameUserVO getById(Long id) {
-        return BeanUtils.copy(super.getById(id), GameUserVO.class);
+        return BeanUtil.copy(super.getById(id), GameUserVO.class);
     }
 }

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

@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.enums.BanStatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
 import com.zanxiang.game.module.manage.pojo.params.IpBanAddParam;
 import com.zanxiang.game.module.manage.pojo.params.IpBanListParam;
 import com.zanxiang.game.module.manage.pojo.params.IpBanUpdateParam;
@@ -15,6 +14,7 @@ import com.zanxiang.game.module.manage.pojo.vo.IpBanVO;
 import com.zanxiang.game.module.manage.service.IIpBanService;
 import com.zanxiang.game.module.mybatis.entity.IpBan;
 import com.zanxiang.game.module.mybatis.mapper.IpBanMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
@@ -50,7 +50,7 @@ public class IpBanServiceImpl extends ServiceImpl<IpBanMapper, IpBan> implements
         if (Objects.isNull(ipBan)) {
             return null;
         }
-        return BeanUtils.copy(ipBan, IpBanVO.class);
+        return BeanUtil.copy(ipBan, IpBanVO.class);
     }
 
     @Override

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

@@ -3,12 +3,12 @@ package com.zanxiang.game.module.manage.service.impl;
 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.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
 import com.zanxiang.game.module.manage.service.ILogPayCpService;
 import com.zanxiang.game.module.mybatis.entity.LogPayCp;
 import com.zanxiang.game.module.mybatis.mapper.LogPayCpMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
@@ -31,7 +31,7 @@ public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, LogPayCp> i
         if (Objects.isNull(logPayCp)) {
             return null;
         }
-        return BeanUtils.copy(logPayCp, LogPayCpVO.class);
+        return BeanUtil.copy(logPayCp, LogPayCpVO.class);
     }
 
 }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.OrderParam;
 import com.zanxiang.game.module.manage.pojo.params.UserOrderListParam;
@@ -16,6 +15,7 @@ import com.zanxiang.game.module.manage.pojo.vo.UserOrderListVO;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.mapper.OrderMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +74,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (order == null) {
             return null;
         }
-        UserOrderListVO orderListVO = BeanUtils.copy(order, UserOrderListVO.class);
+        UserOrderListVO orderListVO = BeanUtil.copy(order, UserOrderListVO.class);
         orderListVO.setId(order.getOrderId());
         //查询角色名称
         GameUserRoleDTO gameUserRoleDTO = gameUserRoleService.getByRoleId(order.getRoleId());
@@ -248,6 +248,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (Objects.isNull(order)) {
             return null;
         }
-        return BeanUtils.copy(order, OrderVO.class);
+        return BeanUtil.copy(order, OrderVO.class);
     }
 }

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

@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PayApplicationTypeEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayApplicationTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.PayApplicationDTO;
 import com.zanxiang.game.module.manage.pojo.params.PayApplicationAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.PayApplicationListParam;
@@ -17,6 +16,7 @@ import com.zanxiang.game.module.manage.service.IGameAppletService;
 import com.zanxiang.game.module.manage.service.IPayApplicationService;
 import com.zanxiang.game.module.mybatis.entity.PayApplication;
 import com.zanxiang.game.module.mybatis.mapper.PayApplicationMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,9 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         List<PayApplication> payApplicationList = super.list(new LambdaQueryWrapper<PayApplication>()
                 .select(PayApplication::getAppId, PayApplication::getType, PayApplication::getAppName)
         );
-        return BeanUtils.copyList(payApplicationList, PayApplicationChoiceVO.class);
+        return payApplicationList.stream()
+                .map(payApplication -> BeanUtil.copy(payApplication, PayApplicationChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -63,7 +65,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
     }
 
     private PayApplicationVO toVo(PayApplication payApplication) {
-        PayApplicationVO applicationVO = BeanUtils.copy(payApplication, PayApplicationVO.class);
+        PayApplicationVO applicationVO = BeanUtil.copy(payApplication, PayApplicationVO.class);
         if (Objects.isNull(applicationVO)) {
             return null;
         }
@@ -177,8 +179,9 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         if (CollectionUtils.isEmpty(payApplicationList)) {
             return Collections.emptyMap();
         }
-        return BeanUtils.copyList(payApplicationList, PayApplicationDTO.class)
-                .stream().collect(Collectors.toMap(PayApplicationDTO::getAppId, Function.identity()));
+        return payApplicationList.stream()
+                .map(payApplication -> BeanUtil.copy(payApplication, PayApplicationDTO.class))
+                .collect(Collectors.toMap(PayApplicationDTO::getAppId, Function.identity()));
     }
 
     @Override
@@ -187,8 +190,8 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         if (CollectionUtils.isEmpty(payApplicationList)) {
             return Collections.emptyMap();
         }
-        return BeanUtils.copyList(payApplicationList, PayApplicationDTO.class)
-                .stream().collect(Collectors.toMap(PayApplicationDTO::getAppId, Function.identity()));
+        return payApplicationList.stream().map(payApplication -> BeanUtil.copy(payApplication, PayApplicationDTO.class))
+                .collect(Collectors.toMap(PayApplicationDTO::getAppId, Function.identity()));
     }
 
     @Override
@@ -198,6 +201,6 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         if (payApplication == null) {
             throw new BaseException("参数错误, 支付应用appId对应信息不存在");
         }
-        return BeanUtils.copy(payApplication, PayApplicationDTO.class);
+        return BeanUtil.copy(payApplication, PayApplicationDTO.class);
     }
 }

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

@@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PayApplicationTypeEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayApplicationTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.PayApplicationDTO;
 import com.zanxiang.game.module.manage.pojo.dto.PayBoxDTO;
 import com.zanxiang.game.module.manage.pojo.dto.PayMerchantDTO;
@@ -35,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author : lingfeng
@@ -54,9 +54,11 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
 
     @Override
     public List<PayBoxChoiceVO> payBoxChoiceList() {
-        List<PayBox> payBoxList = super.list(new LambdaQueryWrapper<PayBox>()
-                .select(PayBox::getId, PayBox::getType, PayBox::getName));
-        return BeanUtils.copyList(payBoxList, PayBoxChoiceVO.class);
+        return super.list(new LambdaQueryWrapper<PayBox>()
+                .select(PayBox::getId, PayBox::getType, PayBox::getName))
+                .stream()
+                .map(payBox -> BeanUtil.copy(payBox, PayBoxChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -96,7 +98,7 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
     }
 
     private PayBoxListVO toVo(PayBox payBox, Map<String, PayApplicationDTO> payApplicationMap, Map<String, PayMerchantDTO> payMerchantMap) {
-        PayBoxListVO payBoxListVO = BeanUtils.copy(payBox, PayBoxListVO.class);
+        PayBoxListVO payBoxListVO = BeanUtil.copy(payBox, PayBoxListVO.class);
         if (payBoxListVO == null) {
             return null;
         }

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

@@ -3,12 +3,12 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.PayDeviceDTO;
 import com.zanxiang.game.module.manage.pojo.vo.PayDeviceChoiceVO;
 import com.zanxiang.game.module.manage.service.IPayDeviceService;
 import com.zanxiang.game.module.mybatis.entity.PayDevice;
 import com.zanxiang.game.module.mybatis.mapper.PayDeviceMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -32,30 +32,28 @@ public class PayDeviceServiceImpl extends ServiceImpl<PayDeviceMapper, PayDevice
         List<PayDevice> payDeviceList = super.list(new LambdaQueryWrapper<PayDevice>()
                 .select(PayDevice::getId, PayDevice::getPayWayIds, PayDevice::getPayDeviceName)
         );
-        return BeanUtils.copyList(payDeviceList, PayDeviceChoiceVO.class);
+        return payDeviceList.stream().map(payDevice -> BeanUtil.copy(payDevice, PayDeviceChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
     public Map<Long, PayDeviceDTO> payDeviceMap() {
-        //查询
         List<PayDevice> payDeviceList = super.list();
         if (CollectionUtils.isEmpty(payDeviceList)) {
             return Collections.emptyMap();
         }
-        List<PayDeviceDTO> list = BeanUtils.copyList(payDeviceList, PayDeviceDTO.class);
-        //构造返回
-        return list.stream().collect(Collectors.toMap(PayDeviceDTO::getId, Function.identity()));
+        return payDeviceList.stream().map(payDevice -> BeanUtil.copy(payDevice, PayDeviceDTO.class))
+                .collect(Collectors.toMap(PayDeviceDTO::getId, Function.identity()));
     }
 
     @Override
     public Map<Long, PayDeviceChoiceVO> payDeviceChoiceMap() {
-        //查询
         List<PayDevice> payDeviceList = super.list();
         if (CollectionUtils.isEmpty(payDeviceList)) {
             return Collections.emptyMap();
         }
-        List<PayDeviceChoiceVO> list = BeanUtils.copyList(payDeviceList, PayDeviceChoiceVO.class);
-        //构造返回
-        return list.stream().collect(Collectors.toMap(PayDeviceChoiceVO::getId, Function.identity()));
+        return payDeviceList.stream()
+                .map(payDevice -> BeanUtil.copy(payDevice, PayDeviceChoiceVO.class))
+                .collect(Collectors.toMap(PayDeviceChoiceVO::getId, Function.identity()));
     }
 }

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

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PayWayEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayWayEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.PayMerchantDTO;
 import com.zanxiang.game.module.manage.pojo.dto.PayWayDTO;
 import com.zanxiang.game.module.manage.pojo.params.PayMerchantAddUpdateParam;
@@ -127,9 +126,11 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
 
     @Override
     public List<PayMerchantChoiceVO> payMerchantChoiceList() {
-        List<PayMerchant> payMerchantList = super.list(new LambdaQueryWrapper<PayMerchant>().
-                select(PayMerchant::getMerchantNo, PayMerchant::getPayWayId, PayMerchant::getMerchantName));
-        return BeanUtils.copyList(payMerchantList, PayMerchantChoiceVO.class);
+        return super.list(new LambdaQueryWrapper<PayMerchant>()
+                .select(PayMerchant::getMerchantNo, PayMerchant::getPayWayId, PayMerchant::getMerchantName))
+                .stream()
+                .map(payMerchant -> BeanUtil.copy(payMerchant, PayMerchantChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -151,7 +152,7 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
     }
 
     private PayMerchantListVO toVo(PayMerchant payMerchant, Map<Long, PayDeviceChoiceVO> payDeviceMap) {
-        PayMerchantListVO payMerchantListVO = BeanUtils.copy(payMerchant, PayMerchantListVO.class);
+        PayMerchantListVO payMerchantListVO = BeanUtil.copy(payMerchant, PayMerchantListVO.class);
         if (payMerchantListVO == null) {
             return null;
         }
@@ -233,8 +234,9 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         if (CollectionUtils.isEmpty(payMerchantList)) {
             return Collections.emptyMap();
         }
-        return BeanUtils.copyList(payMerchantList, PayMerchantDTO.class)
-                .stream().collect(Collectors.toMap(PayMerchantDTO::getMerchantNo, Function.identity()));
+        return payMerchantList.stream()
+                .map(payMerchant -> BeanUtil.copy(payMerchant, PayMerchantDTO.class))
+                .collect(Collectors.toMap(PayMerchantDTO::getMerchantNo, Function.identity()));
     }
 
     @Override
@@ -243,8 +245,9 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         if (CollectionUtils.isEmpty(payMerchantList)) {
             return Collections.emptyMap();
         }
-        return BeanUtils.copyList(payMerchantList, PayMerchantDTO.class)
-                .stream().collect(Collectors.toMap(PayMerchantDTO::getMerchantNo, Function.identity()));
+        return payMerchantList.stream()
+                .map(payMerchant -> BeanUtil.copy(payMerchant, PayMerchantDTO.class))
+                .collect(Collectors.toMap(PayMerchantDTO::getMerchantNo, Function.identity()));
     }
 
     @Override

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

@@ -3,12 +3,12 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.PayWayDTO;
 import com.zanxiang.game.module.manage.pojo.vo.PayWayChoiceVO;
 import com.zanxiang.game.module.manage.service.IPayWayService;
 import com.zanxiang.game.module.mybatis.entity.PayWay;
 import com.zanxiang.game.module.mybatis.mapper.PayWayMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -48,8 +48,7 @@ public class PayWayServiceImpl extends ServiceImpl<PayWayMapper, PayWay> impleme
         if (CollectionUtils.isEmpty(payWayList)) {
             return Collections.emptyMap();
         }
-        List<PayWayDTO> list = BeanUtils.copyList(payWayList, PayWayDTO.class);
-        //构造返回
-        return list.stream().collect(Collectors.toMap(PayWayDTO::getId, Function.identity()));
+        return payWayList.stream().map(payWay -> BeanUtil.copy(payWay, PayWayDTO.class))
+                .collect(Collectors.toMap(PayWayDTO::getId, Function.identity()));
     }
 }

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

@@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PromoAccountTypeEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PromoAccountTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.PromoAccountDTO;
 import com.zanxiang.game.module.manage.pojo.dto.PromoMediaDTO;
 import com.zanxiang.game.module.manage.pojo.params.PromoAccountAddUpdateParam;
@@ -25,6 +24,7 @@ import com.zanxiang.game.module.manage.service.IPromoMediaService;
 import com.zanxiang.game.module.mybatis.entity.PromoAccount;
 import com.zanxiang.game.module.mybatis.entity.PromoAccountLog;
 import com.zanxiang.game.module.mybatis.mapper.PromoAccountMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -57,8 +57,9 @@ public class PromoAccountServiceImpl extends ServiceImpl<PromoAccountMapper, Pro
 
     @Override
     public List<PromoAccountLinkageChoiceVO> promoAccountLinkageChoiceList() {
-        List<PromoAccount> promoAccountList = super.list();
-        List<PromoAccountLinkageChoiceVO> choiceVOList = BeanUtils.copyList(promoAccountList, PromoAccountLinkageChoiceVO.class);
+        List<PromoAccountLinkageChoiceVO> choiceVOList = super.list().stream()
+                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountLinkageChoiceVO.class))
+                .collect(Collectors.toList());
         Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
         choiceVOList.forEach(promoAccountDTO -> {
             Long mediaId = promoAccountDTO.getMediaId();
@@ -86,7 +87,7 @@ public class PromoAccountServiceImpl extends ServiceImpl<PromoAccountMapper, Pro
     }
 
     private PromoAccountListVO toVo(Map<Long, PromoMediaDTO> promoMediaMap, PromoAccount promoAccount) {
-        PromoAccountListVO promoAccountListVO = BeanUtils.copy(promoAccount, PromoAccountListVO.class);
+        PromoAccountListVO promoAccountListVO = BeanUtil.copy(promoAccount, PromoAccountListVO.class);
         if (Objects.isNull(promoAccountListVO)) {
             return null;
         }
@@ -203,14 +204,18 @@ public class PromoAccountServiceImpl extends ServiceImpl<PromoAccountMapper, Pro
     public List<PromoAccountChoiceVO> promoAccountChoiceList() {
         List<PromoAccount> promoAccountList = super.list(new LambdaQueryWrapper<PromoAccount>().
                 select(PromoAccount::getAccount, PromoAccount::getName));
-        return BeanUtils.copyList(promoAccountList, PromoAccountChoiceVO.class);
+        return promoAccountList.stream()
+                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
     public List<PromoPitcherChoiceVO> promoPitcherChoiceList() {
         List<PromoAccount> promoAccountList = super.list(new LambdaQueryWrapper<PromoAccount>().
                 select(PromoAccount::getPitcherId, PromoAccount::getPitcherName));
-        return BeanUtils.copyList(promoAccountList, PromoPitcherChoiceVO.class);
+        return promoAccountList.stream()
+                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoPitcherChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -219,7 +224,9 @@ public class PromoAccountServiceImpl extends ServiceImpl<PromoAccountMapper, Pro
         if (CollectionUtils.isEmpty(promoChannelList)) {
             return Collections.emptyMap();
         }
-        List<PromoAccountDTO> promoAccountDTOList = BeanUtils.copyList(promoChannelList, PromoAccountDTO.class);
+        List<PromoAccountDTO> promoAccountDTOList = promoChannelList.stream()
+                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountDTO.class))
+                .collect(Collectors.toList());
         Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
         promoAccountDTOList.forEach(promoAccountDTO -> {
             Long mediaId = promoAccountDTO.getMediaId();
@@ -255,7 +262,10 @@ public class PromoAccountServiceImpl extends ServiceImpl<PromoAccountMapper, Pro
                 .eq(mediaId != null, PromoAccount::getMediaId, mediaId)
                 .eq(Strings.isNotBlank(account), PromoAccount::getAccount, account)
                 .eq(accountType != null, PromoAccount::getAccountType, accountType));
-        List<PromoAccountDTO> promoAccountDTOList = BeanUtils.copyList(promoAccountList, PromoAccountDTO.class);
+
+        List<PromoAccountDTO> promoAccountDTOList = promoAccountList.stream()
+                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountDTO.class))
+                .collect(Collectors.toList());
         return promoAccountDTOList.stream().collect(Collectors.toMap(PromoAccountDTO::getId, Function.identity()));
     }
 }

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

@@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PromoAccountTypeEnum;
-import com.zanxiang.game.module.base.enums.PromoProviderEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PromoAccountTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.PromoProviderEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.PromoChannelAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.PromoChannelListParam;
@@ -22,6 +21,7 @@ import com.zanxiang.game.module.mybatis.entity.PromoAccount;
 import com.zanxiang.game.module.mybatis.entity.PromoChannel;
 import com.zanxiang.game.module.mybatis.entity.PromoSite;
 import com.zanxiang.game.module.mybatis.mapper.PromoChannelMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,7 +98,7 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
 
     private PromoChannelListVO toVo(Map<Long, PromoAccountDTO> promoAccountMap, Map<Long, PromoMediaDTO> promoMediaMap, PromoChannel promoChannel,
                                     Map<Long, PromoSiteDTO> promoSiteMap, Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap) {
-        PromoChannelListVO promoChannelListVO = BeanUtils.copy(promoChannel, PromoChannelListVO.class);
+        PromoChannelListVO promoChannelListVO = BeanUtil.copy(promoChannel, PromoChannelListVO.class);
         if (Objects.isNull(promoChannelListVO)) {
             return null;
         }
@@ -176,7 +176,9 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
     public List<PromoChannelChoiceVO> promoChannelChoiceList() {
         List<PromoChannel> promoChannelList = super.list(new LambdaQueryWrapper<PromoChannel>().
                 select(PromoChannel::getId, PromoChannel::getChannel));
-        return BeanUtils.copyList(promoChannelList, PromoChannelChoiceVO.class);
+        return promoChannelList.stream()
+                .map(promoChannel -> BeanUtil.copy(promoChannel, PromoChannelChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -186,7 +188,9 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
         if (CollectionUtils.isEmpty(promoChannelList)) {
             return Collections.emptyMap();
         }
-        List<PromoChannelDTO> promoChannelDTOList = BeanUtils.copyList(promoChannelList, PromoChannelDTO.class);
+        List<PromoChannelDTO> promoChannelDTOList = promoChannelList.stream()
+                .map(promoChannel -> BeanUtil.copy(promoChannel, PromoChannelDTO.class))
+                .collect(Collectors.toList());
         Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
         promoChannelDTOList.forEach(promoChannelDTO -> {
             Long mediaId = promoChannelDTO.getMediaId();
@@ -203,7 +207,9 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
         if (CollectionUtils.isEmpty(promoChannelList)) {
             return Collections.emptyMap();
         }
-        List<PromoChannelDTO> promoChannelDTOList = BeanUtils.copyList(promoChannelList, PromoChannelDTO.class);
+        List<PromoChannelDTO> promoChannelDTOList = promoChannelList.stream()
+                .map(promoChannel -> BeanUtil.copy(promoChannel, PromoChannelDTO.class))
+                .collect(Collectors.toList());
         Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
         promoChannelDTOList.forEach(promoChannelDTO -> {
             Long mediaId = promoChannelDTO.getMediaId();

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

@@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.PromoMediaTypeEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.PromoMediaTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.PromoMediaDTO;
 import com.zanxiang.game.module.manage.pojo.params.PromoMediaAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.PromoMediaListParam;
@@ -18,6 +17,7 @@ import com.zanxiang.game.module.manage.pojo.vo.PromoMediaListVO;
 import com.zanxiang.game.module.manage.service.IPromoMediaService;
 import com.zanxiang.game.module.mybatis.entity.PromoMedia;
 import com.zanxiang.game.module.mybatis.mapper.PromoMediaMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -45,7 +45,9 @@ public class PromoMediaServiceImpl extends ServiceImpl<PromoMediaMapper, PromoMe
         if (CollectionUtils.isEmpty(promoMediaList)) {
             return Collections.emptyMap();
         }
-        List<PromoMediaDTO> promoMediaDTOList = BeanUtils.copyList(promoMediaList, PromoMediaDTO.class);
+        List<PromoMediaDTO> promoMediaDTOList = promoMediaList.stream()
+                .map(promoMedia -> BeanUtil.copy(promoMedia, PromoMediaDTO.class))
+                .collect(Collectors.toList());
         return promoMediaDTOList.stream().collect(Collectors.toMap(PromoMediaDTO::getId, Function.identity()));
     }
 
@@ -53,7 +55,9 @@ public class PromoMediaServiceImpl extends ServiceImpl<PromoMediaMapper, PromoMe
     public List<PromoMediaChoiceVO> promoMediaChoiceList() {
         List<PromoMedia> promoMediaList = super.list(new LambdaQueryWrapper<PromoMedia>().
                 select(PromoMedia::getId, PromoMedia::getName));
-        return BeanUtils.copyList(promoMediaList, PromoMediaChoiceVO.class);
+        return promoMediaList.stream()
+                .map(promoMedia -> BeanUtil.copy(promoMedia, PromoMediaChoiceVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -67,7 +71,7 @@ public class PromoMediaServiceImpl extends ServiceImpl<PromoMediaMapper, PromoMe
     }
 
     private PromoMediaListVO toVo(PromoMedia promoMedia) {
-        PromoMediaListVO promoMediaListVO = BeanUtils.copy(promoMedia, PromoMediaListVO.class);
+        PromoMediaListVO promoMediaListVO = BeanUtil.copy(promoMedia, PromoMediaListVO.class);
         if (Objects.isNull(promoMediaListVO)) {
             return null;
         }

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

@@ -6,9 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.PromoMediaDTO;
 import com.zanxiang.game.module.manage.pojo.dto.PromoSiteDTO;
 import com.zanxiang.game.module.manage.pojo.params.PromoSiteAddOrUpdateParam;
@@ -20,6 +19,7 @@ import com.zanxiang.game.module.manage.service.IPromoSiteService;
 import com.zanxiang.game.module.mybatis.entity.PromoMedia;
 import com.zanxiang.game.module.mybatis.entity.PromoSite;
 import com.zanxiang.game.module.mybatis.mapper.PromoSiteMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -53,14 +53,17 @@ public class PromoSiteServiceImpl extends ServiceImpl<PromoSiteMapper, PromoSite
         if (CollectionUtils.isEmpty(promoSiteList)) {
             return Collections.emptyMap();
         }
-        List<PromoSiteDTO> promoSiteDTOList = BeanUtils.copyList(promoSiteList, PromoSiteDTO.class);
-        return promoSiteDTOList.stream().collect(Collectors.toMap(PromoSiteDTO::getId, Function.identity()));
+        return promoSiteList.stream()
+                .map(promoSite -> BeanUtil.copy(promoSite, PromoSiteDTO.class))
+                .collect(Collectors.toMap(PromoSiteDTO::getId, Function.identity()));
     }
 
     @Override
     public List<PromoSiteLinkageChoiceVO> promoSiteLinkageChoiceList() {
         List<PromoSite> promoSiteList = super.list();
-        List<PromoSiteLinkageChoiceVO> choiceVOList = BeanUtils.copyList(promoSiteList, PromoSiteLinkageChoiceVO.class);
+        List<PromoSiteLinkageChoiceVO> choiceVOList = promoSiteList.stream()
+                .map(promoSite -> BeanUtil.copy(promoSite, PromoSiteLinkageChoiceVO.class))
+                .collect(Collectors.toList());
         Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
         choiceVOList.forEach(promoAccountDTO -> {
             Long mediaId = promoAccountDTO.getMediaId();
@@ -86,7 +89,7 @@ public class PromoSiteServiceImpl extends ServiceImpl<PromoSiteMapper, PromoSite
         if (Objects.isNull(promoSite)) {
             return null;
         }
-        PromoSiteListVO promoSiteListVO = BeanUtils.copy(promoSite, PromoSiteListVO.class);
+        PromoSiteListVO promoSiteListVO = BeanUtil.copy(promoSite, PromoSiteListVO.class);
         PromoMedia promoMedia = promoMediaService.getById(promoSiteListVO.getMediaId());
         if (promoMedia != null) {
             promoSiteListVO.setMediaName(promoMedia.getName());

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

@@ -2,15 +2,16 @@ package com.zanxiang.game.module.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.vo.UserAddressVO;
 import com.zanxiang.game.module.manage.service.IUserAddressService;
 import com.zanxiang.game.module.mybatis.entity.UserAddress;
 import com.zanxiang.game.module.mybatis.mapper.UserAddressMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : lingfeng
@@ -23,8 +24,9 @@ public class UserAddressServiceImpl extends ServiceImpl<UserAddressMapper, UserA
 
     @Override
     public List<UserAddressVO> list(Long userId) {
-        List<UserAddress> addressList = super.list(new LambdaQueryWrapper<UserAddress>().eq(UserAddress::getUserId, userId));
-        return BeanUtils.copyList(addressList, UserAddressVO.class);
+        return super.list(new LambdaQueryWrapper<UserAddress>().eq(UserAddress::getUserId, userId))
+                .stream().map(userAddress -> BeanUtil.copy(userAddress, UserAddressVO.class))
+                .collect(Collectors.toList());
     }
 
 }

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

@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.enums.BanStatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
 import com.zanxiang.game.module.manage.pojo.dto.UserDTO;
 import com.zanxiang.game.module.manage.pojo.params.UserBanListParam;
 import com.zanxiang.game.module.manage.pojo.params.UserBanUpdateParam;
@@ -17,6 +16,7 @@ import com.zanxiang.game.module.manage.service.IUserService;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserBan;
 import com.zanxiang.game.module.mybatis.mapper.UserBanMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -58,7 +58,7 @@ public class UserBanServiceImpl extends ServiceImpl<UserBanMapper, UserBan> impl
         if (Objects.isNull(userBan)) {
             return null;
         }
-        return BeanUtils.copy(userBan, UserBanVO.class);
+        return BeanUtil.copy(userBan, UserBanVO.class);
     }
 
     @Override

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

@@ -3,7 +3,6 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.GameCategoryDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameUserRoleDTO;
@@ -15,6 +14,7 @@ import com.zanxiang.game.module.manage.service.IGameUserRoleService;
 import com.zanxiang.game.module.manage.service.IUserLoginLogService;
 import com.zanxiang.game.module.mybatis.entity.UserLoginLog;
 import com.zanxiang.game.module.mybatis.mapper.UserLoginLogMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,7 +47,7 @@ public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, Use
     }
 
     private UserRoleLoginVO toVo(UserLoginLog userLoginLog) {
-        UserRoleLoginVO roleLoginVO = BeanUtils.copy(userLoginLog, UserRoleLoginVO.class);
+        UserRoleLoginVO roleLoginVO = BeanUtil.copy(userLoginLog, UserRoleLoginVO.class);
         if (userLoginLog == null) {
             return null;
         }

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.manage.pojo.dto.*;
 import com.zanxiang.game.module.manage.pojo.params.UserListParam;
 import com.zanxiang.game.module.manage.pojo.params.UserUpdateParam;
@@ -19,6 +18,7 @@ import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.mapper.UserMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -114,7 +114,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     private UserListVO toVo(User user, Map<Long, UserDTO> userMap, Map<Long, GameDTO> gameMap, Map<Long, CpDTO> cpMap,
                             Map<Long, GameCategoryDTO> gameCategoryMap, Map<Long, AgentDTO> agentMap) {
-        UserListVO userListVO = BeanUtils.copy(user, UserListVO.class);
+        UserListVO userListVO = BeanUtil.copy(user, UserListVO.class);
         if (Objects.isNull(userListVO)) {
             return null;
         }
@@ -177,7 +177,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public UserVO getUserInfo(Long userId) {
         //查询用户信息
         User user = super.getById(userId);
-        UserVO userVO = BeanUtils.copy(user, UserVO.class);
+        UserVO userVO = BeanUtil.copy(user, UserVO.class);
         if (userVO == null) {
             throw new BaseException("用户信息不存在!");
         }
@@ -228,7 +228,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (CollectionUtils.isEmpty(userList)) {
             return Collections.emptyMap();
         }
-        List<UserDTO> list = BeanUtils.copyList(userList, UserDTO.class);
+        List<UserDTO> list = userList.stream()
+                .map(user -> BeanUtil.copy(user, UserDTO.class))
+                .collect(Collectors.toList());
         //构造返回
         return list.stream().collect(Collectors.toMap(UserDTO::getId, Function.identity()));
     }
@@ -243,14 +245,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (CollectionUtils.isEmpty(userList)) {
             return Collections.emptyMap();
         }
-        List<UserDTO> list = BeanUtils.copyList(userList, UserDTO.class);
+        List<UserDTO> list = userList.stream().map(user -> BeanUtil.copy(user, UserDTO.class))
+                .collect(Collectors.toList());
         //构造返回
         return list.stream().collect(Collectors.toMap(UserDTO::getId, Function.identity()));
     }
 
     @Override
     public UserDTO getById(Long userId) {
-        return BeanUtils.copy(super.getById(userId), UserDTO.class);
+        return BeanUtil.copy(super.getById(userId), UserDTO.class);
     }
 
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/adapter/ArgumentAdapter.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.adapter;
 
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.sdk.annotation.ValidLogin;
 import com.zanxiang.game.module.sdk.pojo.dto.UserTokenDTO;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/adapter/WebHandlerAdapter.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.adapter;
 
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.sdk.annotation.UnSignCheck;
 import com.zanxiang.game.module.sdk.enums.DeviceTypeEnum;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/PayController.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.controller;
 
-import com.zanxiang.game.module.base.enums.PayWayEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayWayEnum;
 import com.zanxiang.game.module.sdk.annotation.UnSignCheck;
 import com.zanxiang.game.module.sdk.annotation.ValidLogin;
 import com.zanxiang.game.module.sdk.pojo.param.ProductPayParam;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/ISmsService.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.service;
 
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.sdk.pojo.param.SmsCheckParam;
 import com.zanxiang.game.module.sdk.pojo.param.SmsSendParam;
 import com.zanxiang.game.module.sdk.pojo.param.UserData;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/api/WxApiService.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.service.api;
 
-import com.zanxiang.game.module.base.enums.PayApplicationTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayApplicationTypeEnum;
 import com.zanxiang.game.module.sdk.constant.RedisKeyConstant;
 import com.zanxiang.game.module.sdk.enums.ExpireTimeEnum;
 import com.zanxiang.game.module.sdk.util.RedisUtil;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameAppletServiceImpl.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GameApplet;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.mapper.GameAppletMapper;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GamePayStrategyServiceImpl.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.StatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GamePayStrategy;
 import com.zanxiang.game.module.mybatis.mapper.GameStrategyMapper;
 import com.zanxiang.game.module.sdk.pojo.param.UserData;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GamePayWayServiceImpl.java

@@ -3,9 +3,8 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.StatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GamePayWay;
 import com.zanxiang.game.module.mybatis.mapper.GamePayWayMapper;
 import com.zanxiang.game.module.sdk.pojo.dto.GamePayWayDTO;
@@ -16,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author xufeng
@@ -60,6 +60,8 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
             log.error("参数错误, 游戏支付配置信息不存在, gameId : {}", gameId);
             throw new BaseException("参数错误, 游戏支付配置信息不存在");
         }
-        return BeanUtils.copyList(gamePayWayList, GamePayWayDTO.class);
+        return gamePayWayList.stream()
+                .map(gamePayWay -> BeanUtil.copy(gamePayWay, GamePayWayDTO.class))
+                .collect(Collectors.toList());
     }
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/IpBanServiceImpl.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.BanStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.IpBan;
 import com.zanxiang.game.module.mybatis.mapper.IpBanMapper;
 import com.zanxiang.game.module.sdk.service.IIpBanService;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -2,8 +2,8 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.zanxiang.game.module.base.enums.BanStatusEnum;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserCard;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/OrderPayServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zanxiang.game.module.base.enums.PayDeviceEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayDeviceEnum;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.entity.OrderPayParam;
 import com.zanxiang.game.module.sdk.enums.DeviceTypeEnum;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/OrderServiceImpl.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.mybatis.mapper.OrderMapper;
 import com.zanxiang.game.module.sdk.enums.CallBackEnum;
@@ -12,6 +11,7 @@ import com.zanxiang.game.module.sdk.pojo.dto.PlatformOrderDTO;
 import com.zanxiang.game.module.sdk.pojo.param.ProductPayParam;
 import com.zanxiang.game.module.sdk.pojo.param.UserData;
 import com.zanxiang.game.module.sdk.service.*;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -141,6 +141,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public PlatformOrderDTO getByOrderId(String orderId) {
         Order order = getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId, orderId));
-        return BeanUtils.copy(order, PlatformOrderDTO.class);
+        return BeanUtil.copy(order, PlatformOrderDTO.class);
     }
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PayApplicationServiceImpl.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.PayApplication;
 import com.zanxiang.game.module.mybatis.entity.PayMerchant;
 import com.zanxiang.game.module.mybatis.mapper.PayApplicationMapper;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PayMerchantServiceImpl.java

@@ -3,7 +3,6 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.utils.BeanUtils;
 import com.zanxiang.game.module.mybatis.entity.PayMerchant;
 import com.zanxiang.game.module.mybatis.mapper.PayMerchantMapper;
 import com.zanxiang.game.module.sdk.pojo.dto.PayMerchantDTO;
@@ -14,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 游戏支付商户配置表 服务实现类
@@ -49,6 +49,7 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
             log.error("参数错误, 符合条件的商户不存在, ids : {}", merchantNoList);
             throw new BaseException("参数错误, 符合条件的商户不存在");
         }
-        return BeanUtils.copyList(payMerchantList, PayMerchantDTO.class);
+        return payMerchantList.stream().map(payMerchant -> BeanUtil.copy(payMerchant, PayMerchantDTO.class))
+                .collect(Collectors.toList());
     }
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PerformOrderServiceImpl.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.zanxiang.game.module.base.enums.CpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.CpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.sdk.enums.OrderStateEnum;
 import com.zanxiang.game.module.sdk.pojo.dto.PayMerchantDTO;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/SmsServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.service.impl;
 
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.sdk.constant.RedisKeyConstant;
 import com.zanxiang.game.module.sdk.enums.ExpireTimeEnum;
 import com.zanxiang.game.module.sdk.enums.SmsTypeEnum;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserCardServiceImpl.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserCard;
 import com.zanxiang.game.module.mybatis.mapper.UserCardMapper;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserServiceImpl.java

@@ -3,8 +3,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserCard;
@@ -23,6 +22,7 @@ import com.zanxiang.game.module.sdk.service.IUserCardService;
 import com.zanxiang.game.module.sdk.service.IUserService;
 import com.zanxiang.game.module.sdk.util.RegisterUtil;
 import com.zanxiang.module.util.JsonUtil;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
@@ -210,7 +210,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User user = super.getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getGameId, gameId)
                 .eq(User::getMobile, mobile));
-        return BeanUtils.copy(user, UserDTO.class);
+        return BeanUtil.copy(user, UserDTO.class);
     }
 
     @Override
@@ -222,7 +222,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             log.error("参数错误, 根据openId查询用户信息不存在, gameId : {}, openId : {}", gameId, openId);
             throw new BaseException("参数错误, 根据openId查询用户信息不存在");
         }
-        return BeanUtils.copy(user, UserDTO.class);
+        return BeanUtil.copy(user, UserDTO.class);
     }
 
     @Override
@@ -232,6 +232,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             log.error("参数错误, 根据userId查询用户信息不存在,  userId : {}", userId);
             throw new BaseException("参数错误, 根据userId查询用户信息不存在");
         }
-        return BeanUtils.copy(user, UserDTO.class);
+        return BeanUtil.copy(user, UserDTO.class);
     }
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserTokenServiceImpl.java

@@ -2,8 +2,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.enums.BanStatusEnum;
-import com.zanxiang.game.module.base.utils.BeanUtils;
+import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserToken;
@@ -20,6 +19,7 @@ import com.zanxiang.game.module.sdk.service.IUserTokenService;
 import com.zanxiang.game.module.sdk.util.DateUtils;
 import com.zanxiang.game.module.sdk.util.RedisUtil;
 import com.zanxiang.game.module.sdk.util.SignUtil;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -122,7 +122,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         String tokenInfoKey = this.getTokenInfoKey(token, deviceType);
         UserToken userToken = redisUtil.getCache(tokenInfoKey);
         if (userToken != null) {
-            return BeanUtils.copy(userToken, UserTokenDTO.class);
+            return BeanUtil.copy(userToken, UserTokenDTO.class);
         }
         //缓存不存在, 查询数据库
         userToken = super.getOne(new LambdaQueryWrapper<UserToken>()
@@ -137,7 +137,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         String userTokenKey = this.getUserTokenKey(userToken.getUserId(), deviceType);
         redisUtil.setCache(userTokenKey, userToken, ExpireTimeEnum.ONE_DAY.getTime());
         //返回数据
-        return BeanUtils.copy(userToken, UserTokenDTO.class);
+        return BeanUtil.copy(userToken, UserTokenDTO.class);
     }
 
     @Override

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/AliPayService.java

@@ -8,8 +8,8 @@ import com.alipay.easysdk.payment.common.models.AlipayTradeQueryResponse;
 import com.alipay.easysdk.payment.page.models.AlipayTradePagePayResponse;
 import com.alipay.easysdk.payment.wap.models.AlipayTradeWapPayResponse;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
-import com.zanxiang.game.module.base.enums.OsEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.OsEnum;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.sdk.enums.OrderStateEnum;
 import com.zanxiang.game.module.sdk.pojo.dto.*;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/MiPayService.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.sdk.service.pay;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.sdk.enums.OrderStateEnum;
 import com.zanxiang.game.module.sdk.pojo.dto.*;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/WxPayService.java

@@ -1,9 +1,9 @@
 package com.zanxiang.game.module.sdk.service.pay;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.zanxiang.game.module.base.enums.DeleteEnum;
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
-import com.zanxiang.game.module.base.enums.PayDeviceEnum;
+import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayDeviceEnum;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.entity.OrderPayParam;
 import com.zanxiang.game.module.sdk.constant.WxPayConstants;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/util/RegisterUtil.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.sdk.util;
 
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
+import com.zanxiang.game.module.base.pojo.enums.HttpStatusEnum;
 import com.zanxiang.module.util.encryption.Md5Util;
 import org.apache.logging.log4j.util.Strings;