fix : 整理删除老的推广渠道相关代码

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

@@ -1,57 +0,0 @@
-package com.zanxiang.game.module.base.pojo.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/pojo/enums/PromoMediaTypeEnum.java

@@ -1,62 +0,0 @@
-package com.zanxiang.game.module.base.pojo.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/pojo/enums/PromoProviderEnum.java

@@ -1,57 +0,0 @@
-package com.zanxiang.game.module.base.pojo.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-manage/src/main/java/com/zanxiang/game/module/manage/controller/ChoiceController.java

@@ -1,7 +1,8 @@
 package com.zanxiang.game.module.manage.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.base.pojo.enums.*;
+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.*;
@@ -42,12 +43,6 @@ public class ChoiceController {
     @Autowired
     private IGameCategoryService gameCategoryService;
 
-    @Autowired
-    private IPromoChannelService promoChannelService;
-
-    @Autowired
-    private IPromoAccountService promoAccountService;
-
     @Autowired
     private IPayWayService payWayService;
 
@@ -57,12 +52,6 @@ public class ChoiceController {
     @Autowired
     private IGameTagService gameTagService;
 
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @Autowired
-    private IPromoSiteService promoSiteService;
-
     @Autowired
     private IPayApplicationService payApplicationService;
 
@@ -72,6 +61,9 @@ public class ChoiceController {
     @Autowired
     private IPayBoxService payBoxService;
 
+    @Autowired
+    private IAgentService agentService;
+
     @ApiOperation(value = "vip等级选择列表")
     @GetMapping(value = "/vip/level/list")
     @PreAuthorize(permissionKey = "sdk:choiceVipLevel:list")
@@ -124,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 = "支付方式选择列表")
@@ -172,60 +148,6 @@ 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(Arrays.stream(PromoMediaTypeEnum.values())
-                .map(promoMediaTypeEnum -> BeanUtil.copy(promoMediaTypeEnum, PromoMediaTypeChoiceVO.class))
-                .collect(Collectors.toList()));
-    }
-
-    @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(Arrays.stream(PromoAccountTypeEnum.values())
-                .map(promoAccountTypeEnum -> BeanUtil.copy(promoAccountTypeEnum, PromoAccountTypeChoiceVO.class))
-                .collect(Collectors.toList()));
-    }
-
-    @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(Arrays.stream(PromoProviderEnum.values())
-                .map(promoProviderEnum -> BeanUtil.copy(promoProviderEnum, PromoProviderChoiceVO.class))
-                .collect(Collectors.toList()));
-    }
-
     @ApiOperation(value = "支付应用类型选择列表")
     @GetMapping(value = "/application/type/list")
     @PreAuthorize(permissionKey = "sdk:payApplicationTypeChoice:list")

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

@@ -1,63 +1,63 @@
-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));
-    }
-}
+//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 +1,54 @@
-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));
-    }
-}
+//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 +1,54 @@
-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));
-    }
-}
+//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 +1,54 @@
-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));
-    }
-}
+//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-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/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/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/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/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;
@@ -189,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/PromoAccountLogServiceImpl.java

@@ -1,55 +0,0 @@
-package com.zanxiang.game.module.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAssignParam;
-import com.zanxiang.game.module.manage.service.IPromoAccountLogService;
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-import com.zanxiang.game.module.mybatis.entity.PromoAccountLog;
-import com.zanxiang.game.module.mybatis.mapper.PromoAccountLogMapper;
-import com.zanxiang.module.util.DateUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-22
- * @description : 推广账号指派日志
- */
-@Slf4j
-@Service
-public class PromoAccountLogServiceImpl extends ServiceImpl<PromoAccountLogMapper, PromoAccountLog> implements IPromoAccountLogService {
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean create(PromoAccount promoAccount) {
-        LocalDateTime dateTime = LocalDateTime.now();
-        return super.save(PromoAccountLog.builder()
-                .accountId(promoAccount.getId())
-                .pitcherId(promoAccount.getPitcherId())
-                .pitcherGroupId(promoAccount.getPitcherGroupId())
-                .startTime(dateTime)
-                .createTime(dateTime)
-                .updateTime(dateTime)
-                .build());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean assignUpdate(PromoAccountAssignParam param) {
-        super.update(new LambdaUpdateWrapper<PromoAccountLog>()
-                .set(PromoAccountLog::getEndTime, LocalDateTime.now())
-                .eq(PromoAccountLog::getAccountId, param.getId()));
-        return super.save(PromoAccountLog.builder()
-                .accountId(param.getId())
-                .pitcherId(param.getPitcherId())
-                .pitcherGroupId(param.getPitcherGroupId())
-                .startTime(DateUtil.localDateToLocalDateTime(param.getStartTime()))
-                .createTime(LocalDateTime.now())
-                .updateTime(LocalDateTime.now())
-                .build());
-    }
-}

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

@@ -1,271 +0,0 @@
-package com.zanxiang.game.module.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
-import com.zanxiang.game.module.base.pojo.enums.PromoAccountTypeEnum;
-import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
-import com.zanxiang.game.module.manage.pojo.dto.PromoAccountDTO;
-import com.zanxiang.game.module.manage.pojo.dto.PromoMediaDTO;
-import com.zanxiang.game.module.manage.pojo.params.PromoAccountAddUpdateParam;
-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.manage.service.IPromoAccountLogService;
-import com.zanxiang.game.module.manage.service.IPromoAccountService;
-import com.zanxiang.game.module.manage.service.IPromoMediaService;
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-import com.zanxiang.game.module.mybatis.entity.PromoAccountLog;
-import com.zanxiang.game.module.mybatis.mapper.PromoAccountMapper;
-import com.zanxiang.module.util.bean.BeanUtil;
-import com.zanxiang.module.util.exception.BaseException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-03
- * @description : 推广账号
- */
-@Slf4j
-@Service
-public class PromoAccountServiceImpl extends ServiceImpl<PromoAccountMapper, PromoAccount> implements IPromoAccountService {
-
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @Autowired
-    private IPromoAccountLogService promoAccountLogService;
-
-    @Override
-    public List<PromoAccountLinkageChoiceVO> promoAccountLinkageChoiceList() {
-        List<PromoAccountLinkageChoiceVO> choiceVOList = super.list().stream()
-                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountLinkageChoiceVO.class))
-                .collect(Collectors.toList());
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        choiceVOList.forEach(promoAccountDTO -> {
-            Long mediaId = promoAccountDTO.getMediaId();
-            if (promoMediaMap.get(mediaId) != null) {
-                promoAccountDTO.setMediaName(promoMediaMap.get(mediaId).getName());
-            }
-            promoAccountDTO.setAccountTypeName(PromoAccountTypeEnum.getNameByType(promoAccountDTO.getAccountType()));
-        });
-        return choiceVOList;
-    }
-
-    @Override
-    public IPage<PromoAccountListVO> list(PromoAccountListParam param) {
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        return page(param.toPage(), new QueryWrapper<PromoAccount>().lambda()
-                .eq(param.getMediaId() != null, PromoAccount::getMediaId, param.getMediaId())
-                .eq(param.getAccountType() != null, PromoAccount::getAccountType, param.getAccountType())
-                .like(Strings.isNotBlank(param.getName()), PromoAccount::getName, param.getName())
-                .like(Strings.isNotBlank(param.getAccount()), PromoAccount::getAccount, param.getAccount())
-                .eq(param.getPitcherGroupId() != null, PromoAccount::getPitcherGroupId, param.getPitcherGroupId())
-                .eq(param.getPitcherId() != null, PromoAccount::getPitcherId, param.getPitcherId())
-                .eq(param.getStatus() != null, PromoAccount::getStatus, param.getStatus())
-                .orderByDesc(PromoAccount::getCreateTime))
-                .convert(promoAccount -> this.toVo(promoMediaMap, promoAccount));
-    }
-
-    private PromoAccountListVO toVo(Map<Long, PromoMediaDTO> promoMediaMap, PromoAccount promoAccount) {
-        PromoAccountListVO promoAccountListVO = BeanUtil.copy(promoAccount, PromoAccountListVO.class);
-        if (Objects.isNull(promoAccountListVO)) {
-            return null;
-        }
-        PromoMediaDTO promoMediaDTO = promoMediaMap.get(promoAccount.getMediaId());
-        if (promoMediaDTO != null) {
-            promoAccountListVO.setMediaName(promoMediaDTO.getName());
-        }
-        PromoAccountLog promoAccountLog = promoAccountLogService.getOne(new LambdaQueryWrapper<PromoAccountLog>()
-                .eq(PromoAccountLog::getAccountId, promoAccountListVO.getId())
-                .isNull(PromoAccountLog::getEndTime));
-        if (promoAccountLog != null) {
-            promoAccountListVO.setStartTime(promoAccountLog.getStartTime() == null ? null : promoAccountLog.getStartTime().toLocalDate());
-        }
-        promoAccountListVO.setAccountTypeName(PromoAccountTypeEnum.getNameByType(promoAccountListVO.getAccountType()));
-        return promoAccountListVO;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean addOrUpdate(PromoAccountAddUpdateParam param) {
-        Long id = param.getId();
-        //更新
-        if (id != null) {
-            PromoAccount promoAccount = super.getById(id);
-            if (promoAccount == null) {
-                throw new BaseException("参数错误, 推广账号信息不存在");
-            }
-            //更新标签名字, 不可重复
-            if (!Objects.equals(promoAccount.getAccount(), param.getAccount())) {
-                //判断名称是否已经存在
-                int count = super.count(new LambdaQueryWrapper<PromoAccount>()
-                        .eq(PromoAccount::getAccount, param.getAccount()));
-                if (count > 0) {
-                    throw new BaseException("推广账号id已经存在");
-                }
-            }
-            promoAccount.setAccount(param.getAccount());
-            promoAccount.setName(param.getName());
-            promoAccount.setPitcherGroupId(param.getPitcherGroupId());
-            promoAccount.setPitcherGroupName(param.getPitcherGroupName());
-            promoAccount.setPitcherId(param.getPitcherId());
-            promoAccount.setPitcherName(param.getPitcherName());
-            promoAccount.setMediaId(param.getMediaId());
-            promoAccount.setAccountType(param.getAccountType());
-            promoAccount.setRemark(param.getRemark());
-            promoAccount.setUpdateTime(LocalDateTime.now());
-            return super.updateById(promoAccount);
-        }
-        //判断名称是否已经存在
-        int count = super.count(new LambdaQueryWrapper<PromoAccount>()
-                .eq(PromoAccount::getAccount, param.getAccount()));
-        if (count > 0) {
-            throw new BaseException("推广账号id已经存在");
-        }
-        //创建
-        PromoAccount promoAccount = PromoAccount.builder()
-                .account(param.getAccount())
-                .name(param.getName())
-                .pitcherGroupId(param.getPitcherGroupId())
-                .pitcherGroupName(param.getPitcherGroupName())
-                .pitcherId(param.getPitcherId())
-                .pitcherName(param.getPitcherName())
-                .mediaId(param.getMediaId())
-                .accountType(param.getAccountType())
-                .status(StatusEnum.YES.getCode())
-                .remark(param.getRemark())
-                .isDelete(DeleteEnum.NO.getCode())
-                .createTime(LocalDateTime.now())
-                .updateTime(LocalDateTime.now())
-                .build();
-        super.save(promoAccount);
-        return promoAccountLogService.create(promoAccount);
-    }
-
-    @Override
-    public Boolean accountAssign(PromoAccountAssignParam param) {
-        PromoAccount promoAccount = super.getById(param.getId());
-        if (promoAccount == null) {
-            throw new BaseException("参数错误, 推广账号信息不存在");
-        }
-        //生成指派记录
-        if (!Objects.equals(promoAccount.getPitcherId(), param.getPitcherId())) {
-            promoAccountLogService.assignUpdate(param);
-        } else {
-            //投手没变, 开始时间更新
-            promoAccountLogService.update(new LambdaUpdateWrapper<PromoAccountLog>()
-                    .set(PromoAccountLog::getStartTime, param.getStartTime())
-                    .set(PromoAccountLog::getPitcherGroupId, param.getPitcherGroupId())
-                    .set(PromoAccountLog::getUpdateTime, LocalDateTime.now())
-                    .eq(PromoAccountLog::getAccountId, param.getId())
-                    .isNull(PromoAccountLog::getEndTime));
-        }
-        //账号更新
-        promoAccount.setPitcherId(param.getPitcherId());
-        promoAccount.setPitcherName(param.getPitcherName());
-        promoAccount.setPitcherGroupId(param.getPitcherGroupId());
-        promoAccount.setPitcherGroupName(param.getPitcherGroupName());
-        promoAccount.setRemark(param.getRemark());
-        promoAccount.setUpdateTime(LocalDateTime.now());
-        return super.updateById(promoAccount);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean statusUpdate(Long id, Integer status) {
-        return super.update(new LambdaUpdateWrapper<PromoAccount>()
-                .set(PromoAccount::getStatus, status)
-                .set(PromoAccount::getUpdateTime, LocalDateTime.now())
-                .eq(PromoAccount::getId, id));
-    }
-
-
-    @Override
-    public List<PromoAccountChoiceVO> promoAccountChoiceList() {
-        List<PromoAccount> promoAccountList = super.list(new LambdaQueryWrapper<PromoAccount>().
-                select(PromoAccount::getAccount, PromoAccount::getName));
-        return promoAccountList.stream()
-                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountChoiceVO.class))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<PromoPitcherChoiceVO> promoPitcherChoiceList() {
-        List<PromoAccount> promoAccountList = super.list(new LambdaQueryWrapper<PromoAccount>().
-                select(PromoAccount::getPitcherId, PromoAccount::getPitcherName));
-        return promoAccountList.stream()
-                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoPitcherChoiceVO.class))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public Map<Long, PromoAccountDTO> promoAccountMap() {
-        List<PromoAccount> promoChannelList = super.list();
-        if (CollectionUtils.isEmpty(promoChannelList)) {
-            return Collections.emptyMap();
-        }
-        List<PromoAccountDTO> promoAccountDTOList = promoChannelList.stream()
-                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountDTO.class))
-                .collect(Collectors.toList());
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        promoAccountDTOList.forEach(promoAccountDTO -> {
-            Long mediaId = promoAccountDTO.getMediaId();
-            if (promoMediaMap.get(mediaId) != null) {
-                promoAccountDTO.setMediaName(promoMediaMap.get(mediaId).getName());
-            }
-        });
-        return promoAccountDTOList.stream().collect(Collectors.toMap(PromoAccountDTO::getId, Function.identity()));
-    }
-
-    @Override
-    public List<Long> listByAccountOrPitcherId(String account, String pitcherId) {
-        List<PromoAccount> promoAccountList = super.list(new LambdaQueryWrapper<PromoAccount>()
-                .eq(Strings.isNotBlank(account), PromoAccount::getAccount, account)
-                .eq(Strings.isNotBlank(pitcherId), PromoAccount::getPitcherId, pitcherId));
-        if (CollectionUtils.isEmpty(promoAccountList)) {
-            return Collections.emptyList();
-        }
-        return promoAccountList.stream().map(PromoAccount::getId).collect(Collectors.toList());
-    }
-
-    @Override
-    public Map<Long, PromoAccountDTO> promoAccountCondition(String pitcherGroupId, String pitcherId, Long mediaId,
-                                                            String account, Integer accountType) {
-        //条件判断
-        if (Strings.isBlank(pitcherGroupId) && Strings.isBlank(pitcherId) && mediaId == null
-                && Strings.isBlank(account) && accountType == null) {
-            return null;
-        }
-        List<PromoAccount> promoAccountList = super.list(new LambdaQueryWrapper<PromoAccount>()
-                .eq(Strings.isNotBlank(pitcherGroupId), PromoAccount::getPitcherGroupId, pitcherGroupId)
-                .eq(Strings.isNotBlank(pitcherId), PromoAccount::getPitcherId, pitcherId)
-                .eq(mediaId != null, PromoAccount::getMediaId, mediaId)
-                .eq(Strings.isNotBlank(account), PromoAccount::getAccount, account)
-                .eq(accountType != null, PromoAccount::getAccountType, accountType));
-
-        List<PromoAccountDTO> promoAccountDTOList = promoAccountList.stream()
-                .map(promoAccount -> BeanUtil.copy(promoAccount, PromoAccountDTO.class))
-                .collect(Collectors.toList());
-        return promoAccountDTOList.stream().collect(Collectors.toMap(PromoAccountDTO::getId, Function.identity()));
-    }
-}

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

@@ -1,239 +0,0 @@
-package com.zanxiang.game.module.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
-import com.zanxiang.game.module.base.pojo.enums.PromoAccountTypeEnum;
-import com.zanxiang.game.module.base.pojo.enums.PromoProviderEnum;
-import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
-import com.zanxiang.game.module.manage.pojo.dto.*;
-import com.zanxiang.game.module.manage.pojo.params.PromoChannelAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoChannelListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoChannelChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoChannelListVO;
-import com.zanxiang.game.module.manage.service.*;
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-import com.zanxiang.game.module.mybatis.entity.PromoChannel;
-import com.zanxiang.game.module.mybatis.entity.PromoSite;
-import com.zanxiang.game.module.mybatis.mapper.PromoChannelMapper;
-import com.zanxiang.module.util.bean.BeanUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-31
- * @description : 推广渠道
- */
-@Slf4j
-@Service
-public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, PromoChannel> implements IPromoChannelService {
-
-    @Autowired
-    private IPromoAccountService promoAccountService;
-
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @Autowired
-    private IPromoSiteService promoSiteService;
-
-    @Autowired
-    private IGameService gameService;
-
-    @Autowired
-    private IGameCategoryService gameCategoryService;
-
-    @Override
-    public IPage<PromoChannelListVO> list(PromoChannelListParam param) {
-        //游戏条件处理
-        Map<Long, GameDTO> gameMap = gameService.gameCondition(null, param.getGameId(), param.getGameCategoryId());
-        //根据条件, 匹配不到游戏
-        if (gameMap != null && gameMap.isEmpty()) {
-            return new Page<>();
-        }
-        //推广账号条件
-        Map<Long, PromoAccountDTO> promoAccountMap = promoAccountService.promoAccountCondition(param.getPitcherGroupId(),
-                param.getPitcherId(), param.getMediaId(), param.getAccount(), param.getAccountType());
-        //根据条件, 匹配不到账号
-        if (promoAccountMap != null && promoAccountMap.isEmpty()) {
-            return new Page<>();
-        }
-        //相关结果
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        Map<Long, PromoSiteDTO> promoSiteMap = promoSiteService.promoSiteMap();
-        Map<Long, GameCategoryDTO> gameCategoryMap = gameCategoryService.gameCategoryMap();
-        //相关条件
-        Set<Long> gameIdSet = gameMap == null ? null : gameMap.keySet();
-        Set<Long> promoAccountIdSet = promoAccountMap == null ? null : promoAccountMap.keySet();
-        final Map<Long, GameDTO> gameConditionMap = gameMap == null ? gameService.gameMap() : gameMap;
-        final Map<Long, PromoAccountDTO> promoAccountConditionMap = promoAccountMap == null ? promoAccountService.promoAccountMap() : promoAccountMap;
-        //查询
-        return page(param.toPage(), new QueryWrapper<PromoChannel>().lambda()
-                .in(CollectionUtils.isNotEmpty(gameIdSet), PromoChannel::getGameId, gameIdSet)
-                .in(CollectionUtils.isNotEmpty(promoAccountIdSet), PromoChannel::getAccountId, promoAccountIdSet)
-                .like(Strings.isNotBlank(param.getChannel()), PromoChannel::getChannel, param.getChannel())
-                .ge(param.getBeginDate() != null, PromoChannel::getCreateTime, param.getBeginDate() == null ? null : LocalDateTime.of(param.getBeginDate(), LocalTime.MIN))
-                .le(param.getEndDate() != null, PromoChannel::getCreateTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
-                .eq(param.getProviderId() != null, PromoChannel::getProviderId, param.getProviderId())
-                .eq(param.getStatus() != null, PromoChannel::getStatus, param.getStatus())
-                .eq(param.getPromoSiteId() != null, PromoChannel::getPromoSiteId, param.getPromoSiteId())
-                .orderByDesc(PromoChannel::getCreateTime))
-                .convert(promoAccount -> this.toVo(promoAccountConditionMap, promoMediaMap, promoAccount, promoSiteMap, gameConditionMap, gameCategoryMap));
-    }
-
-    private PromoChannelListVO toVo(Map<Long, PromoAccountDTO> promoAccountMap, Map<Long, PromoMediaDTO> promoMediaMap, PromoChannel promoChannel,
-                                    Map<Long, PromoSiteDTO> promoSiteMap, Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap) {
-        PromoChannelListVO promoChannelListVO = BeanUtil.copy(promoChannel, PromoChannelListVO.class);
-        if (Objects.isNull(promoChannelListVO)) {
-            return null;
-        }
-        PromoAccountDTO promoAccountDTO = promoAccountMap.get(promoChannelListVO.getAccountId());
-        if (promoAccountDTO != null) {
-            promoChannelListVO.setPitcherId(promoAccountDTO.getPitcherId());
-            promoChannelListVO.setPitcherName(promoAccountDTO.getPitcherName());
-            promoChannelListVO.setPitcherGroupId(promoAccountDTO.getPitcherGroupId());
-            promoChannelListVO.setPitcherGroupName(promoAccountDTO.getPitcherGroupName());
-            promoChannelListVO.setAccountName(promoAccountDTO.getName());
-            promoChannelListVO.setAccountType(promoAccountDTO.getAccountType());
-            promoChannelListVO.setAccountTypeName(PromoAccountTypeEnum.getNameByType(promoAccountDTO.getAccountType()));
-        }
-        PromoMediaDTO promoMediaDTO = promoMediaMap.get(promoChannelListVO.getMediaId());
-        if (promoMediaDTO != null) {
-            promoChannelListVO.setMediaName(promoMediaDTO.getName());
-        }
-        PromoSiteDTO promoSiteDTO = promoSiteMap.get(promoChannelListVO.getPromoSiteId());
-        if (promoSiteDTO != null) {
-            promoChannelListVO.setMediaSite(promoSiteDTO.getMediaSite());
-            promoChannelListVO.setPlateSite(promoSiteDTO.getPlateSite());
-        }
-        GameDTO gameDTO = gameMap.get(promoChannelListVO.getGameId());
-        if (gameDTO != null) {
-            promoChannelListVO.setGameName(gameDTO.getName());
-            GameCategoryDTO gameCategoryDTO = gameCategoryMap.get(gameDTO.getCategory());
-            if (gameCategoryDTO != null) {
-                promoChannelListVO.setGameCategory(gameCategoryDTO.getId());
-                promoChannelListVO.setGameCategoryName(gameCategoryDTO.getName());
-            }
-        }
-        promoChannelListVO.setProviderName(PromoProviderEnum.getNameByType(promoChannelListVO.getProviderId()));
-        return promoChannelListVO;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean addOrUpdate(PromoChannelAddUpdateParam param) {
-        PromoAccount promoAccount = promoAccountService.getById(param.getPromoAccountId());
-        PromoSite promoSite = promoSiteService.getById(param.getPromoSiteId());
-        //创建渠道
-        Integer channelCount = param.getChannelCount();
-        List<PromoChannel> promoChannelList = new ArrayList<>();
-        for (int i = 0; i < channelCount; i++) {
-            UUID id = UUID.randomUUID();
-            String[] idArray = id.toString().split("-");
-            String channel = Long.toBinaryString(System.currentTimeMillis() + channelCount) + idArray[1];
-            promoChannelList.add(PromoChannel.builder()
-                    .accountId(promoAccount.getId())
-                    .mediaId(promoAccount.getMediaId())
-                    .promoSiteId(promoSite.getId())
-                    .providerId(param.getProviderId())
-                    .gameId(param.getGameId())
-                    .remark(param.getRemark())
-                    .channel(channel)
-                    .status(StatusEnum.YES.getCode())
-                    .isDelete(DeleteEnum.NO.getCode())
-                    .createTime(LocalDateTime.now())
-                    .updateTime(LocalDateTime.now())
-                    .build());
-        }
-        return super.saveBatch(promoChannelList);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean statusUpdate(Long id, Integer status) {
-        return super.update(new LambdaUpdateWrapper<PromoChannel>()
-                .set(PromoChannel::getStatus, status)
-                .set(PromoChannel::getUpdateTime, LocalDateTime.now())
-                .eq(PromoChannel::getId, id));
-    }
-
-    @Override
-    public List<PromoChannelChoiceVO> promoChannelChoiceList() {
-        List<PromoChannel> promoChannelList = super.list(new LambdaQueryWrapper<PromoChannel>().
-                select(PromoChannel::getId, PromoChannel::getChannel));
-        return promoChannelList.stream()
-                .map(promoChannel -> BeanUtil.copy(promoChannel, PromoChannelChoiceVO.class))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public Map<Long, PromoChannelDTO> promoChannelMap() {
-        List<PromoChannel> promoChannelList = super.list(new LambdaQueryWrapper<PromoChannel>().
-                select(PromoChannel::getId, PromoChannel::getChannel, PromoChannel::getAccountId));
-        if (CollectionUtils.isEmpty(promoChannelList)) {
-            return Collections.emptyMap();
-        }
-        List<PromoChannelDTO> promoChannelDTOList = promoChannelList.stream()
-                .map(promoChannel -> BeanUtil.copy(promoChannel, PromoChannelDTO.class))
-                .collect(Collectors.toList());
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        promoChannelDTOList.forEach(promoChannelDTO -> {
-            Long mediaId = promoChannelDTO.getMediaId();
-            if (promoMediaMap.get(mediaId) != null) {
-                promoChannelDTO.setMediaName(promoMediaMap.get(mediaId).getName());
-            }
-        });
-        return promoChannelDTOList.stream().collect(Collectors.toMap(PromoChannelDTO::getId, Function.identity()));
-    }
-
-    @Override
-    public Map<Long, PromoChannelDTO> promoChannelMap(List<Long> agentIdList) {
-        List<PromoChannel> promoChannelList = super.listByIds(agentIdList);
-        if (CollectionUtils.isEmpty(promoChannelList)) {
-            return Collections.emptyMap();
-        }
-        List<PromoChannelDTO> promoChannelDTOList = promoChannelList.stream()
-                .map(promoChannel -> BeanUtil.copy(promoChannel, PromoChannelDTO.class))
-                .collect(Collectors.toList());
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        promoChannelDTOList.forEach(promoChannelDTO -> {
-            Long mediaId = promoChannelDTO.getMediaId();
-            if (promoMediaMap.get(mediaId) != null) {
-                promoChannelDTO.setMediaName(promoMediaMap.get(mediaId).getName());
-            }
-        });
-        return promoChannelDTOList.stream().collect(Collectors.toMap(PromoChannelDTO::getId, Function.identity()));
-    }
-
-    @Override
-    public List<Long> listByAccountOrPitcherId(String account, String pitcherId) {
-        if (Strings.isBlank(account) && Strings.isBlank(pitcherId)) {
-            return null;
-        }
-        List<Long> accountIdList = promoAccountService.listByAccountOrPitcherId(account, pitcherId);
-        if (CollectionUtils.isEmpty(accountIdList)) {
-            return Collections.emptyList();
-        }
-        List<PromoChannel> promoChannelList = super.list(new LambdaQueryWrapper<PromoChannel>()
-                .in(PromoChannel::getAccountId, accountIdList));
-        if (CollectionUtils.isEmpty(promoChannelList)) {
-            return Collections.emptyList();
-        }
-        return promoChannelList.stream().map(PromoChannel::getId).collect(Collectors.toList());
-    }
-}

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

@@ -1,142 +0,0 @@
-package com.zanxiang.game.module.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
-import com.zanxiang.game.module.base.pojo.enums.PromoMediaTypeEnum;
-import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
-import com.zanxiang.game.module.manage.pojo.dto.PromoMediaDTO;
-import com.zanxiang.game.module.manage.pojo.params.PromoMediaAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.PromoMediaListParam;
-import com.zanxiang.game.module.manage.pojo.vo.PromoMediaChoiceVO;
-import com.zanxiang.game.module.manage.pojo.vo.PromoMediaListVO;
-import com.zanxiang.game.module.manage.service.IPromoMediaService;
-import com.zanxiang.game.module.mybatis.entity.PromoMedia;
-import com.zanxiang.game.module.mybatis.mapper.PromoMediaMapper;
-import com.zanxiang.module.util.bean.BeanUtil;
-import com.zanxiang.module.util.exception.BaseException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-17
- * @description : 推广媒体
- */
-@Slf4j
-@Service
-public class PromoMediaServiceImpl extends ServiceImpl<PromoMediaMapper, PromoMedia> implements IPromoMediaService {
-
-    @Override
-    public Map<Long, PromoMediaDTO> promoMediaMap() {
-        List<PromoMedia> promoMediaList = super.list();
-        if (CollectionUtils.isEmpty(promoMediaList)) {
-            return Collections.emptyMap();
-        }
-        List<PromoMediaDTO> promoMediaDTOList = promoMediaList.stream()
-                .map(promoMedia -> BeanUtil.copy(promoMedia, PromoMediaDTO.class))
-                .collect(Collectors.toList());
-        return promoMediaDTOList.stream().collect(Collectors.toMap(PromoMediaDTO::getId, Function.identity()));
-    }
-
-    @Override
-    public List<PromoMediaChoiceVO> promoMediaChoiceList() {
-        List<PromoMedia> promoMediaList = super.list(new LambdaQueryWrapper<PromoMedia>().
-                select(PromoMedia::getId, PromoMedia::getName));
-        return promoMediaList.stream()
-                .map(promoMedia -> BeanUtil.copy(promoMedia, PromoMediaChoiceVO.class))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public IPage<PromoMediaListVO> list(PromoMediaListParam param) {
-        return page(param.toPage(), new QueryWrapper<PromoMedia>().lambda()
-                .like(Strings.isNotBlank(param.getName()), PromoMedia::getName, param.getName())
-                .apply(param.getType() != null, "FIND_IN_SET({0}, types)", String.valueOf(param.getType()))
-                .eq(param.getStatus() != null, PromoMedia::getStatus, param.getStatus())
-                .orderByDesc(PromoMedia::getCreateTime))
-                .convert(this::toVo);
-    }
-
-    private PromoMediaListVO toVo(PromoMedia promoMedia) {
-        PromoMediaListVO promoMediaListVO = BeanUtil.copy(promoMedia, PromoMediaListVO.class);
-        if (Objects.isNull(promoMediaListVO)) {
-            return null;
-        }
-        String[] typeList = promoMediaListVO.getTypes().split(",");
-        List<String> typeNameList = new ArrayList<>();
-        for (String type : typeList) {
-            typeNameList.add(PromoMediaTypeEnum.getNameByType(Integer.valueOf(type)));
-        }
-        promoMediaListVO.setTypeNameList(typeNameList);
-        return promoMediaListVO;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean addOrUpdate(PromoMediaAddUpdateParam param) {
-        Long id = param.getId();
-        //更新
-        if (id != null) {
-            PromoMedia promoMedia = super.getById(id);
-            if (promoMedia == null) {
-                throw new BaseException("参数错误, 推广媒体信息不存在");
-            }
-            //更新标签名字, 不可重复
-            if (!Objects.equals(promoMedia.getName(), param.getName())) {
-                //判断名称是否已经存在
-                int count = super.count(new LambdaQueryWrapper<PromoMedia>()
-                        .eq(PromoMedia::getName, param.getName()));
-                if (count > 0) {
-                    throw new BaseException("推广媒体名称名称已经存在");
-                }
-            }
-            promoMedia.setName(param.getName());
-            promoMedia.setTypes(StringUtils.join(param.getTypes(), ","));
-            promoMedia.setAddress(param.getAddress());
-            promoMedia.setCompany(param.getCompany());
-            promoMedia.setRemark(param.getRemark());
-            promoMedia.setUpdateTime(LocalDateTime.now());
-            return super.updateById(promoMedia);
-        }
-        //判断名称是否已经存在
-        int count = super.count(new LambdaQueryWrapper<PromoMedia>()
-                .eq(PromoMedia::getName, param.getName()));
-        if (count > 0) {
-            throw new BaseException("推广媒体名称名称已经存在");
-        }
-        //创建
-        return super.save(PromoMedia.builder()
-                .name(param.getName())
-                .types(StringUtils.join(param.getTypes(), ","))
-                .address(param.getAddress())
-                .company(param.getCompany())
-                .status(StatusEnum.YES.getCode())
-                .remark(param.getRemark())
-                .isDelete(DeleteEnum.NO.getCode())
-                .createTime(LocalDateTime.now())
-                .updateTime(LocalDateTime.now())
-                .build());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean statusUpdate(Long id, Integer status) {
-        return super.update(new LambdaUpdateWrapper<PromoMedia>()
-                .set(PromoMedia::getStatus, status)
-                .set(PromoMedia::getUpdateTime, LocalDateTime.now())
-                .eq(PromoMedia::getId, id));
-    }
-}

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

@@ -1,157 +0,0 @@
-package com.zanxiang.game.module.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.game.module.base.pojo.enums.DeleteEnum;
-import com.zanxiang.game.module.base.pojo.enums.StatusEnum;
-import com.zanxiang.game.module.manage.pojo.dto.PromoMediaDTO;
-import com.zanxiang.game.module.manage.pojo.dto.PromoSiteDTO;
-import com.zanxiang.game.module.manage.pojo.params.PromoSiteAddOrUpdateParam;
-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.manage.service.IPromoMediaService;
-import com.zanxiang.game.module.manage.service.IPromoSiteService;
-import com.zanxiang.game.module.mybatis.entity.PromoMedia;
-import com.zanxiang.game.module.mybatis.entity.PromoSite;
-import com.zanxiang.game.module.mybatis.mapper.PromoSiteMapper;
-import com.zanxiang.module.util.bean.BeanUtil;
-import com.zanxiang.module.util.exception.BaseException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-18
- * @description : 推广版位
- */
-@Slf4j
-@Service
-public class PromoSiteServiceImpl extends ServiceImpl<PromoSiteMapper, PromoSite> implements IPromoSiteService {
-
-    @Autowired
-    private IPromoMediaService promoMediaService;
-
-    @Override
-    public Map<Long, PromoSiteDTO> promoSiteMap() {
-        List<PromoSite> promoSiteList = super.list();
-        if (CollectionUtils.isEmpty(promoSiteList)) {
-            return Collections.emptyMap();
-        }
-        return promoSiteList.stream()
-                .map(promoSite -> BeanUtil.copy(promoSite, PromoSiteDTO.class))
-                .collect(Collectors.toMap(PromoSiteDTO::getId, Function.identity()));
-    }
-
-    @Override
-    public List<PromoSiteLinkageChoiceVO> promoSiteLinkageChoiceList() {
-        List<PromoSite> promoSiteList = super.list();
-        List<PromoSiteLinkageChoiceVO> choiceVOList = promoSiteList.stream()
-                .map(promoSite -> BeanUtil.copy(promoSite, PromoSiteLinkageChoiceVO.class))
-                .collect(Collectors.toList());
-        Map<Long, PromoMediaDTO> promoMediaMap = promoMediaService.promoMediaMap();
-        choiceVOList.forEach(promoAccountDTO -> {
-            Long mediaId = promoAccountDTO.getMediaId();
-            if (promoMediaMap.get(mediaId) != null) {
-                promoAccountDTO.setMediaName(promoMediaMap.get(mediaId).getName());
-            }
-        });
-        return choiceVOList;
-    }
-
-    @Override
-    public IPage<PromoSiteListVO> list(PromoSiteListParam param) {
-        return page(param.toPage(), new QueryWrapper<PromoSite>().lambda()
-                .eq(param.getMediaId() != null, PromoSite::getMediaId, param.getMediaId())
-                .like(Strings.isNotBlank(param.getMediaSite()), PromoSite::getMediaSite, param.getMediaSite())
-                .like(Strings.isNotBlank(param.getPlateSite()), PromoSite::getPlateSite, param.getPlateSite())
-                .eq(param.getStatus() != null, PromoSite::getStatus, param.getStatus())
-                .orderByDesc(PromoSite::getCreateTime))
-                .convert(this::toVo);
-    }
-
-    private PromoSiteListVO toVo(PromoSite promoSite) {
-        if (Objects.isNull(promoSite)) {
-            return null;
-        }
-        PromoSiteListVO promoSiteListVO = BeanUtil.copy(promoSite, PromoSiteListVO.class);
-        PromoMedia promoMedia = promoMediaService.getById(promoSiteListVO.getMediaId());
-        if (promoMedia != null) {
-            promoSiteListVO.setMediaName(promoMedia.getName());
-        }
-        return promoSiteListVO;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean addOrUpdate(PromoSiteAddOrUpdateParam param) {
-        Long id = param.getId();
-        //更新
-        if (id != null) {
-            PromoSite promoSite = super.getById(id);
-            if (promoSite == null) {
-                throw new BaseException("参数错误, 推广媒体版位信息不存在");
-            }
-            //更新, 不可重复
-            if (!Objects.equals(promoSite.getMediaSite(), param.getMediaSite())
-                    || !Objects.equals(promoSite.getPlateSite(), param.getPlateSite())) {
-                //判断名称是否已经存在
-                int count = super.count(new LambdaQueryWrapper<PromoSite>()
-                        .eq(PromoSite::getMediaId, param.getMediaId())
-                        .eq(PromoSite::getMediaSite, param.getMediaSite())
-                        .eq(PromoSite::getPlateSite, param.getPlateSite()));
-                if (count > 0) {
-                    throw new BaseException("推广媒体位置和版位已经存在");
-                }
-            }
-            promoSite.setMediaSite(param.getMediaSite());
-            promoSite.setPlateSite(param.getPlateSite());
-            promoSite.setRemark(param.getRemark());
-            promoSite.setUpdateTime(LocalDateTime.now());
-            return super.updateById(promoSite);
-        }
-        //判断名称是否已经存在
-        int count = super.count(new LambdaQueryWrapper<PromoSite>()
-                .eq(PromoSite::getMediaId, param.getMediaId())
-                .eq(PromoSite::getMediaSite, param.getMediaSite())
-                .eq(PromoSite::getPlateSite, param.getPlateSite()));
-        if (count > 0) {
-            throw new BaseException("推广媒体位置和版位已经存在");
-        }
-        //创建
-        return super.save(PromoSite.builder()
-                .mediaId(param.getMediaId())
-                .mediaSite(param.getMediaSite())
-                .plateSite(param.getPlateSite())
-                .remark(param.getRemark())
-                .status(StatusEnum.YES.getCode())
-                .isDelete(DeleteEnum.NO.getCode())
-                .createTime(LocalDateTime.now())
-                .updateTime(LocalDateTime.now())
-                .build());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean statusUpdate(Long id, Integer status) {
-        return super.update(new LambdaUpdateWrapper<PromoSite>()
-                .set(PromoSite::getStatus, status)
-                .set(PromoSite::getUpdateTime, LocalDateTime.now())
-                .eq(PromoSite::getId, id));
-    }
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PromoAccount.java

@@ -1,95 +0,0 @@
-package com.zanxiang.game.module.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广账号
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_promo_account")
-public class PromoAccount {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    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 Integer accountType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-
-    /**
-     * 1:删除,0: 正常
-     */
-    @TableLogic
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PromoAccountLog.java

@@ -1,63 +0,0 @@
-package com.zanxiang.game.module.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-22
- * @description : 推广账号变更记录
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_promo_account_log")
-public class PromoAccountLog {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 推广账号主键id
-     */
-    private Long accountId;
-
-    /**
-     * 投手id
-     */
-    private String pitcherId;
-
-    /**
-     * 投手项目组
-     */
-    private String pitcherGroupId;
-
-    /**
-     * 开始时间
-     */
-    private LocalDateTime startTime;
-
-    /**
-     * 结束时间
-     */
-    private LocalDateTime endTime;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PromoChannel.java

@@ -1,93 +0,0 @@
-package com.zanxiang.game.module.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广渠道
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_promo_channel")
-public class PromoChannel {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 推广账号主键id
-     */
-    private Long accountId;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 推广版位位置id
-     */
-    private Long promoSiteId;
-
-    /**
-     * 推广服务商id
-     */
-    private Integer providerId;
-
-    /**
-     * 游戏id
-     */
-    private Long gameId;
-
-    /**
-     * 二维码
-     */
-    private String code;
-
-    /**
-     * 推广路径
-     */
-    private String path;
-
-    /**
-     * 渠道
-     */
-    private String channel;
-
-    /**
-     * 备注
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-
-    /**
-     * 1:删除,0: 正常
-     */
-    @TableLogic
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PromoMedia.java

@@ -1,75 +0,0 @@
-package com.zanxiang.game.module.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广媒体
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_promo_media")
-public class PromoMedia {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 推广媒体
-     */
-    private String name;
-
-    /**
-     * 推广媒体类型
-     */
-    private String types;
-
-    /**
-     * 地址
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String address;
-
-    /**
-     * 公司
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String company;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String remark;
-
-    /**
-     * 1:删除,0: 正常
-     */
-    @TableLogic
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/PromoSite.java

@@ -1,70 +0,0 @@
-package com.zanxiang.game.module.mybatis.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广版位
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-@TableName("t_promo_site")
-public class PromoSite {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 推广媒体id
-     */
-    private Long mediaId;
-
-    /**
-     * 媒体版位
-     */
-    private String plateSite;
-
-    /**
-     * 媒体位置
-     */
-    private String mediaSite;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态, 0 : 可用, 1: 禁用
-     */
-    private Integer status;
-
-    /**
-     * 1:删除,0: 正常
-     */
-    @TableLogic
-    private Integer isDelete;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/PromoAccountLogMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.game.module.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.game.module.mybatis.entity.PromoAccountLog;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-22
- * @description : ${description}
- */
-public interface PromoAccountLogMapper extends BaseMapper<PromoAccountLog> {
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/PromoAccountMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.game.module.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.game.module.mybatis.entity.PromoAccount;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : ${description}
- */
-public interface PromoAccountMapper extends BaseMapper<PromoAccount> {
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/PromoChannelMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.game.module.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.game.module.mybatis.entity.PromoChannel;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : ${description}
- */
-public interface PromoChannelMapper extends BaseMapper<PromoChannel> {
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/PromoMediaMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.game.module.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.game.module.mybatis.entity.PromoMedia;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : ${description}
- */
-public interface PromoMediaMapper extends BaseMapper<PromoMedia> {
-}

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/PromoSiteMapper.java

@@ -1,12 +0,0 @@
-package com.zanxiang.game.module.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zanxiang.game.module.mybatis.entity.PromoSite;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : ${description}
- */
-public interface PromoSiteMapper extends BaseMapper<PromoSite> {
-}