Merge branch 'package' of GameCenter/game-center into dev

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/oceanengine/pojo/dto/OrderReportRpcDTO.java

@@ -1,11 +1,17 @@
 package com.zanxiang.game.back.base.oceanengine.pojo.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrderReportRpcDTO implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
@@ -36,6 +42,10 @@ public class OrderReportRpcDTO implements Serializable {
      * 渠道标识
      */
     private String agentKey;
+    /**
+     * 回传策略 id
+     */
+    private Long backPolicyId;
     /**
      * 订单金额（分）
      */

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/oceanengine/pojo/dto/UserActiveReportRpcDTO.java

@@ -1,11 +1,17 @@
 package com.zanxiang.game.back.base.oceanengine.pojo.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class UserActiveReportRpcDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/tencent/pojo/dto/TencentOrderDTO.java

@@ -14,6 +14,10 @@ import java.time.LocalDateTime;
 @Builder
 public class TencentOrderDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
     /**
      * 游戏ID
      */

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/tencent/pojo/dto/TencentUserDTO.java

@@ -14,6 +14,10 @@ import java.time.LocalDateTime;
 @Builder
 public class TencentUserDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
     /**
      * 游戏ID
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/BackPolicyController.java

@@ -28,84 +28,84 @@ public class BackPolicyController {
     @Autowired
     private IGameOceanengineUserLogService oceanengineUserLogService;
 
-    @PreAuthorize(permissionKey = "gameBack:policy:create")
+//    @PreAuthorize(permissionKey = "gameBack:policy:create")
     @PostMapping("/policy/create")
     @ApiOperation(value = "创建回传策略")
     public ResultVO<Boolean> createPolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.createPolicy(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:policy:update")
+//    @PreAuthorize(permissionKey = "gameBack:policy:update")
     @PostMapping("/policy/update")
     @ApiOperation(value = "修改回传策略")
     public ResultVO<Boolean> updatePolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.updatePolicy(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:policy:delete")
+//    @PreAuthorize(permissionKey = "gameBack:policy:delete")
     @PostMapping("/policy/delete/{ids}")
     @ApiOperation(value = "删除回传策略")
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:policy:list")
+//    @PreAuthorize(permissionKey = "gameBack:policy:list")
     @PostMapping("/policy/list")
     @ApiOperation(value = "回传策略列表")
     public ResultVO<IPage<GameBackPolicyVO>> policyList(@RequestBody GameBackPolicyListDTO dto) {
         return ResultVO.ok(gameBackPolicyService.policyList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:orderLogs")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:orderLogs")
     @PostMapping("/tencent/orderLogs")
     @ApiOperation(value = "腾讯订单回传日志列表")
     public ResultVO<IPage<GameTencentOrderVO>> tencentOrderLogList(@RequestBody GameTencentOrderDTO dto) {
         return ResultVO.ok(tencentOrderService.tencentOrderLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
     @PostMapping("/tencent/orderReport/{ids}")
     @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(tencentOrderService.tencentOrderReport(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:userLogs")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:userLogs")
     @PostMapping("/tencent/userLogs")
     @ApiOperation(value = "腾讯用户回传日志列表")
     public ResultVO<IPage<GameTencentUserVO>> tencentUserLogList(@RequestBody GameTencentUserDTO dto) {
         return ResultVO.ok(tencentUserService.tencentUserLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:userReport")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:userReport")
     @PostMapping("/tencent/userReport/{ids}")
     @ApiOperation(value = "腾讯用户手动上报")
     public ResultVO<Boolean> tencentUserReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(tencentUserService.tencentUserReport(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderLogs")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderLogs")
     @PostMapping("/oceanengine/orderLogs")
     @ApiOperation(value = "头条订单回传日志列表")
     public ResultVO<IPage<GameOceanengineOrderLogVO>> oceanengineOrderLogList(@RequestBody GameOceanengineOrderLogDTO dto) {
         return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
     @PostMapping("/oceanengine/orderReport/{ids}")
     @ApiOperation(value = "头条订单手动上报")
     public ResultVO<Boolean> oceanengineOrderReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderReport(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:userLogs")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:userLogs")
     @PostMapping("/oceanengine/userLogs")
     @ApiOperation(value = "头条用户回传日志列表")
     public ResultVO<IPage<GameOceanengineUserLogVO>> oceanengineUserLogList(@RequestBody GameOceanengineUserLogDTO dto) {
         return ResultVO.ok(oceanengineUserLogService.oceanengineUserLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
     @PostMapping("/oceanengine/userReport/{ids}")
     @ApiOperation(value = "头条用户手动上报")
     public ResultVO<Boolean> oceanengineUserReport(@PathVariable("ids") List<Long> ids) {

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyDTO.java

@@ -34,18 +34,6 @@ public class GameBackPolicyDTO implements Serializable {
     @ApiModelProperty("回传策略名")
     private String backPolicyName;
 
-    /**
-     * 游戏ID
-     */
-    @ApiModelProperty("游戏ID")
-    private Long gameId;
-
-    /**
-     * 账号ID
-     */
-    @ApiModelProperty("账号ID")
-    private Long accountId;
-
     /**
      * 首充金额（小于等于指定金额）
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyListDTO.java

@@ -25,24 +25,6 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameBackPolicyListDTO extends BaseListDTO<GameBackPolicy> {
-    /**
-     * 游戏ID
-     */
-    @ApiModelProperty("游戏ID")
-    private Long gameId;
-
     @ApiModelProperty("回传策略名")
     private String backPolicyName;
-
-    /**
-     * 账号ID
-     */
-    @ApiModelProperty("账号ID")
-    private Long accountId;
-
-    @ApiModelProperty("创建者")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameBackPolicy.java

@@ -32,16 +32,6 @@ public class GameBackPolicy implements Serializable {
 
     private String backPolicyName;
 
-    /**
-     * 游戏ID
-     */
-    private Long gameId;
-
-    /**
-     * 账号ID
-     */
-    private Long accountId;
-
     /**
      * 首充金额（小于等于指定金额）
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineOrderLog.java

@@ -40,6 +40,10 @@ public class GameOceanengineOrderLog implements Serializable {
      * 游戏 id
      */
     private Long gameId;
+    /**
+     * 回传策略 id
+     */
+    private Long backPolicyId;
     /**
      * 广告账号_id
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentOrder.java

@@ -25,7 +25,10 @@ public class GameTencentOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
     /**
      * 渠道号
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentUser.java

@@ -25,6 +25,10 @@ public class GameTencentUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
 
     /**
      * 渠道号

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameBackPolicyVO.java

@@ -31,18 +31,6 @@ public class GameBackPolicyVO implements Serializable {
     @ApiModelProperty("回传策略名")
     private String backPolicyName;
 
-    /**
-     * 游戏ID
-     */
-    @ApiModelProperty("游戏ID")
-    private Long gameId;
-
-    /**
-     * 账号ID
-     */
-    @ApiModelProperty("账号ID")
-    private Long accountId;
-
     /**
      * 首充金额（小于等于指定金额）
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/WechatMiniGameDataReportRpcImpl.java

@@ -53,6 +53,7 @@ public class WechatMiniGameDataReportRpcImpl implements IWechatMiniGameDataRepor
                 .openId(dto.getWechatOpenId())
                 .unionId(dto.getWechatUnionId())
                 .gameId(dto.getGameId())
+                .backPolicyId(dto.getBackPolicyId())
                 .accountId(dto.getAccountReport().getAccountId())
                 .accountReportToken(dto.getAccountReport().getReportToken())
                 .accountReportUrl(dto.getAccountReport().getReportUrl())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameBackPolicyServiceImpl.java

@@ -80,6 +80,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .orderStatus(dto.getOrderStatus())
                 .payTime(dto.getPayTime())
                 .isBack(BackStatusEnum.NO.getBackStatus())
+                .backPolicyId(dto.getBackPolicyId())
                 .build();
         gameTencentOrderService.save(gameTencentOrder);
         if (!dto.getOrderStatus().equals(COMPLETE_ORDER) && !dto.getOrderStatus().equals(PURCHASE)) {
@@ -111,25 +112,24 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .wechatOpenid(dto.getWechatOpenid())
                 .build();
 
-        GameBackPolicy gameBackPolicy = gameBackPolicyService.getOne(new LambdaQueryWrapper<GameBackPolicy>()
-                .eq(GameBackPolicy::getGameId, dto.getGameId())
-                .eq(GameBackPolicy::getAccountId, dto.getAdAccountId()));
-        if (null == gameBackPolicy) {
-            gameBackPolicy = gameBackPolicyService.getOne(new LambdaQueryWrapper<GameBackPolicy>()
-                    .eq(GameBackPolicy::getGameId, dto.getGameId())
-                    .isNull(GameBackPolicy::getAccountId));
+        boolean doBack;
+        if (null == dto.getBackPolicyId()){
+            doBack = true;
+        }else {
+            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(dto.getBackPolicyId());
+
+            doBack = BackPolicyUtil.backOrder(gameBackPolicy, dto.getRechargeMoney(), backUnit -> Long.valueOf(
+                    gameTencentOrderService.list(new LambdaQueryWrapper<GameTencentOrder>()
+                            .eq(GameTencentOrder::getGameId, dto.getGameId())
+                            .eq(GameTencentOrder::getWechatAppId, dto.getWechatAppId())
+                            .eq(GameTencentOrder::getAdAccountId, dto.getAdAccountId())
+                            .eq(GameTencentOrder::getOrderStatus, 2)
+                            .last("limit " + backUnit)
+                            .orderByDesc(GameTencentOrder::getCreateTime)
+                    ).stream().filter(order -> order.getIsBack().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
+            ).intValue());
         }
 
-        boolean doBack = BackPolicyUtil.backOrder(gameBackPolicy, dto.getRechargeMoney(), backUnit -> Long.valueOf(
-                gameTencentOrderService.list(new LambdaQueryWrapper<GameTencentOrder>()
-                        .eq(GameTencentOrder::getGameId, dto.getGameId())
-                        .eq(GameTencentOrder::getWechatAppId, dto.getWechatAppId())
-                        .eq(GameTencentOrder::getAdAccountId, dto.getAdAccountId())
-                        .eq(GameTencentOrder::getOrderStatus, 2)
-                        .last("limit " + backUnit)
-                        .orderByDesc(GameTencentOrder::getCreateTime)
-                ).stream().filter(order -> order.getIsBack().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
-        ).intValue());
         try {
             if (dto.getOrderStatus().equals(COMPLETE_ORDER) || doBack) {
                 userActionSetRpc.reportByAppId(dataReportOfAppIdRpcDTO);
@@ -227,8 +227,6 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         }
         GameBackPolicy backPolicy = GameBackPolicy.builder()
                 .backPolicyName(dto.getBackPolicyName())
-                .gameId(dto.getGameId())
-                .accountId(dto.getAccountId())
                 .firstRechargeMoney(dto.getFirstRechargeMoney())
                 .firstRechargeBackPercentage(dto.getFirstRechargeBackPercentage())
                 .bigRechargeBackPercentage(dto.getBigRechargeBackPercentage())
@@ -254,8 +252,6 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         GameBackPolicy backPolicy = GameBackPolicy.builder()
                 .id(dto.getId())
                 .backPolicyName(dto.getBackPolicyName())
-                .gameId(dto.getGameId())
-                .accountId(dto.getAccountId())
                 .firstRechargeMoney(dto.getFirstRechargeMoney())
                 .firstRechargeBackPercentage(dto.getFirstRechargeBackPercentage())
                 .bigRechargeBackPercentage(dto.getBigRechargeBackPercentage())
@@ -278,22 +274,23 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
     public IPage<GameBackPolicyVO> policyList(GameBackPolicyListDTO dto) {
         return gameBackPolicyService.page(dto.toPage(), new LambdaQueryWrapper<GameBackPolicy>()
                         .like(StringUtils.isNotBlank(dto.getBackPolicyName()), GameBackPolicy::getBackPolicyName, dto.getBackPolicyName())
-                        .eq(null != dto.getGameId(), GameBackPolicy::getGameId, dto.getGameId())
-                        .eq(null != dto.getAccountId(), GameBackPolicy::getAccountId, dto.getAccountId())
-                        .eq(null != dto.getCreateBy(), GameBackPolicy::getCreateBy, dto.getCreateBy()))
+                        .eq(GameBackPolicy::getCreateBy,SecurityUtil.getUserId())
+                        .orderByDesc(GameBackPolicy::getCreateTime))
                 .convert(item -> GameBackPolicyVO.builder()
                         .id(item.getId())
                         .backPolicyName(item.getBackPolicyName())
-                        .accountId(item.getAccountId())
                         .bigRechargeBackPercentage(item.getBigRechargeBackPercentage())
                         .bigRechargeMoney(item.getBigRechargeMoney())
                         .firstRechargeBackPercentage(item.getFirstRechargeBackPercentage())
                         .firstRechargeMoney(item.getFirstRechargeMoney())
                         .otherRechargeBackPercentage(item.getOtherRechargeBackPercentage())
+                        .levelDown(item.getLevelDown())
+                        .createTime(item.getCreateTime())
+                        .updateTime(item.getUpdateTime())
                         .createBy(item.getCreateBy())
                         .updateBy(item.getUpdateBy())
                         .createName(sysUserRpc.getById(item.getCreateBy()).getData().getNickname())
-                        .updateName(sysUserRpc.getById(item.getUpdateBy()).getData().getNickName())
+                        .updateName(null == item.getUpdateBy() ? null : sysUserRpc.getById(item.getUpdateBy()).getData().getNickName())
                         .build());
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineOrderLogServiceImpl.java

@@ -4,20 +4,15 @@ 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.advertising.tencent.base.pojo.dto.DataReportOfAppIdRpcDTO;
-import com.zanxiang.advertising.tencent.base.pojo.dto.UserActionRpcDTO;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
-import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.back.serve.dao.mapper.GameOceanengineOrderLogMapper;
 import com.zanxiang.game.back.serve.oceanengine.MiniGameCallback;
 import com.zanxiang.game.back.serve.oceanengine.OceanengineCallbackException;
 import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineOrderLogDTO;
 import com.zanxiang.game.back.serve.pojo.entity.*;
-import com.zanxiang.game.back.serve.pojo.enums.ActionTypeEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderLogVO;
-import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderVO;
 import com.zanxiang.game.back.serve.service.IGameBackPolicyService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineBackLogService;
 import com.zanxiang.game.back.serve.service.IGameOceanengineOrderLogService;
@@ -25,7 +20,6 @@ import com.zanxiang.game.back.serve.service.IGameOceanengineUserLogService;
 import com.zanxiang.game.back.serve.utils.BackPolicyUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,21 +55,11 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                 // 头条只要回传支付订单
                 return false;
             }
-            List<GameBackPolicy> gameBackPolicyList = gameBackPolicyService.list(new LambdaQueryWrapper<GameBackPolicy>()
-                    .eq(GameBackPolicy::getAccountId, orderLog.getAccountId())
-                    .or().eq(GameBackPolicy::getGameId, orderLog.getGameId())
-            );
-            if (CollectionUtils.isEmpty(gameBackPolicyList)) {
+            if (orderLog.getBackPolicyId() == null) {
                 // 没有回传策略，则直接全量回传
                 doBack = true;
             } else {
-                GameBackPolicy gameBackPolicy = gameBackPolicyList.get(0);
-                if (gameBackPolicyList.size() > 1) {
-                    GameBackPolicy temp = gameBackPolicyList.get(1);
-                    if (temp.getAccountId() != null && temp.getAccountId() > 0) {
-                        gameBackPolicy = temp;
-                    }
-                }
+                GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(orderLog.getBackPolicyId());
                 doBack = BackPolicyUtil.backOrder(gameBackPolicy, orderLog.getAmount(), backUnit -> {
                     return Long.valueOf(list(new LambdaQueryWrapper<GameOceanengineOrderLog>()
                                     .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
@@ -89,7 +73,6 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                 });
                 orderLog.setAmount(BackPolicyUtil.lowRechargeLevel(orderLog.getAmount(), gameBackPolicy.getLevelDown()));
             }
-
         }
         if (doBack) {
             BackStatusEnum backStatus = doCallback(orderLog);
@@ -121,7 +104,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
     public boolean oceanengineOrderReport(List<Long> ids) {
         baseMapper.selectBatchIds(ids).stream()
                 .filter(item -> !item.getBackStatus().equals(BackStatusEnum.SUCCESS.getBackStatus()))
-                .forEach(oceanengineOrderLog -> callback(oceanengineOrderLog,true));
+                .forEach(oceanengineOrderLog -> callback(oceanengineOrderLog, true));
         return true;
     }
 

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/GameCategoryEnum.java

@@ -1,44 +0,0 @@
-package com.zanxiang.game.module.base.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-13
- * @description : 游戏应用类型
- */
-@Getter
-@AllArgsConstructor
-public enum GameCategoryEnum {
-
-    /**
-     * 微信小游戏
-     */
-    CATEGORY_WX_APPLET("wx_applet", "微信小游戏"),
-
-    /**
-     * 抖音小游戏
-     */
-    CATEGORY_DY_APPLET("byte_applet", "抖音小游戏"),
-
-    /**
-     * h5游戏
-     */
-    CATEGORY_H5("h5", "h5游戏"),
-
-    /**
-     * app游戏
-     */
-    CATEGORY_APP("app", "app游戏");
-
-    /**
-     * 游戏分类key
-     */
-    private String key;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

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

@@ -1,57 +0,0 @@
-package com.zanxiang.game.module.base.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号类型
- */
-@Getter
-@AllArgsConstructor
-public enum PromoAccountTypeEnum {
-
-    /**
-     * 微信公众号
-     */
-    ACCOUNT_WX_MP(1, "微信公众号"),
-
-    /**
-     * 今日头条账号
-     */
-    ACCOUNT_BYTE(2, "今日头条账号"),
-
-    /**
-     * ADQ(QQ)账号
-     */
-    ACCOUNT_ADQ_QQ(3, "ADQ(QQ)账号");
-
-    /**
-     * 账号类型
-     */
-    private Integer type;
-
-    /**
-     * 账号类型名称
-     */
-    private String name;
-
-    /**
-     * 被类型名称
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getNameByType(Integer type) {
-        PromoAccountTypeEnum[] values = PromoAccountTypeEnum.values();
-        for (PromoAccountTypeEnum promoAccountTypeEnum : values) {
-            if (Objects.equals(promoAccountTypeEnum.getType(), type)) {
-                return promoAccountTypeEnum.getName();
-            }
-        }
-        return null;
-    }
-}

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

@@ -1,62 +0,0 @@
-package com.zanxiang.game.module.base.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体类型
- */
-@Getter
-@AllArgsConstructor
-public enum PromoMediaTypeEnum {
-
-    /**
-     * 社交类
-     */
-    MEDIA_SOCIAL_CONTACT(1, "社交类"),
-
-    /**
-     * 短视频
-     */
-    MEDIA_SHORT_VIDEO(2, "短视频"),
-
-    /**
-     * 资讯
-     */
-    MEDIA_NEWS_INFO(3, "资讯"),
-
-    /**
-     * 视频
-     */
-    MEDIA_VIDEO(4, "视频");
-
-    /**
-     * 媒体类型
-     */
-    private Integer type;
-
-    /**
-     * 媒体名称
-     */
-    private String name;
-
-    /**
-     * 被类型名称
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getNameByType(Integer type) {
-        PromoMediaTypeEnum[] values = PromoMediaTypeEnum.values();
-        for (PromoMediaTypeEnum promoMediaTypeEnum : values) {
-            if (Objects.equals(promoMediaTypeEnum.getType(), type)) {
-                return promoMediaTypeEnum.getName();
-            }
-        }
-        return null;
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.zanxiang.game.module.base.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广服务商
- */
-@Getter
-@AllArgsConstructor
-public enum PromoProviderEnum {
-
-    /**
-     * 巨网
-     */
-    JU_GU(1, "巨网"),
-
-    /**
-     * 广联
-     */
-    GUANG_LIAN(2, "广联"),
-
-    /**
-     * 太古
-     */
-    TAI_GU(3, "太古");
-
-    /**
-     * 推广服务商id
-     */
-    private Integer providerId;
-
-    /**
-     * 推广媒体
-     */
-    private String providerName;
-
-    /**
-     * 被类型名称
-     *
-     * @param type 类型
-     * @return {@link String}
-     */
-    public static String getNameByType(Integer type) {
-        PromoProviderEnum[] values = PromoProviderEnum.values();
-        for (PromoProviderEnum promoProviderEnum : values) {
-            if (Objects.equals(promoProviderEnum.getProviderId(), type)) {
-                return promoProviderEnum.getProviderName();
-            }
-        }
-        return null;
-    }
-}

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/pojo/enums/GameCategoryEnum.java

@@ -0,0 +1,66 @@
+package com.zanxiang.game.module.base.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-13
+ * @description : 游戏应用类型
+ */
+@Getter
+@AllArgsConstructor
+public enum GameCategoryEnum {
+
+    /**
+     * 微信小游戏
+     */
+    CATEGORY_WX_APPLET(1L, "wx_applet", "微信小游戏"),
+
+    /**
+     * 抖音小游戏
+     */
+    CATEGORY_DY_APPLET(2L, "byte_applet", "抖音小游戏"),
+
+    /**
+     * h5游戏
+     */
+    CATEGORY_H5(3L, "h5", "h5游戏"),
+
+    /**
+     * app游戏
+     */
+    CATEGORY_APP(4L, "app", "app游戏");
+
+    /**
+     * 应用id
+     */
+    private Long category;
+
+    /**
+     * 游戏分类key
+     */
+    private String key;
+
+    /**
+     * 描述
+     */
+    private String name;
+
+    /**
+     * 被分类名字
+     *
+     * @param category 类别
+     * @return {@link String}
+     */
+    public static String getNameByCategory(Long category) {
+        for (GameCategoryEnum gameCategoryEnum : GameCategoryEnum.values()) {
+            if (Objects.equals(gameCategoryEnum.getCategory(), category)) {
+                return gameCategoryEnum.getName();
+            }
+        }
+        return null;
+    }
+}

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,11 +1,10 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.apache.logging.log4j.util.Strings;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
 /**
  * 支付设备类型
@@ -62,24 +61,21 @@ public enum PayDeviceEnum {
      */
     private String payDeviceName;
 
-    public static String getDescByNum(Integer code) {
-        PayDeviceEnum[] values = PayDeviceEnum.values();
-        for (int i = 0; i < values.length; i++) {
-            if (values[i].getPayDeviceId().equals(code)) {
-                return values[i].getPayDeviceName();
-            }
+    /**
+     * 根据支付方式id获取名称
+     *
+     * @param payDeviceId : 支付方式id
+     * @return : 支付类型枚举
+     */
+    public static String getByPayWayId(Long payDeviceId) {
+        if (payDeviceId == null) {
+            return Strings.EMPTY;
         }
-        return "";
-    }
-
-    public static String getDesc(String obj) {
-        List<String> Desc = new ArrayList<>(10);
-        String str = obj.substring(1, obj.length() - 1);
-        String[] strArr = str.split(",");
-        for (int i = 0; i < strArr.length; i++) {
-            String name = PayDeviceEnum.getDescByNum(Integer.valueOf(strArr[i]));
-            Desc.add(name);
+        for (PayDeviceEnum payDeviceEnum : PayDeviceEnum.values()) {
+            if (Objects.equals(payDeviceId, payDeviceEnum.getPayDeviceId())) {
+                return payDeviceEnum.getPayDeviceName();
+            }
         }
-        return Desc.stream().collect(Collectors.joining(","));
+        return Strings.EMPTY;
     }
 }

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,7 +1,8 @@
-package com.zanxiang.game.module.base.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.apache.logging.log4j.util.Strings;
 
 import java.util.Objects;
 
@@ -46,21 +47,20 @@ public enum PayWayEnum {
     private String payWayName;
 
     /**
-     * 根据书城key获取名称
+     * 根据支付类型id获取名称
      *
-     * @param payType : 支付类型
+     * @param payWayId : 支付类型
      * @return : 支付类型枚举
      */
-    public static String getByPayType(Long payType) {
-        if (payType == null) {
-            return null;
+    public static String getByPayWayId(Long payWayId) {
+        if (payWayId == null) {
+            return Strings.EMPTY;
         }
         for (PayWayEnum payWayEnum : PayWayEnum.values()) {
-            if (Objects.equals(payType.intValue(), payWayEnum.getPayWayId())) {
+            if (Objects.equals(payWayId.intValue(), payWayEnum.getPayWayId())) {
                 return payWayEnum.getPayWayName();
             }
         }
-        return null;
+        return Strings.EMPTY;
     }
-
 }

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/config/SwaggerConfig.java

@@ -29,7 +29,7 @@ public class SwaggerConfig {
                 .apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors
-                        .basePackage("com.zanxiang.manage"))
+                        .basePackage("com.zanxiang.game.module.manage"))
                 .paths(PathSelectors.any())
                 .build();
     }

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

@@ -0,0 +1,72 @@
+package com.zanxiang.game.module.manage.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.game.module.manage.pojo.enums.AccountTypeEnum;
+import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
+import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
+import com.zanxiang.game.module.manage.pojo.vo.AgentVO;
+import com.zanxiang.game.module.manage.service.IAgentService;
+import com.zanxiang.game.module.mybatis.entity.Agent;
+import com.zanxiang.module.util.exception.BaseException;
+import com.zanxiang.module.util.pojo.ResultVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/agent")
+public class AgentController {
+
+    @Autowired
+    private IAgentService agentService;
+
+    @PreAuthorize(permissionKey = "sdk:agent:list")
+    @PostMapping("/list")
+    public ResultVO<IPage<AgentVO>> listOfPage(@Validated @RequestBody AgentListParam dto) {
+        return ResultVO.ok(agentService.listOfPage(dto));
+    }
+
+    @PreAuthorize(permissionKey = "sdk:agent:add")
+    @PostMapping
+    public ResultVO<Boolean> add(AgentAddParam dto) {
+        dto.setAgentName(dto.getAgentName().trim());
+        AccountTypeEnum accountType = AccountTypeEnum.getByValue(dto.getAccountType());
+        if (accountType == null) {
+            throw new BaseException("错误的账号类型：" + dto.getAccountType());
+        }
+        if (accountType == AccountTypeEnum.TENCENT) {
+            if (dto.getUserActionSetId() == null) {
+                throw new BaseException("腾讯广告账号必须选回传的数据源");
+            }
+        } else if (accountType == AccountTypeEnum.BYTE) {
+            if (StringUtils.isBlank(dto.getReportToken()) || StringUtils.isBlank(dto.getReportUrl())) {
+                throw new BaseException("头条广告账号必须填入回传的 token 和 url");
+            }
+            dto.setReportToken(dto.getReportToken().trim());
+            dto.setReportUrl(dto.getReportUrl());
+        }
+        if (dto.getPutStatus() == null) {
+            dto.setPutStatus(Agent.PUT_STATUS_ING);
+        }
+        return ResultVO.ok(agentService.add(dto));
+    }
+
+
+    @PreAuthorize(permissionKey = "sdk:agent:configPutStatus")
+    @PutMapping("/configPutStatus/{agentIds}/{putStatus}")
+    public ResultVO<Boolean> configPutStatus(@PathVariable("agentIds") List<Long> agentIds, @PathVariable("putStatus") Integer putStatus) {
+        return ResultVO.ok(agentService.configPutStatus(agentIds, putStatus));
+    }
+
+    @PreAuthorize(permissionKey = "sdk:agent:configBackPolicy")
+    @PutMapping("/configBackPolicy/{agentIds}/{backPolicyId}")
+    public ResultVO<Boolean> configBackPolicy(@PathVariable("agentIds") List<Long> agentIds, @PathVariable("backPolicyId") Long backPolicyId) {
+        return ResultVO.ok(agentService.configBackPolicy(agentIds, backPolicyId));
+    }
+}

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

@@ -1,10 +1,13 @@
 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.OsEnum;
+import com.zanxiang.game.module.base.pojo.enums.PayApplicationTypeEnum;
+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;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : lingfeng
@@ -39,12 +43,6 @@ public class ChoiceController {
     @Autowired
     private IGameCategoryService gameCategoryService;
 
-    @Autowired
-    private IPromoChannelService promoChannelService;
-
-    @Autowired
-    private IPromoAccountService promoAccountService;
-
     @Autowired
     private IPayWayService payWayService;
 
@@ -54,12 +52,6 @@ public class ChoiceController {
     @Autowired
     private IGameTagService gameTagService;
 
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @Autowired
-    private IPromoSiteService promoSiteService;
-
     @Autowired
     private IPayApplicationService payApplicationService;
 
@@ -69,12 +61,17 @@ public class ChoiceController {
     @Autowired
     private IPayBoxService payBoxService;
 
+    @Autowired
+    private IAgentService agentService;
+
     @ApiOperation(value = "vip等级选择列表")
     @GetMapping(value = "/vip/level/list")
     @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 = "操作系统选择列表")
@@ -82,7 +79,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选择列表")
@@ -117,28 +116,12 @@ public class ChoiceController {
         return ResultVO.ok(gameTagService.gameTagsChoiceList());
     }
 
-    @ApiOperation(value = "注册渠道选择列表")
-    @GetMapping(value = "/promo/channel/list")
-    @PreAuthorize(permissionKey = "sdk:promoChannelChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoChannelChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoChannelChoiceVO>> promoChannelChoiceList() {
-        return ResultVO.ok(promoChannelService.promoChannelChoiceList());
-    }
-
-    @ApiOperation(value = "归因推广账号选择列表")
-    @GetMapping(value = "/promo/account/list")
-    @PreAuthorize(permissionKey = "sdk:promoAccountChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoAccountChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoAccountChoiceVO>> promoAccountChoiceList() {
-        return ResultVO.ok(promoAccountService.promoAccountChoiceList());
-    }
-
-    @ApiOperation(value = "归因投放人员选择列表")
-    @GetMapping(value = "/promo/pitcher/list")
-    @PreAuthorize(permissionKey = "sdk:promoPitcherChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoPitcherChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoPitcherChoiceVO>> promoPitcherChoiceList() {
-        return ResultVO.ok(promoAccountService.promoPitcherChoiceList());
+    @ApiOperation(value = "注册渠道-账号选择列表")
+    @GetMapping(value = "/agent/account/list")
+    @PreAuthorize(permissionKey = "sdk:agentAccountChoice:list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AgentAccountChoiceVO.class, responseContainer = "list")})
+    public ResultVO<List<AgentAccountChoiceVO>> agentAccountChoiceList() {
+        return ResultVO.ok(agentService.agentAccountChoiceList());
     }
 
     @ApiOperation(value = "支付方式选择列表")
@@ -165,60 +148,14 @@ public class ChoiceController {
         return ResultVO.ok(payMerchantService.payMerchantChoiceList());
     }
 
-    @ApiOperation(value = "推广媒体类型选择列表")
-    @GetMapping(value = "/promo/media/type/list")
-    @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));
-    }
-
-    @ApiOperation(value = "推广媒体选择列表")
-    @GetMapping(value = "/promo/media/list")
-    @PreAuthorize(permissionKey = "sdk:promoMediaChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoMediaChoiceVO>> promoMediaChoiceList() {
-        return ResultVO.ok(promoMediaService.promoMediaChoiceList());
-    }
-
-    @ApiOperation(value = "推广账号类型选择列表")
-    @GetMapping(value = "/promo/account/type/list")
-    @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));
-    }
-
-    @ApiOperation(value = "推广账号联动选择列表")
-    @GetMapping(value = "/promo/account/linkage/list")
-    @PreAuthorize(permissionKey = "sdk:promoAccountLinkageChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoAccountLinkageChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoAccountLinkageChoiceVO>> promoAccountLinkageChoiceList() {
-        return ResultVO.ok(promoAccountService.promoAccountLinkageChoiceList());
-    }
-
-    @ApiOperation(value = "推广媒体版位位置联动选择列表")
-    @GetMapping(value = "/promo/site/linkage/list")
-    @PreAuthorize(permissionKey = "sdk:promoSiteLinkageChoice:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoSiteLinkageChoiceVO.class, responseContainer = "list")})
-    public ResultVO<List<PromoSiteLinkageChoiceVO>> promoSiteLinkageChoiceList() {
-        return ResultVO.ok(promoSiteService.promoSiteLinkageChoiceList());
-    }
-
-    @ApiOperation(value = "推广服务商选择列表")
-    @GetMapping(value = "/promo/provider/list")
-    @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));
-    }
-
     @ApiOperation(value = "支付应用类型选择列表")
     @GetMapping(value = "/application/type/list")
     @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 = "支付应用选择列表")
@@ -242,6 +179,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/controller/GameController.java

@@ -2,11 +2,9 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.*;
-import com.zanxiang.game.module.manage.pojo.vo.GameDockVO;
-import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
+import com.zanxiang.game.module.manage.pojo.params.GameAddParam;
+import com.zanxiang.game.module.manage.pojo.params.GameListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameListVO;
-import com.zanxiang.game.module.manage.pojo.vo.GameRelationVO;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.module.util.pojo.ResultVO;
 import io.swagger.annotations.Api;
@@ -40,62 +38,6 @@ public class GameController {
         return ResultVO.ok(gameService.gameAddOrUpdate(param));
     }
 
-    @ApiOperation(value = "游戏基本信息查询")
-    @GetMapping(value = "/detail/info")
-    @PreAuthorize(permissionKey = "sdk:game:detailInfo")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameInfoVO.class)})
-    public ResultVO<GameInfoVO> getGameInfo(@RequestParam Long id) {
-        return ResultVO.ok(gameService.getGameInfo(id));
-    }
-
-    @ApiOperation(value = "游戏基本信息更新")
-    @PostMapping(value = "/detail/update")
-    @PreAuthorize(permissionKey = "sdk:game:detailUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> gameUpdate(@Validated @RequestBody GameUpdateParam param) {
-        return ResultVO.ok(gameService.updateGameInfo(param));
-    }
-
-    @ApiOperation(value = "游戏对接参数获取展示")
-    @GetMapping(value = "/dock/info")
-    @PreAuthorize(permissionKey = "sdk:game:dockInfo")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameDockVO.class)})
-    public ResultVO<GameDockVO> getGameDock(@RequestParam Long id) {
-        return ResultVO.ok(gameService.getGameDock(id));
-    }
-
-    @ApiOperation(value = "游戏对接参数更新更新")
-    @PostMapping(value = "/dock/update")
-    @PreAuthorize(permissionKey = "sdk:game:dockUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> gameDockUpdate(@Validated @RequestBody GameDockParam param) {
-        return ResultVO.ok(gameService.gameDockUpdate(param));
-    }
-
-    @ApiOperation(value = "获取游戏关联信息")
-    @GetMapping(value = "/relation/info")
-    @PreAuthorize(permissionKey = "sdk:game:relationInfo")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameRelationVO.class)})
-    public ResultVO<GameRelationVO> getGameRelation(@RequestParam Long id) {
-        return ResultVO.ok(gameService.getGameRelation(id));
-    }
-
-    @ApiOperation(value = "关联游戏更新")
-    @PostMapping(value = "/relation/update")
-    @PreAuthorize(permissionKey = "sdk:game:relationUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> relationGameUpdate(@Validated @RequestBody RelationGameUpdateParam param) {
-        return ResultVO.ok(gameService.relationGameUpdate(param));
-    }
-
-    @ApiOperation(value = "导量游戏更新")
-    @PostMapping(value = "/guide/update")
-    @PreAuthorize(permissionKey = "sdk:game:guideUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameListVO.class)})
-    public ResultVO<Boolean> guideGameUpdateUpdate(@Validated @RequestBody GuideGameUpdateParam param) {
-        return ResultVO.ok(gameService.guideGameUpdateUpdate(param));
-    }
-
     @ApiOperation(value = "游戏列表查询")
     @PostMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:game:list")

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

@@ -2,8 +2,8 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
 import com.zanxiang.game.module.manage.pojo.params.OrderParam;
+import com.zanxiang.game.module.manage.pojo.params.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
 import com.zanxiang.game.module.manage.pojo.vo.OrderListVO;
 import com.zanxiang.game.module.manage.service.ILogPayCpService;
@@ -48,7 +48,7 @@ public class OrderController {
     @PostMapping(value = "/cp/call/list")
     @PreAuthorize(permissionKey = "sdk:order:callCpList")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = LogPayCpVO.class, responseContainer = "list")})
-    public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody LogPayCpParam param) {
+    public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody PayCallCpLogParam param) {
         return ResultVO.ok(logPayCpService.callCpList(param));
     }
 }

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

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.manage.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.enums.FileTypeEnum;
+import com.zanxiang.game.module.manage.enums.FileTypeEnum;
 import com.zanxiang.module.oss.pojo.OssUploadCallback;
 import com.zanxiang.module.oss.pojo.dto.OssUploadDTO;
 import com.zanxiang.module.oss.service.IOssService;

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

@@ -1,63 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAssignParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoAccountListVO;
-import com.zanxiang.game.module.manage.service.IPromoAccountService;
-import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号
- */
-@Api(tags = "推广账号接口")
-@RestController
-@RequestMapping("/promo/account")
-public class PromoAccountController {
-
-    @Autowired
-    private IPromoAccountService promoAccountService;
-
-    @ApiOperation(value = "查询推广账号列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoAccount:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoAccountListVO.class)})
-    public ResultVO<IPage<PromoAccountListVO>> list(@Validated @RequestBody PromoAccountListParam param) {
-        return ResultVO.ok(promoAccountService.list(param));
-    }
-
-    @ApiOperation(value = "推广账号添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoAccount:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoAccountAddUpdateParam param) {
-        return ResultVO.ok(promoAccountService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广账号状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoAccount:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return ResultVO.ok(promoAccountService.statusUpdate(id, status));
-    }
-
-    @ApiOperation(value = "推广账号指派")
-    @PostMapping(value = "/assign")
-    @PreAuthorize(permissionKey = "manage:accountAssign:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> accountAssign(@Validated @RequestBody PromoAccountAssignParam param) {
-        return ResultVO.ok(promoAccountService.accountAssign(param));
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.PromoChannelAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoChannelListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoChannelListVO;
-import com.zanxiang.game.module.manage.service.IPromoChannelService;
-import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广渠道
- */
-@Api(tags = "推广渠道接口")
-@RestController
-@RequestMapping("/promo/channel")
-public class PromoChannelController {
-
-    @Autowired
-    private IPromoChannelService promoChannelService;
-
-    @ApiOperation(value = "查询推广渠道列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoChannel:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoChannelListVO.class)})
-    public ResultVO<IPage<PromoChannelListVO>> list(@Validated @RequestBody PromoChannelListParam param) {
-        return ResultVO.ok(promoChannelService.list(param));
-    }
-
-    @ApiOperation(value = "推广渠道添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoChannel:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoChannelAddUpdateParam param) {
-        return ResultVO.ok(promoChannelService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广渠道状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoChannel:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return ResultVO.ok(promoChannelService.statusUpdate(id, status));
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.PromoMediaAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoMediaListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoMediaListVO;
-import com.zanxiang.game.module.manage.service.IPromoMediaService;
-import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广媒体
- */
-@Api(tags = "推广媒体接口")
-@RestController
-@RequestMapping("/promo/media")
-public class PromoMediaController {
-
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @ApiOperation(value = "查询推广媒体列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoMedia:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoMediaListVO.class)})
-    public ResultVO<IPage<PromoMediaListVO>> list(@Validated @RequestBody PromoMediaListParam param) {
-        return ResultVO.ok(promoMediaService.list(param));
-    }
-
-    @ApiOperation(value = "推广媒体添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoMedia:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoMediaAddUpdateParam param) {
-        return ResultVO.ok(promoMediaService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广媒体状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoMedia:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return ResultVO.ok(promoMediaService.statusUpdate(id, status));
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.PromoSiteAddOrUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoSiteListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoSiteListVO;
-import com.zanxiang.game.module.manage.service.IPromoSiteService;
-import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广版位
- */
-@Api(tags = "推广版位接口")
-@RestController
-@RequestMapping("/promo/site")
-public class PromoSiteController {
-
-    @Autowired
-    private IPromoSiteService promoSiteService;
-
-    @ApiOperation(value = "查询推广媒体版位列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "manage:promoSite:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PromoSiteListVO.class)})
-    public ResultVO<IPage<PromoSiteListVO>> list(@Validated @RequestBody PromoSiteListParam param) {
-        return ResultVO.ok(promoSiteService.list(param));
-    }
-
-    @ApiOperation(value = "推广媒体版位添加或修改")
-    @PostMapping(value = "/add/or/update")
-    @PreAuthorize(permissionKey = "manage:promoSite:addOrUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> addOrUpdate(@Validated @RequestBody PromoSiteAddOrUpdateParam param) {
-        return ResultVO.ok(promoSiteService.addOrUpdate(param));
-    }
-
-    @ApiOperation(value = "推广媒体版位状态变更")
-    @PatchMapping(value = "/status/update")
-    @PreAuthorize(permissionKey = "manage:promoSite:statusUpdate")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
-        return ResultVO.ok(promoSiteService.statusUpdate(id, status));
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/FileTypeEnum.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/enums/FileTypeEnum.java

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/GameStatusEnum.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/enums/GameStatusEnum.java

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/GameStrategyTypeEnum.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/enums/GameStrategyTypeEnum.java

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

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/enums/VipLevelEnum.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/enums/VipLevelEnum.java

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

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameAppletConfigDTO.java

@@ -0,0 +1,61 @@
+package com.zanxiang.game.module.manage.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description : 游戏应用信息
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GameAppletConfigDTO {
+
+    /**
+     * 小游戏/公众号应用id
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用id (必填)")
+    private String appId;
+
+    /**
+     * 小游戏/公众号应用原始id
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用原始id (必填)")
+    private String ghId;
+
+    /**
+     * 小游戏/公众号应用名称
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用名称 (必填)")
+    private String appName;
+
+    /**
+     * 小游戏/公众号应用密钥
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用密钥 (必填)")
+    private String appSecret;
+
+    /**
+     * 公司主体信息
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用公司主体信息 (选填)")
+    private String company;
+
+    /**
+     * 小游戏/公众号应用登录账号
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用登录账号 (选填)")
+    private String account;
+
+    /**
+     * 小游戏/公众号应用管理员
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用管理员 (选填)")
+    private String manager;
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameAppletDTO.java

@@ -41,29 +41,14 @@ public class GameAppletDTO {
     private String appSecret;
 
     /**
-     * 米大师应用id
+     * 米大师配置
      */
-    private String miPayAppId;
+    private String miPayConfig;
 
     /**
-     * 米大师应用密钥
+     * 消息推送配置
      */
-    private String miPayAppKey;
-
-    /**
-     * 米大师应用沙箱密钥
-     */
-    private String miPayAppKeyDev;
-
-    /**
-     * 消息推送token
-     */
-    private String msgPushToken;
-
-    /**
-     * 消息推送加密密钥
-     */
-    private String msgPushAesKey;
+    private String msgConfig;
 
     /**
      * 公司主体信息

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoAccountDTO.java

@@ -1,72 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 推广账号
- */
-@Data
-public class PromoAccountDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广账号id
-     */
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    private String name;
-
-    /**
-     * 投手项目组
-     */
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    private String pitcherGroupName;
-
-    /**
-     * 投手id
-     */
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    private String pitcherName;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    private String mediaName;
-
-    /**
-     * 推广账号类型
-     */
-    private Integer accountType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoChannelDTO.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 推广渠道
- */
-@Data
-public class PromoChannelDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广账号主键id
-     */
-    private Long accountId;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    private String mediaName;
-
-    /**
-     * 服务商
-     */
-    private String provider;
-
-    /**
-     * 游戏id
-     */
-    private Long gameId;
-
-    /**
-     * 二维码
-     */
-    private String code;
-
-    /**
-     * 推广路径
-     */
-    private String path;
-
-    /**
-     * 渠道
-     */
-    private String channel;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoMediaDTO.java

@@ -1,64 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广媒体
- */
-@Data
-public class PromoMediaDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广媒体
-     */
-    private String name;
-
-    /**
-     * 推广媒体类型
-     */
-    private String types;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 公司
-     */
-    private String company;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 1:删除,0: 正常
-     */
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoSiteDTO.java

@@ -1,32 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.dto;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-24
- * @description : 推广版位位置
- */
-@Data
-public class PromoSiteDTO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 媒体版位
-     */
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    private String mediaSite;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/UserDTO.java

@@ -26,7 +26,7 @@ public class UserDTO {
     /**
      * 最新渠道id
      */
-    private Long lastAgentId;
+    private Long agentId;
 
     /**
      * 注册游戏id

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/AgentAddParam.java

@@ -3,6 +3,9 @@ package com.zanxiang.game.module.manage.pojo.params;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author : lingfeng
  * @time : 2023-06-09
@@ -15,24 +18,28 @@ public class AgentAddParam {
      * 渠道名称
      */
     @ApiModelProperty(notes = "渠道名称")
+    @NotBlank(message = "渠道名称不能为空")
     private String agentName;
 
     /**
      * 推广账号类型（1：腾讯、2：头条）
      */
     @ApiModelProperty(notes = "推广账号类型（1：腾讯、2：头条）")
+    @NotNull(message = "渠道类型不能为空")
     private Integer accountType;
 
     /**
      * 账号类型
      */
-    @ApiModelProperty(notes = "账号类型")
+    @ApiModelProperty(notes = "账号Id")
+    @NotNull(message = "账号不能为空")
     private Long accountId;
 
     /**
      * 游戏id
      */
     @ApiModelProperty(notes = "游戏id")
+    @NotNull(message = "投放游戏不能为空")
     private Long gameId;
 
     /**
@@ -46,6 +53,16 @@ public class AgentAddParam {
      */
     @ApiModelProperty(notes = "回传策略 id")
     private Long backPolicyId;
+    /**
+     * 头条回传 token
+     */
+    @ApiModelProperty(notes = "头条回传 token")
+    private String reportToken;
+    /**
+     * 头条回传 url
+     */
+    @ApiModelProperty(notes = "头条回传 url")
+    private String reportUrl;
 
     /**
      * 投放状态

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/AgentListParam.java

@@ -21,6 +21,9 @@ public class AgentListParam extends BaseListDTO<Agent> {
     @ApiModelProperty(notes = "渠道名称")
     private String agentName;
 
+    @ApiModelProperty(notes = "渠道标识")
+    private String agentKey;
+
     /**
      * 账号类型
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/CpAddUpdateParam.java

@@ -59,10 +59,4 @@ public class CpAddUpdateParam {
      */
     @ApiModelProperty(notes = "备注")
     private String remark;
-
-    /**
-     * 渠道
-     */
-    @ApiModelProperty(notes = "渠道, 暂时没有用到, 不传值")
-    private Long channel;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAddParam.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
+import com.zanxiang.game.module.manage.pojo.dto.GameAppletConfigDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -66,19 +67,30 @@ public class GameAddParam {
     /**
      * 父游戏id
      */
-    @ApiModelProperty(notes = "父游戏id")
+    @ApiModelProperty(notes = "父游戏id, 非主游戏时必填")
     private Long parentGameId;
 
     /**
-     * CP回调地址
+     * 关联H5游戏id
      */
-    @ApiModelProperty(notes = "CP回调地址")
-    private String cpPaybackUrl;
+    @ApiModelProperty(notes = "关联H5游戏id(选填)")
+    private Long h5GameId;
 
     /**
-     * 游戏地址
+     * 导量游戏id
      */
-    @ApiModelProperty(notes = "游戏地址")
-    private String gameUrl;
+    @ApiModelProperty(notes = "导量游戏id(选填)")
+    private Long guideGameId;
 
+    /**
+     * 游戏描述
+     */
+    @ApiModelProperty(notes = "游戏描述(选填)")
+    private String description;
+
+    /**
+     * 小游戏/公众号应用信息
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用信息 (微信小游戏和H5游戏必填, 其他游戏不填)")
+    private GameAppletConfigDTO gameAppletConfigDTO;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUserListParam.java

@@ -75,6 +75,12 @@ public class GameUserListParam extends BaseListDTO<GameUser> {
     @ApiModelProperty(notes = "归因投放人员")
     private String pitcherId;
 
+    /**
+     * 是否充值
+     */
+    @ApiModelProperty(notes = "是否充值, true : 是, false : 否, 全部 : null或者不传")
+    private Boolean isRecharge;
+
     /**
      * 最近充值开始时间(开始玩开始时间请使用beginDate参数)
      */
@@ -87,36 +93,6 @@ public class GameUserListParam extends BaseListDTO<GameUser> {
     @ApiModelProperty(notes = "最近充值结束时间(开始玩结束时间请使用endDate参数)")
     private LocalDate rechargeEndDate;
 
-    /**
-     * 客服id
-     */
-    @ApiModelProperty(notes = "客服id")
-    private Long customerId;
-
-    /**
-     * 归因广告id
-     */
-    @ApiModelProperty(notes = "归因广告id")
-    private String adId;
-
-    /**
-     * 是否GS
-     */
-    @ApiModelProperty(notes = "是否GS")
-    private Boolean isGs;
-
-    /**
-     * 是否充值
-     */
-    @ApiModelProperty(notes = "是否充值, true : 是, false : 否, 全部 : null或者不传")
-    private Boolean isRecharge;
-
-    /**
-     * 角色vip
-     */
-    @ApiModelProperty(notes = "角色vip, 全部 : null或者不传")
-    private Integer vipLevel;
-
     /**
      * 开始时间
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/OrderParam.java

@@ -48,9 +48,6 @@ public class OrderParam extends BaseListDTO<Order> {
     @ApiModelProperty(notes = "cpId")
     private String cpId;
 
-    @ApiModelProperty(notes = "注册游戏id")
-    private Long regGameId;
-
     @ApiModelProperty(notes = "充值游戏id")
     private String gameId;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/LogPayCpParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayCallCpLogParam.java

@@ -1,6 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -20,7 +20,7 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class LogPayCpParam extends BaseListDTO<LogPayCp> {
+public class PayCallCpLogParam extends BaseListDTO<PayCallCpLog> {
 
     /**
      * 商户订单号

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountAddUpdateParam.java

@@ -1,84 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 账号新增或者更新
- */
-@Data
-public class PromoAccountAddUpdateParam {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键, 不传是新建, 传是更新")
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    @NotNull(message = "推广媒体id不可为空")
-    private Long mediaId;
-
-    /**
-     * 推广账号类型
-     */
-    @ApiModelProperty(notes = "推广账号类型")
-    @NotNull(message = "推广账号类型不可为空")
-    private Integer accountType;
-
-    /**
-     * 推广账号id
-     */
-    @ApiModelProperty(notes = "推广账号id")
-    @NotBlank(message = "推广账号id不可为空")
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    @ApiModelProperty(notes = "推广账号名称")
-    @NotBlank(message = "推广账号名称不可为空")
-    private String name;
-
-    /**
-     * 投手项目组
-     */
-    @ApiModelProperty(notes = "投手项目组")
-    @NotBlank(message = "投手项目组不可为空")
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    @ApiModelProperty(notes = "投手项目组名称")
-    @NotBlank(message = "投手项目组名称不可为空")
-    private String pitcherGroupName;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    @NotBlank(message = "投手id不可为空")
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    @ApiModelProperty(notes = "投手名称")
-    @NotBlank(message = "投手名称不可为空")
-    private String pitcherName;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountAssignParam.java

@@ -1,65 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDate;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-22
- * @description : 账号指派
- */
-@Data
-public class PromoAccountAssignParam {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    @NotNull(message = "主键id不可为空")
-    private Long id;
-
-    /**
-     * 投手项目组
-     */
-    @ApiModelProperty(notes = "投手项目组")
-    @NotBlank(message = "投手项目组不可为空")
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    @ApiModelProperty(notes = "投手项目组名称")
-    @NotBlank(message = "投手项目组名称不可为空")
-    private String pitcherGroupName;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    @NotBlank(message = "投手id不可为空")
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    @ApiModelProperty(notes = "投手名称")
-    @NotBlank(message = "投手名称不可为空")
-    private String pitcherName;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty(notes = "开始时间")
-    @NotNull(message = "开始时间不可为空")
-    private LocalDate startTime;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountListParam.java

@@ -1,57 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号查询参数
- */
-@Data
-public class PromoAccountListParam extends BaseListDTO<PromoAccount> {
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广账号类型
-     */
-    @ApiModelProperty(notes = "推广账号类型")
-    private Integer accountType;
-
-    /**
-     * 推广账号id
-     */
-    @ApiModelProperty(notes = "推广账号id")
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    @ApiModelProperty(notes = "推广账号名称")
-    private String name;
-
-    /**
-     * 投手项目组
-     */
-    @ApiModelProperty(notes = "投手项目组")
-    private String pitcherGroupId;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    private String pitcherId;
-
-    /**
-     * 状态, 0 : 投放中, 1: 待投放
-     */
-    @ApiModelProperty(notes = "状态, 0 : 投放中, 1: 待投放")
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoChannelAddUpdateParam.java

@@ -1,55 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广渠道添加或者更新
- */
-@Data
-public class PromoChannelAddUpdateParam {
-
-    /**
-     * 账号联动选择列表主键id
-     */
-    @ApiModelProperty(notes = "账号联动选择列表主键id")
-    @NotNull(message = "账号联动选择列表主键id不可为空")
-    private Long promoAccountId;
-
-    /**
-     * 媒体版位位置联动选择列表主键id
-     */
-    @ApiModelProperty(notes = "媒体版位位置联动选择列表主键id")
-    @NotNull(message = "媒体版位位置联动选择列表主键id不可为空")
-    private Long promoSiteId;
-
-    /**
-     * 推广服务商id
-     */
-    @ApiModelProperty(notes = "推广服务商id")
-    @NotNull(message = "推广服务商id不可为空")
-    private Integer providerId;
-
-    /**
-     * 游戏id
-     */
-    @ApiModelProperty(notes = "游戏id")
-    @NotNull(message = "游戏id不可为空")
-    private Long gameId;
-
-    /**
-     * 推广渠道数量
-     */
-    @ApiModelProperty(notes = "推广渠道数量")
-    private Integer channelCount;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoChannelListParam.java

@@ -1,101 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zanxiang.game.module.mybatis.entity.PromoChannel;
-import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广列表参数
- */
-@Data
-public class PromoChannelListParam extends BaseListDTO<PromoChannel> {
-
-    /**
-     * 推广游戏id
-     */
-    @ApiModelProperty(notes = "推广游戏id")
-    private Long gameId;
-
-    /**
-     * 游戏应用类型
-     */
-    @ApiModelProperty(notes = "游戏应用类型")
-    private Long gameCategoryId;
-
-    /**
-     * 推广渠道标识
-     */
-    @ApiModelProperty(notes = "推广渠道标识")
-    private String channel;
-
-    /**
-     * 投手项目组
-     */
-    private String pitcherGroupId;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    private String pitcherId;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广版位位置id
-     */
-    @ApiModelProperty(notes = "推广版位位置id")
-    private Long promoSiteId;
-
-    /**
-     * 推广服务商id
-     */
-    @ApiModelProperty(notes = "推广版位位置id")
-    private Integer providerId;
-
-    /**
-     * 推广账号
-     */
-    @ApiModelProperty(notes = "推广账号")
-    private String account;
-
-    /**
-     * 推广账号类型
-     */
-    @ApiModelProperty(notes = "推广账号类型")
-    private Integer accountType;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    @ApiModelProperty(notes = "状态, 0 : 可用, 1: 禁用")
-    private Integer status;
-
-    /**
-     * 开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "开始时间")
-    private LocalDate beginDate;
-
-    /**
-     * 结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "结束时间")
-    private LocalDate endDate;
-
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoMediaAddUpdateParam.java

@@ -1,56 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体新增或者更新
- */
-@Data
-public class PromoMediaAddUpdateParam {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键, 不传是新建, 传是更新")
-    private Long id;
-
-    /**
-     * 推广媒体
-     */
-    @NotBlank(message = "推广媒体不可为空")
-    @ApiModelProperty(notes = "推广媒体")
-    private String name;
-
-    /**
-     * 公司
-     */
-    @ApiModelProperty(notes = "公司")
-    private String company;
-
-    /**
-     * 推广媒体类型
-     */
-    @NotEmpty(message = "推广媒体类型不可为空")
-    @ApiModelProperty(notes = "推广媒体类型, 不可为空, 至少传一个类型")
-    private List<Long> types;
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(notes = "地址")
-    private String address;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoMediaListParam.java

@@ -1,35 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import com.zanxiang.game.module.mybatis.entity.PromoMedia;
-import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体列表查询参数
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PromoMediaListParam extends BaseListDTO<PromoMedia> {
-
-    /**
-     * 推广媒体
-     */
-    @ApiModelProperty(notes = "推广媒体")
-    private String name;
-
-    /**
-     * 媒体类型
-     */
-    @ApiModelProperty(notes = "媒体类型")
-    private Long type;
-
-    /**
-     * 状态
-     */
-    @ApiModelProperty(notes = "状态")
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoSiteAddOrUpdateParam.java

@@ -1,46 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 版位更新新增参数
- */
-@Data
-public class PromoSiteAddOrUpdateParam {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键, 不传是新建, 传是更新")
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    @NotNull(message = "推广媒体id不可为空")
-    private Long mediaId;
-
-    /**
-     * 媒体版位
-     */
-    @ApiModelProperty(notes = "媒体版位")
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    @ApiModelProperty(notes = "媒体位置")
-    private String mediaSite;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoSiteListParam.java

@@ -1,41 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.params;
-
-import com.zanxiang.game.module.mybatis.entity.PromoSite;
-import com.zanxiang.module.web.pojo.BaseListDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广媒体版位列表参数
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PromoSiteListParam extends BaseListDTO<PromoSite> {
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 媒体版位
-     */
-    @ApiModelProperty(notes = "媒体版位")
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    @ApiModelProperty(notes = "媒体位置")
-    private String mediaSite;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    @ApiModelProperty(notes = "状态, 0 : 可用, 1: 禁用")
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/AgentAccountChoiceVO.java

@@ -0,0 +1,27 @@
+package com.zanxiang.game.module.manage.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description : 推广渠道
+ */
+@Data
+public class AgentAccountChoiceVO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 渠道名称
+     */
+    private String agentName;
+
+    /**
+     * 账号类型
+     */
+    private Long accountId;
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameListVO.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.vo;
 
+import com.zanxiang.game.module.manage.pojo.dto.GameAppletConfigDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -38,9 +39,9 @@ public class GameListVO {
     private String categoryName;
 
     /**
-     * CPID
+     * cp的主键id
      */
-    @ApiModelProperty(notes = "CPID")
+    @ApiModelProperty(notes = "cp的主键id")
     private Long cpId;
 
     /**
@@ -67,18 +68,6 @@ public class GameListVO {
     @ApiModelProperty(notes = "游戏分类名称列表")
     private List<String> tagNameList;
 
-    /**
-     * 游戏分类
-     */
-    @ApiModelProperty(notes = "游戏分类Id")
-    private String classify;
-
-    /**
-     * 游戏分类名称列表
-     */
-    @ApiModelProperty(notes = "游戏分类名称列表")
-    private List<String> classifyNameList;
-
     /**
      * 是否父游戏
      */
@@ -127,21 +116,15 @@ public class GameListVO {
     @ApiModelProperty(notes = "支付方式列表")
     private List<GamePayWayVO> gamePayWayList;
 
-    /**
-     * CP回调地址
-     */
-    @ApiModelProperty(notes = "CP回调地址")
-    private String cpPaybackUrl;
-
-    /**
-     * 游戏地址
-     */
-    @ApiModelProperty(notes = "游戏地址")
-    private String gameUrl;
-
     /**
      * 上线状态1 接入中， 2 可上线, 3 已下线
      */
     @ApiModelProperty(notes = "上线状态1 接入中， 2 可上线, 3 已下线")
     private Integer status;
+
+    /**
+     * 小游戏/公众号应用信息
+     */
+    @ApiModelProperty(notes = "小游戏/公众号应用信息 (微信小游戏和H5游戏才有值)")
+    private GameAppletConfigDTO gameAppletConfigDTO;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoAccountChoiceVO.java

@@ -1,22 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 渠道选择列表
- */
-@Data
-public class PromoAccountChoiceVO {
-
-    /**
-     * 推广账号id
-     */
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    private String name;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoAccountLinkageChoiceVO.java

@@ -1,79 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-22
- * @description : 推广账号联动列表
- */
-@Data
-public class PromoAccountLinkageChoiceVO {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    private Long id;
-
-    /**
-     * 推广账号id
-     */
-    @ApiModelProperty(notes = "推广账号id")
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    @ApiModelProperty(notes = "推广账号名称")
-    private String name;
-
-    /**
-     * 投手项目组
-     */
-    @ApiModelProperty(notes = "投手项目组")
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    @ApiModelProperty(notes = "投手项目组名称")
-    private String pitcherGroupName;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    @ApiModelProperty(notes = "投手名称")
-    private String pitcherName;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    @ApiModelProperty(notes = "推广媒体名称")
-    private String mediaName;
-
-    /**
-     * 推广账号类型
-     */
-    @ApiModelProperty(notes = "推广账号类型")
-    private Integer accountType;
-
-    /**
-     * 推广账号类型名称
-     */
-    @ApiModelProperty(notes = "推广账号类型名称")
-    private String accountTypeName;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoAccountListVO.java

@@ -1,99 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDate;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号列表展示
- */
-@Data
-public class PromoAccountListVO {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    private Long id;
-
-    /**
-     * 推广账号id
-     */
-    @ApiModelProperty(notes = "推广账号id")
-    private String account;
-
-    /**
-     * 推广账号名称
-     */
-    @ApiModelProperty(notes = "推广账号名称")
-    private String name;
-
-    /**
-     * 投手项目组
-     */
-    @ApiModelProperty(notes = "投手项目组")
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    @ApiModelProperty(notes = "投手项目组名称")
-    private String pitcherGroupName;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    @ApiModelProperty(notes = "投手名称")
-    private String pitcherName;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    @ApiModelProperty(notes = "推广媒体名称")
-    private String mediaName;
-
-    /**
-     * 推广账号类型
-     */
-    @ApiModelProperty(notes = "推广账号类型")
-    private Integer accountType;
-
-    /**
-     * 推广账号类型名称
-     */
-    @ApiModelProperty(notes = "推广账号类型名称")
-    private String accountTypeName;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty(notes = "开始时间")
-    private LocalDate startTime;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-
-    /**
-     * 状态, 0 : 投放中, 1: 待投放
-     */
-    @ApiModelProperty(notes = "状态, 0 : 投放中, 1: 待投放")
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoAccountTypeChoiceVO.java

@@ -1,25 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-21
- * @description : 推广账号类型
- */
-@Data
-public class PromoAccountTypeChoiceVO {
-
-    /**
-     * 账号类型
-     */
-    @ApiModelProperty(notes = "账号类型id")
-    private Integer type;
-
-    /**
-     * 账号类型名称
-     */
-    @ApiModelProperty(notes = "账号类型名称")
-    private String name;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoChannelChoiceVO.java

@@ -1,25 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : 渠道选择信息
- */
-@Data
-public class PromoChannelChoiceVO {
-
-    /**
-     * 渠道id
-     */
-    @ApiModelProperty(notes = "渠道id")
-    private Long id;
-
-    /**
-     * 渠道标识
-     */
-    @ApiModelProperty(notes = "渠道标识")
-    private String channel;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoChannelListVO.java

@@ -1,171 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广渠道
- */
-@Data
-public class PromoChannelListVO {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    private Long id;
-
-    /**
-     * 推广账号主键id
-     */
-    @ApiModelProperty(notes = "推广账号主键id")
-    private Long accountId;
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    @ApiModelProperty(notes = "投手名称")
-    private String pitcherName;
-
-    /**
-     * 投手项目组
-     */
-    @ApiModelProperty(notes = "投手项目组")
-    private String pitcherGroupId;
-
-    /**
-     * 投手项目组名称
-     */
-    @ApiModelProperty(notes = "投手项目组名称")
-    private String pitcherGroupName;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广媒体
-     */
-    @ApiModelProperty(notes = "推广媒体")
-    private String mediaName;
-
-    /**
-     * 推广版位位置id
-     */
-    @ApiModelProperty(notes = "推广版位位置id")
-    private Long promoSiteId;
-
-    /**
-     * 媒体位置
-     */
-    @ApiModelProperty(notes = "媒体位置")
-    private String mediaSite;
-
-    /**
-     * 媒体版位
-     */
-    @ApiModelProperty(notes = "媒体版位")
-    private String plateSite;
-
-    /**
-     * 推广服务商id
-     */
-    @ApiModelProperty(notes = "推广服务商id")
-    private Integer providerId;
-
-    /**
-     * 推广服务商
-     */
-    @ApiModelProperty(notes = "推广服务商")
-    private String providerName;
-
-    /**
-     * 推广账号
-     */
-    @ApiModelProperty(notes = "推广账号")
-    private String accountName;
-
-    /**
-     * 推广账号类型
-     */
-    @ApiModelProperty(notes = "推广账号类型")
-    private Integer accountType;
-
-    /**
-     * 推广账号类型名称
-     */
-    @ApiModelProperty(notes = "推广账号类型名称")
-    private String accountTypeName;
-
-    /**
-     * 推广游戏id
-     */
-    @ApiModelProperty(notes = "推广游戏id")
-    private Long gameId;
-
-    /**
-     * 推广游戏名称
-     */
-    @ApiModelProperty(notes = "推广游戏名称")
-    private String gameName;
-
-    /**
-     * 游戏应用类型
-     */
-    @ApiModelProperty(notes = "游戏应用类型")
-    private Long gameCategory;
-
-    /**
-     * 游戏应用类型名称
-     */
-    @ApiModelProperty(notes = "游戏应用类型名称")
-    private String gameCategoryName;
-
-    /**
-     * 推广码
-     */
-    @ApiModelProperty(notes = "推广码")
-    private String code;
-
-    /**
-     * 推广路径
-     */
-    @ApiModelProperty(notes = "推广路径")
-    private String path;
-
-    /**
-     * 推广渠道标识
-     */
-    @ApiModelProperty(notes = "推广渠道标识")
-    private String channel;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    @ApiModelProperty(notes = "状态, 0 : 可用, 1: 禁用")
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(notes = "创建时间")
-    private LocalDateTime createTime;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoMediaChoiceVO.java

@@ -1,22 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广媒体选择列表
- */
-@Data
-public class PromoMediaChoiceVO {
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 推广媒体
-     */
-    private String name;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoMediaListVO.java

@@ -1,63 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体展示
- */
-@Data
-public class PromoMediaListVO {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    private Long id;
-
-    /**
-     * 推广媒体
-     */
-    @ApiModelProperty(notes = "推广媒体")
-    private String name;
-
-    /**
-     * 推广媒体类型, 多个则逗号分割
-     */
-    @ApiModelProperty(notes = "推广媒体类型, 多个则逗号分割")
-    private String types;
-
-    /**
-     * 推广媒体类型名称列表
-     */
-    @ApiModelProperty(notes = "推广媒体类型名称列表")
-    private List<String> typeNameList;
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(notes = "地址")
-    private String address;
-
-    /**
-     * 公司
-     */
-    @ApiModelProperty(notes = "公司")
-    private String company;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    @ApiModelProperty(notes = "状态, 0 : 可用, 1: 禁用")
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoMediaTypeChoiceVO.java

@@ -1,28 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广媒体类型选择
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class PromoMediaTypeChoiceVO {
-
-    /**
-     * 媒体类型
-     */
-    private Integer type;
-
-    /**
-     * 媒体名称
-     */
-    private String name;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoPitcherChoiceVO.java

@@ -1,25 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 投手
- */
-@Data
-public class PromoPitcherChoiceVO {
-
-    /**
-     * 投手id
-     */
-    @ApiModelProperty(notes = "投手id")
-    private String pitcherId;
-
-    /**
-     * 投手名称
-     */
-    @ApiModelProperty(notes = "投手名称")
-    private String pitcherName;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoProviderChoiceVO.java

@@ -1,25 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广服务商选择
- */
-@Data
-public class PromoProviderChoiceVO {
-
-    /**
-     * 推广服务商id
-     */
-    @ApiModelProperty(notes = "推广服务商id")
-    private Integer providerId;
-
-    /**
-     * 推广服务商名称
-     */
-    @ApiModelProperty(notes = "推广服务商名称")
-    private String providerName;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoSiteLinkageChoiceVO.java

@@ -1,43 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-23
- * @description : 推广媒体版位位置
- */
-@Data
-public class PromoSiteLinkageChoiceVO {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    @ApiModelProperty(notes = "推广媒体名称")
-    private String mediaName;
-
-    /**
-     * 媒体版位
-     */
-    @ApiModelProperty(notes = "媒体版位")
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    @ApiModelProperty(notes = "媒体位置")
-    private String mediaSite;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/PromoSiteListVO.java

@@ -1,55 +0,0 @@
-package com.zanxiang.game.module.manage.pojo.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广媒体版位列表
- */
-@Data
-public class PromoSiteListVO {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(notes = "主键")
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    @ApiModelProperty(notes = "推广媒体id")
-    private Long mediaId;
-
-    /**
-     * 推广媒体名称
-     */
-    @ApiModelProperty(notes = "推广媒体名称")
-    private String mediaName;
-
-    /**
-     * 媒体版位
-     */
-    @ApiModelProperty(notes = "媒体版位")
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    @ApiModelProperty(notes = "媒体位置")
-    private String mediaSite;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    @ApiModelProperty(notes = "状态, 0 : 可用, 1: 禁用")
-    private Integer status;
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/UserListVO.java

@@ -50,18 +50,6 @@ public class UserListVO {
     @ApiModelProperty(notes = "注册时间")
     private LocalDateTime createTime;
 
-    /**
-     * 注册渠道id
-     */
-    @ApiModelProperty(notes = "注册渠道id")
-    private Long regAgentId;
-
-    /**
-     * 注册渠道名称
-     */
-    @ApiModelProperty(notes = "注册渠道名称")
-    private String regAgentName;
-
     /**
      * 渠道id
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/UserVO.java

@@ -33,12 +33,6 @@ public class UserVO {
     @ApiModelProperty(notes = "密码")
     private String password;
 
-    /**
-     * 最高vip
-     */
-    @ApiModelProperty(notes = "最高vip")
-    private Integer vipMax;
-
     /**
      * 昵称
      */

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
+import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;
 import com.zanxiang.game.module.manage.pojo.vo.AgentVO;
 import com.zanxiang.game.module.mybatis.entity.Agent;
 
@@ -58,4 +59,11 @@ public interface IAgentService extends IService<Agent> {
      * @return boolean
      */
     boolean configBackPolicy(List<Long> agentIdList, Long backPolicyId);
+
+    /**
+     * 渠道账号选择接口
+     *
+     * @return {@link List}<{@link AgentAccountChoiceVO}>
+     */
+    List<AgentAccountChoiceVO> agentAccountChoiceList();
 }

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

@@ -3,8 +3,11 @@ package com.zanxiang.game.module.manage.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
-import com.zanxiang.game.module.manage.pojo.params.*;
-import com.zanxiang.game.module.manage.pojo.vo.*;
+import com.zanxiang.game.module.manage.pojo.params.GameAddParam;
+import com.zanxiang.game.module.manage.pojo.params.GameListParam;
+import com.zanxiang.game.module.manage.pojo.vo.GameChoiceVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameListVO;
 import com.zanxiang.game.module.mybatis.entity.Game;
 
 import java.util.Collection;
@@ -18,62 +21,6 @@ import java.util.Map;
  */
 public interface IGameService extends IService<Game> {
 
-    /**
-     * 获取游戏对接参数
-     *
-     * @param id : 游戏id
-     * @return {@link GameDockVO}
-     */
-    GameDockVO getGameDock(Long id);
-
-    /**
-     * 参数对接更新
-     *
-     * @param param : 对接参数
-     * @return {@link Boolean}
-     */
-    Boolean gameDockUpdate(GameDockParam param);
-
-    /**
-     * 获取游戏关联信息
-     *
-     * @param id : 游戏id
-     * @return {@link GameRelationVO}
-     */
-    GameRelationVO getGameRelation(Long id);
-
-    /**
-     * 导量游戏更新
-     *
-     * @param param : 关联游戏更新参数
-     * @return {@link Boolean}
-     */
-    Boolean guideGameUpdateUpdate(GuideGameUpdateParam param);
-
-    /**
-     * 关联游戏更新
-     *
-     * @param param : 关联游戏更新参数
-     * @return {@link Boolean}
-     */
-    Boolean relationGameUpdate(RelationGameUpdateParam param);
-
-    /**
-     * 获取游戏基本信息
-     *
-     * @param gameId : 游戏id
-     * @return {@link GameInfoVO}
-     */
-    GameInfoVO getGameInfo(Long gameId);
-
-    /**
-     * 游戏基本信息更新
-     *
-     * @param param : 游戏更新参数
-     * @return {@link Boolean}
-     */
-    Boolean updateGameInfo(GameUpdateParam param);
-
     /**
      * 游戏添加或更新
      *
@@ -97,6 +44,12 @@ public interface IGameService extends IService<Game> {
      */
     List<GameChoiceVO> choiceList();
 
+    /**
+     * 信息由ids
+     *
+     * @param gameIds 游戏id
+     * @return {@link List}<{@link GameInfoVO}>
+     */
     List<GameInfoVO> infoByIds(Collection<Long>  gameIds);
 
     /**

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

@@ -19,14 +19,6 @@ import java.util.Map;
  */
 public interface IGameTagService extends IService<GameTag> {
 
-    /**
-     * 根据主键id查询分类以及子分类
-     *
-     * @param ids : 主键id列表
-     * @return {@link List}<{@link GameTagVO}>
-     */
-    List<GameTagVO> listByIds(List<Long> ids);
-
     /**
      * 游戏标签选择列表
      *

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

@@ -20,14 +20,6 @@ public interface IGameUserService {
      */
     IPage<GameUserListVO> gameUserList(GameUserListParam param);
 
-    /**
-     * 获取指定用户对应vip等级最高的用户信息
-     *
-     * @param userId : 用户信息
-     * @return {@link GameUserVO}
-     */
-    GameUserVO getMaxVipGameUser(Long userId);
-
     /**
      * 获取指定用户对应vip等级最高的用户信息
      *

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

@@ -2,16 +2,16 @@ package com.zanxiang.game.module.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
+import com.zanxiang.game.module.manage.pojo.params.PayCallCpLogParam;
 import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
-import com.zanxiang.game.module.mybatis.entity.LogPayCp;
+import com.zanxiang.game.module.mybatis.entity.PayCallCpLog;
 
 /**
  * @author : lingfeng
  * @time : 2022-06-23
  * @description : 通知CP记录表
  */
-public interface ILogPayCpService extends IService<LogPayCp> {
+public interface ILogPayCpService extends IService<PayCallCpLog> {
 
     /**
      * 回调cp列表
@@ -19,5 +19,5 @@ public interface ILogPayCpService extends IService<LogPayCp> {
      * @param param 参数
      * @return {@link IPage}<{@link LogPayCpVO}>
      */
-    IPage<LogPayCpVO> callCpList(LogPayCpParam param);
+    IPage<LogPayCpVO> callCpList(PayCallCpLogParam param);
 }

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

@@ -0,0 +1,21 @@
+package com.zanxiang.game.module.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.game.module.mybatis.entity.MiPaySum;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-06-21
+ * @description :
+ */
+public interface IMiPaySumService extends IService<MiPaySum> {
+
+    /**
+     * 添加
+     *
+     * @param gameId     游戏id
+     * @param appId      应用程序id
+     * @param miPayAppId mi支付应用程序id
+     */
+    void add(Long gameId, String appId, String miPayAppId);
+}

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

@@ -1,30 +0,0 @@
-package com.zanxiang.game.module.manage.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAssignParam;
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-import com.zanxiang.game.module.mybatis.entity.PromoAccountLog;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-22
- * @description : 推广账号指派日志
- */
-public interface IPromoAccountLogService extends IService<PromoAccountLog> {
-
-    /**
-     * 创建推广账号日志
-     *
-     * @param promoAccount : 推广账号
-     * @return {@link Boolean}
-     */
-    Boolean create(PromoAccount promoAccount);
-
-    /**
-     * 账号指派更新
-     *
-     * @param param : 推广账号指派参数
-     * @return {@link Boolean}
-     */
-    Boolean assignUpdate(PromoAccountAssignParam param);
-}

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

@@ -1,106 +0,0 @@
-package com.zanxiang.game.module.manage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.manage.pojo.dto.PromoAccountDTO;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAssignParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoAccountChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoAccountLinkageChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoAccountListVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoPitcherChoiceVO;
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-04
- * @description : 推广账号
- */
-public interface IPromoAccountService extends IService<PromoAccount> {
-
-    /**
-     * 获取账号联动选择列表
-     *
-     * @return {@link List}<{@link PromoAccountLinkageChoiceVO}>
-     */
-    List<PromoAccountLinkageChoiceVO> promoAccountLinkageChoiceList();
-
-    /**
-     * 查询推广媒体列表
-     *
-     * @param param : 推广媒体列表查询参数
-     * @return {@link IPage}<{@link PromoAccountListVO}>
-     */
-    IPage<PromoAccountListVO> list(PromoAccountListParam param);
-
-    /**
-     * 推广账号新增或者更新
-     *
-     * @param param : 更新参数
-     * @return {@link Boolean}
-     */
-    Boolean addOrUpdate(PromoAccountAddUpdateParam param);
-
-    /**
-     * 帐户分配
-     *
-     * @param param 参数
-     * @return {@link Boolean}
-     */
-    Boolean accountAssign(PromoAccountAssignParam param);
-
-    /**
-     * 根据主键更新状态
-     *
-     * @param id     : 主键id
-     * @param status : 状态
-     * @return {@link Boolean}
-     */
-    Boolean statusUpdate(Long id, Integer status);
-
-    /**
-     * 推广账号选择列表查询
-     *
-     * @return {@link List}<{@link PromoAccountChoiceVO}>
-     */
-    List<PromoAccountChoiceVO> promoAccountChoiceList();
-
-    /**
-     * 投手选择列表查询
-     *
-     * @return {@link List}<{@link PromoPitcherChoiceVO}>
-     */
-    List<PromoPitcherChoiceVO> promoPitcherChoiceList();
-
-    /**
-     * 通过帐户或投手id列表
-     *
-     * @param account   账户
-     * @param pitcherId 投手id
-     * @return {@link List}<{@link Long}>
-     */
-    List<Long> listByAccountOrPitcherId(String account, String pitcherId);
-
-    /**
-     * 注册渠道信息
-     *
-     * @return {@link Map}<{@link Long}, {@link PromoAccountDTO}>
-     */
-    Map<Long, PromoAccountDTO> promoAccountMap();
-
-    /**
-     * 推广账号条件
-     *
-     * @param pitcherGroupId 投手组id
-     * @param pitcherId      投手id
-     * @param mediaId        媒体id
-     * @param accountType    帐户类型
-     * @param account        账户
-     * @return {@link Map}<{@link Long}, {@link PromoAccountDTO}>
-     */
-    Map<Long, PromoAccountDTO> promoAccountCondition(String pitcherGroupId, String pitcherId, Long mediaId, String account, Integer accountType);
-}

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

@@ -1,77 +0,0 @@
-package com.zanxiang.game.module.manage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.manage.pojo.dto.PromoChannelDTO;
-import com.zanxiang.game.module.manage.pojo.params.PromoChannelAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoChannelListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoChannelChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoChannelListVO;
-import com.zanxiang.game.module.mybatis.entity.PromoChannel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-31
- * @description : 推广渠道
- */
-public interface IPromoChannelService extends IService<PromoChannel> {
-
-    /**
-     * 查询推广媒体列表
-     *
-     * @param param : 推广媒体列表查询参数
-     * @return {@link IPage}<{@link PromoChannelListVO}>
-     */
-    IPage<PromoChannelListVO> list(PromoChannelListParam param);
-
-    /**
-     * 推广账号新增或者更新
-     *
-     * @param param : 更新参数
-     * @return {@link Boolean}
-     */
-    Boolean addOrUpdate(PromoChannelAddUpdateParam param);
-
-    /**
-     * 根据主键更新状态
-     *
-     * @param id     : 主键id
-     * @param status : 状态
-     * @return {@link Boolean}
-     */
-    Boolean statusUpdate(Long id, Integer status);
-
-    /**
-     * 注册渠道选择列表查询
-     *
-     * @return {@link List}<{@link PromoChannelChoiceVO}>
-     */
-    List<PromoChannelChoiceVO> promoChannelChoiceList();
-
-    /**
-     * 注册渠道信息
-     *
-     * @return {@link Map}<{@link Long}, {@link PromoChannelDTO}>
-     */
-    Map<Long, PromoChannelDTO> promoChannelMap();
-
-    /**
-     * 注册渠道信息
-     *
-     * @param agentIdList 代理id列表
-     * @return {@link Map}<{@link Long}, {@link PromoChannelDTO}>
-     */
-    Map<Long, PromoChannelDTO> promoChannelMap(List<Long> agentIdList);
-
-    /**
-     * 通过帐户或投手id列表
-     *
-     * @param account   账户
-     * @param pitcherId 投手id
-     * @return {@link List}<{@link Long}>
-     */
-    List<Long> listByAccountOrPitcherId(String account, String pitcherId);
-}

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

@@ -1,60 +0,0 @@
-package com.zanxiang.game.module.manage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-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;
-import com.zanxiang.game.module.manage.pojo.vo.PromoMediaChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoMediaListVO;
-import com.zanxiang.game.module.mybatis.entity.PromoMedia;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体
- */
-public interface IPromoMediaService extends IService<PromoMedia> {
-
-    /**
-     * 推广媒体信息
-     *
-     * @return {@link Map}<{@link Long}, {@link PromoMediaDTO}>
-     */
-    Map<Long, PromoMediaDTO> promoMediaMap();
-
-    /**
-     * 推广媒体选择列表
-     *
-     * @return {@link List}<{@link PromoMediaChoiceVO}>
-     */
-    List<PromoMediaChoiceVO> promoMediaChoiceList();
-
-    /**
-     * 查询游戏标签列表
-     *
-     * @param param : 游戏标签列表查询呢参数
-     * @return {@link IPage}<{@link PromoMediaListVO}>
-     */
-    IPage<PromoMediaListVO> list(PromoMediaListParam param);
-
-    /**
-     * 推广媒体新增或者更新
-     *
-     * @param param : 更新参数
-     * @return {@link Boolean}
-     */
-    Boolean addOrUpdate(PromoMediaAddUpdateParam param);
-
-    /**
-     * 根据主键更新状态
-     *
-     * @param id     : 主键id
-     * @param status : 状态
-     * @return {@link Boolean}
-     */
-    Boolean statusUpdate(Long id, Integer status);
-}

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

@@ -1,60 +0,0 @@
-package com.zanxiang.game.module.manage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.game.module.manage.pojo.dto.PromoSiteDTO;
-import com.zanxiang.game.module.manage.pojo.params.PromoSiteAddOrUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoSiteListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoSiteLinkageChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoSiteListVO;
-import com.zanxiang.game.module.mybatis.entity.PromoSite;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广版位
- */
-public interface IPromoSiteService extends IService<PromoSite> {
-
-    /**
-     * 推广媒体位置版位信息
-     *
-     * @return {@link Map}<{@link Long}, {@link PromoSiteDTO}>
-     */
-    Map<Long, PromoSiteDTO> promoSiteMap();
-
-    /**
-     * 媒体版位位置联动选择列表
-     *
-     * @return {@link List}<{@link PromoSiteLinkageChoiceVO}>
-     */
-    List<PromoSiteLinkageChoiceVO> promoSiteLinkageChoiceList();
-
-    /**
-     * 查询游戏标签列表
-     *
-     * @param param : 游戏标签列表查询呢参数
-     * @return {@link IPage}<{@link PromoSiteListVO}>
-     */
-    IPage<PromoSiteListVO> list(PromoSiteListParam param);
-
-    /**
-     * 根据主键更新状态
-     *
-     * @param id     : 主键id
-     * @param status : 状态
-     * @return {@link Boolean}
-     */
-    Boolean statusUpdate(Long id, Integer status);
-
-    /**
-     * 推广媒体新增或者更新
-     *
-     * @param param : 更新参数
-     * @return {@link Boolean}
-     */
-    Boolean addOrUpdate(PromoSiteAddOrUpdateParam param);
-}

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

@@ -16,6 +16,7 @@ import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
 import com.zanxiang.game.module.manage.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
+import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;
 import com.zanxiang.game.module.manage.pojo.vo.AgentVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
 import com.zanxiang.game.module.manage.service.IAgentService;
@@ -62,6 +63,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
     public IPage<AgentVO> listOfPage(AgentListParam param) {
         IPage<Agent> agentIPage = page(param.toPage(), new LambdaQueryWrapper<Agent>()
                 .like(StringUtils.isNotEmpty(param.getAgentName()), Agent::getAgentName, param.getAgentName())
+                .eq(StringUtils.isNoneBlank(param.getAgentKey()), Agent::getAgentKey, param.getAgentKey())
                 .eq(param.getAccountType() != null, Agent::getAccountType, param.getAccountType())
                 .eq(param.getAccountId() != null, Agent::getAccountId, param.getAccountId())
                 .eq(param.getGameId() != null, Agent::getGameId, param.getGameId())
@@ -188,4 +190,11 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
             return agentDTO;
         }).collect(Collectors.toList());
     }
+
+    @Override
+    public List<AgentAccountChoiceVO> agentAccountChoiceList() {
+        return super.list(new LambdaQueryWrapper<Agent>()
+                .eq(!SecurityUtil.isAdmin(), Agent::getCreateBy, SecurityUtil.getUserId())
+        ).stream().map(agent -> BeanUtil.copy(agent, AgentAccountChoiceVO.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
@@ -83,7 +82,6 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
         gameApplet.setGhId(param.getGhId());
         gameApplet.setAccount(param.getAccount());
         gameApplet.setPassword(param.getPassword());
-        gameApplet.setManagerVx(param.getAdminVx());
         gameApplet.setCompany(param.getCompany());
         gameApplet.setAppSecret(param.getAppSecret());
         gameApplet.setUpdateTime(LocalDateTime.now());