From 180d454907e5ca4cc039b86b74346f33cdbaa584 Mon Sep 17 00:00:00 2001 From: cengy Date: Sat, 12 Apr 2025 14:35:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ff-game):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=9B=B8=E5=85=B3=E6=9C=8D=E5=8A=A1=E5=92=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了多个控制器和实现类中的方法调用，使用新的Biz接口替代旧的Service接口 - 删除了IGameService接口及其实现类GameServiceImpl - 新增了ITenantAgentInviteBiz接口 - 优化了多个类的依赖注入，使用更具体的Biz接口替代泛型Service接口 --- .../ff/agent/controller/AgentController.java | 10 +- .../TenantAgentInviteController.java | 42 +++-- .../TenantAgentInviteRegisterController.java | 50 +++--- .../TenantAgentPlatformController.java | 19 +-- .../agent/service/ITenantAgentInviteBiz.java | 20 +++ .../ITenantAgentInviteRegisterBiz.java | 1 - .../impl/TenantAgentInviteBizImpl.java | 38 +++++ .../ff/api/controller/ApiGameController.java | 33 ++-- .../api/controller/ApiMemberController.java | 16 +- .../api/controller/ApiTenantController.java | 9 +- .../controller/TenantGameQuotaController.java | 49 +++--- .../TenantGameQuotaFlowController.java | 49 +++--- .../TenantQuotaExchangeController.java | 49 +++--- .../config/ContentRefreshedEventListener.java | 7 +- .../api/ae/address/MyAEAddressSource.java | 6 +- .../game/api/ae/impl/GamesAEServiceImpl.java | 7 +- .../api/dg/address/MyDGAddressSource.java | 5 +- .../api/fc/address/MyFCAddressSource.java | 3 +- .../game/api/fc/impl/GamesFCServiceImpl.java | 9 +- .../api/jili/address/MyJILIAddressSource.java | 3 +- .../service/impl/GamesJILIServiceImpl.java | 10 +- .../api/km/address/MyKMAddressSource.java | 3 +- .../game/api/km/impl/GamesKMServiceImpl.java | 11 +- .../meitian/address/MeiTianAddressSource.java | 4 +- .../api/ng/address/MyNGAddressSource.java | 4 +- .../ng/service/impl/GamesPGServiceImpl.java | 12 +- .../api/pgt/address/MyPGTAddressSource.java | 11 +- .../api/pgt/impl/GamesPGTServiceImpl.java | 4 +- .../api/pgx/address/MyPGXAddressSource.java | 3 +- .../api/pgx/impl/GamesPGXServiceImpl.java | 5 +- .../api/sa/address/MySAAddressSource.java | 3 +- .../game/api/sv388/address/SV388Adrress.java | 3 +- .../api/xk/address/MyXKAddressSource.java | 3 +- .../com/ff/game/service/IGameService.java | 106 ------------ .../ff/game/service/impl/GameServiceImpl.java | 153 ------------------ .../ff/game/service/impl/PlatformBizImpl.java | 3 +- .../ff/sports/db/address/DBSportsAddress.java | 3 +- .../ff/sports/fb/address/FBSportsAddress.java | 3 +- .../TenantBettingDetailsController.java | 12 +- .../tenant/controller/TenantController.java | 13 +- .../controller/TenantExchangeController.java | 5 +- .../controller/TenantQuotaFlowController.java | 9 +- .../resources/mapper/game/GameBizMapper.xml | 14 +- 43 files changed, 291 insertions(+), 531 deletions(-) create mode 100644 ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteBiz.java create mode 100644 ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInviteBizImpl.java delete mode 100644 ff-game/src/main/java/com/ff/game/service/IGameService.java delete mode 100644 ff-game/src/main/java/com/ff/game/service/impl/GameServiceImpl.java diff --git a/ff-game/src/main/java/com/ff/agent/controller/AgentController.java b/ff-game/src/main/java/com/ff/agent/controller/AgentController.java index 1bf86d6..53a9af6 100644 --- a/ff-game/src/main/java/com/ff/agent/controller/AgentController.java +++ b/ff-game/src/main/java/com/ff/agent/controller/AgentController.java @@ -21,8 +21,9 @@ import com.ff.base.utils.bean.BeanUtils; import com.ff.base.utils.ip.IpUtils; import com.ff.common.domain.TenantAgentPlatform; import com.ff.common.dto.BalanceChangesDTO; -import com.ff.common.service.ITenantAgentPlatformService; -import com.ff.common.service.ITenantGameQuotaService; +import com.ff.tenant.service.ITenantAgentPlatformService; +import com.ff.tenant.service.ITenantGameQuotaBiz; +import com.ff.tenant.service.ITenantGameQuotaService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -51,6 +52,9 @@ public class AgentController extends BaseController { @Resource private ITenantGameQuotaService tenantGameQuotaService; + + @Resource + private ITenantGameQuotaBiz tenantGameQuotaBiz; @Resource private ITenantPlatformService tenantPlatformService; @@ -127,7 +131,7 @@ public class AgentController extends BaseController { if (tenant > 0) { //信誉额度 if (!ObjectUtils.isEmpty(agentCreateTenantDTO.getRealBalance())) { - tenantGameQuotaService.balanceChanges(BalanceChangesDTO.builder() + tenantGameQuotaBiz.balanceChanges(BalanceChangesDTO.builder() .isOut(Boolean.TRUE) .currencyCode(Constants.USDT) .tenantKey(agentCreateTenantDTO.getAccount()) diff --git a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteController.java b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteController.java index 02e2ce7..c599d75 100644 --- a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteController.java +++ b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteController.java @@ -1,36 +1,28 @@ package com.ff.agent.controller; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; - +import com.ff.agent.domain.TenantAgentInvite; import com.ff.agent.domain.TenantAgentInvitePlatform; import com.ff.agent.dto.TenantAgentInviteDTO; +import com.ff.agent.service.ITenantAgentInviteBiz; import com.ff.agent.service.ITenantAgentInvitePlatformService; +import com.ff.agent.service.ITenantAgentInviteService; import com.ff.base.annotation.Anonymous; -import com.ff.base.constant.ConfigConstants; -import com.ff.base.enums.InviteType; -import com.ff.base.system.domain.TenantPlatform; -import com.ff.base.system.service.ISysConfigService; -import com.ff.base.utils.bean.BeanUtils; -import com.ff.common.domain.TenantAgentPlatform; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ff.base.annotation.Log; +import com.ff.base.constant.ConfigConstants; import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; -import com.ff.base.enums.BusinessType; -import com.ff.agent.domain.TenantAgentInvite; -import com.ff.agent.service.ITenantAgentInviteService; import com.ff.base.core.page.TableDataInfo; +import com.ff.base.enums.BusinessType; +import com.ff.base.enums.InviteType; +import com.ff.base.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; /** * 代理邀请链接Controller @@ -43,6 +35,8 @@ import com.ff.base.core.page.TableDataInfo; public class TenantAgentInviteController extends BaseController { @Autowired private ITenantAgentInviteService tenantAgentInviteService; + @Autowired + private ITenantAgentInviteBiz tenantAgentInviteBiz; @Resource private ISysConfigService sysConfigService; @@ -93,7 +87,7 @@ public class TenantAgentInviteController extends BaseController { public AjaxResult add(@Validated @RequestBody TenantAgentInviteDTO tenantAgentInvite) { tenantAgentInvite.setAgentId(getUserId()); String inviteUrl = sysConfigService.selectConfigByKey(ConfigConstants.INVITE_URL); - tenantAgentInvite.setInviteCode(tenantAgentInviteService.getInviteCode()); + tenantAgentInvite.setInviteCode(tenantAgentInviteBiz.getInviteCode()); tenantAgentInvite.setInviteUrl(inviteUrl + "?code=" + tenantAgentInvite.getInviteCode()); tenantAgentInvite.setCreateBy(getUsername()); int result = tenantAgentInviteService.insertTenantAgentInvite(tenantAgentInvite); diff --git a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteRegisterController.java b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteRegisterController.java index c28c2a5..5d50e5c 100644 --- a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteRegisterController.java +++ b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentInviteRegisterController.java @@ -1,11 +1,5 @@ package com.ff.agent.controller; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - import cn.hutool.core.util.IdUtil; import com.ff.agent.domain.TenantAgentCommission; import com.ff.agent.domain.TenantAgentInvite; @@ -13,48 +7,38 @@ import com.ff.agent.domain.TenantAgentInvitePlatform; import com.ff.agent.domain.TenantAgentInviteRegister; import com.ff.agent.dto.TenantAgentInviteRegisterAddDTO; import com.ff.agent.dto.TenantAgentInviteRegisterDTO; -import com.ff.agent.service.ITenantAgentCommissionService; -import com.ff.agent.service.ITenantAgentInvitePlatformService; -import com.ff.agent.service.ITenantAgentInviteRegisterService; -import com.ff.agent.service.ITenantAgentInviteService; +import com.ff.agent.service.*; import com.ff.base.annotation.Anonymous; -import com.ff.base.annotation.Excel; import com.ff.base.constant.Constants; +import com.ff.base.core.controller.BaseController; +import com.ff.base.core.domain.AjaxResult; +import com.ff.base.core.page.TableDataInfo; import com.ff.base.enums.*; import com.ff.base.system.domain.TenantAgent; import com.ff.base.system.domain.TenantPlatform; import com.ff.base.system.domain.TenantSecretKey; import com.ff.base.system.dto.CreateTenantDTO; -import com.ff.base.system.dto.TenantSecretKeyDTO; import com.ff.base.system.service.ITenantAgentService; import com.ff.base.system.service.ITenantSecretKeyService; import com.ff.base.utils.DateUtils; import com.ff.base.utils.MessageUtils; -import com.ff.base.utils.SecurityUtils; import com.ff.base.utils.bean.BeanUtils; import com.ff.base.utils.ip.IpUtils; -import com.ff.base.utils.uuid.IdUtils; import com.ff.common.dto.BalanceChangesDTO; -import com.ff.common.service.ITenantGameQuotaService; -import org.springframework.security.access.prepost.PreAuthorize; +import com.ff.tenant.service.ITenantGameQuotaBiz; +import com.ff.tenant.service.ITenantGameQuotaService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ff.base.annotation.Log; -import com.ff.base.core.controller.BaseController; -import com.ff.base.core.domain.AjaxResult; -import com.ff.base.utils.poi.ExcelUtil; -import com.ff.base.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * 代理邀请注册Controller @@ -67,6 +51,8 @@ import com.ff.base.core.page.TableDataInfo; public class TenantAgentInviteRegisterController extends BaseController { @Autowired private ITenantAgentInviteRegisterService tenantAgentInviteRegisterService; + @Autowired + private ITenantAgentInviteRegisterBiz tenantAgentInviteRegisterBiz; @Resource private ITenantAgentInviteService tenantAgentInviteService; @@ -76,6 +62,8 @@ public class TenantAgentInviteRegisterController extends BaseController { @Resource private ITenantGameQuotaService tenantGameQuotaService; + @Resource + private ITenantGameQuotaBiz tenantGameQuotaBiz; @Resource private ITenantAgentCommissionService tenantAgentCommissionService; @@ -94,7 +82,7 @@ public class TenantAgentInviteRegisterController extends BaseController { public TableDataInfo list(TenantAgentInviteRegisterDTO tenantAgentInviteRegisterDTO) { startPage(); tenantAgentInviteRegisterDTO.setAgentId(getUserId()); - List list = tenantAgentInviteRegisterService.selectTenantAgentInviteRegisterListDTO(tenantAgentInviteRegisterDTO); + List list = tenantAgentInviteRegisterBiz.selectTenantAgentInviteRegisterListDTO(tenantAgentInviteRegisterDTO); return getDataTable(list); } @@ -185,7 +173,7 @@ public class TenantAgentInviteRegisterController extends BaseController { .build()); //信誉额度 if (result > 0 & !ObjectUtils.isEmpty(tenantAgentInvite.getRealBalance())) { - tenantGameQuotaService.balanceChanges(BalanceChangesDTO.builder() + tenantGameQuotaBiz.balanceChanges(BalanceChangesDTO.builder() .isOut(Boolean.TRUE) .currencyCode(Constants.USDT) .tenantKey(tenantAgentInviteRegister.getAccount()) diff --git a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentPlatformController.java b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentPlatformController.java index 569d422..b41a97a 100644 --- a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentPlatformController.java +++ b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentPlatformController.java @@ -1,19 +1,16 @@ package com.ff.agent.controller; -import java.util.List; - -import com.ff.base.core.page.PageDomain; +import com.ff.base.core.controller.BaseController; +import com.ff.base.core.domain.AjaxResult; import com.ff.common.domain.TenantAgentPlatform; -import com.ff.common.service.ITenantAgentPlatformService; +import com.ff.tenant.service.ITenantAgentPlatformService; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ff.base.core.controller.BaseController; -import com.ff.base.core.domain.AjaxResult; -import com.ff.agent.domain.TenantAgentInvitePlatform; -import com.ff.agent.service.ITenantAgentInvitePlatformService; + +import java.util.List; /** * 平台邀请注册成本管理Controller @@ -23,8 +20,7 @@ import com.ff.agent.service.ITenantAgentInvitePlatformService; */ @RestController @RequestMapping("/agent/platform") -public class TenantAgentPlatformController extends BaseController -{ +public class TenantAgentPlatformController extends BaseController { @Autowired private ITenantAgentPlatformService tenantAgentPlatformService; @@ -32,8 +28,7 @@ public class TenantAgentPlatformController extends BaseController * 查询平台邀请注册成本管理列表 */ @GetMapping("/select") - public AjaxResult select( ) - { + public AjaxResult select() { PageHelper.orderBy("platform_code desc,currency_code desc"); List list = tenantAgentPlatformService.selectTenantAgentPlatformList(TenantAgentPlatform.builder().build()); return AjaxResult.success(list); diff --git a/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteBiz.java b/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteBiz.java new file mode 100644 index 0000000..f6b51fb --- /dev/null +++ b/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteBiz.java @@ -0,0 +1,20 @@ +package com.ff.agent.service; + +import com.ff.agent.dto.TenantAgentInviteRegisterDTO; + +import java.util.List; + +/** + * 代理邀请注册Service接口 + * + * @author shi + * @date 2025-02-25 + */ +public interface ITenantAgentInviteBiz { + /** + * 获取邀请码 + * + * @return {@link String } + */ + String getInviteCode(); +} diff --git a/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteRegisterBiz.java b/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteRegisterBiz.java index fe80af0..ecbb784 100644 --- a/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteRegisterBiz.java +++ b/ff-game/src/main/java/com/ff/agent/service/ITenantAgentInviteRegisterBiz.java @@ -19,5 +19,4 @@ public interface ITenantAgentInviteRegisterBiz { */ List selectTenantAgentInviteRegisterListDTO(TenantAgentInviteRegisterDTO tenantAgentInviteRegisterDTO); - } diff --git a/ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInviteBizImpl.java b/ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInviteBizImpl.java new file mode 100644 index 0000000..16f9b52 --- /dev/null +++ b/ff-game/src/main/java/com/ff/agent/service/impl/TenantAgentInviteBizImpl.java @@ -0,0 +1,38 @@ +package com.ff.agent.service.impl; + +import com.ff.agent.domain.TenantAgentInvite; +import com.ff.agent.mapper.TenantAgentInviteMapper; +import com.ff.agent.service.ITenantAgentInviteBiz; +import com.ff.base.utils.NumberUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +/** + * 代理邀请注册Service接口 + * + * @author shi + * @date 2025-02-25 + */ +@Service +public class TenantAgentInviteBizImpl implements ITenantAgentInviteBiz { + + @Autowired + private TenantAgentInviteMapper tenantAgentInviteMapper; + + /** + * 获取邀请码 + * + * @return {@link String } + */ + @Override + public synchronized String getInviteCode() { + String inviteCode = NumberUtils.generateRandomCode(12); + while (!CollectionUtils.isEmpty(tenantAgentInviteMapper.selectTenantAgentInviteList(TenantAgentInvite.builder() + .inviteCode(inviteCode) + .build()))) { + inviteCode = NumberUtils.generateRandomCode(12); + } + return inviteCode; + } +} diff --git a/ff-game/src/main/java/com/ff/api/controller/ApiGameController.java b/ff-game/src/main/java/com/ff/api/controller/ApiGameController.java index 69b37ae..ad64a06 100644 --- a/ff-game/src/main/java/com/ff/api/controller/ApiGameController.java +++ b/ff-game/src/main/java/com/ff/api/controller/ApiGameController.java @@ -15,8 +15,6 @@ import com.ff.base.system.domain.TenantSecretKey; import com.ff.base.utils.StringUtils; import com.ff.base.utils.bean.BeanUtils; import com.ff.common.dto.GameBalanceExchange; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.config.KeyConfig; import com.ff.game.api.IGamesService; import com.ff.game.api.request.*; @@ -25,6 +23,8 @@ import com.ff.game.dto.GameBettingDetailsDTO; import com.ff.game.service.*; import com.ff.member.domain.Member; import com.ff.member.service.IMemberService; +import com.ff.tenant.service.ITenantGameQuotaBiz; +import com.ff.tenant.service.ITenantGameQuotaService; import com.github.pagehelper.PageHelper; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -65,6 +65,8 @@ public class ApiGameController extends BaseController { @Resource private IGameService gameService; + @Resource + private IGameBiz gameBiz; @Resource @@ -75,6 +77,8 @@ public class ApiGameController extends BaseController { @Resource private ITenantGameQuotaService tenantGameQuotaService; + @Resource + private ITenantGameQuotaBiz tenantGameQuotaBiz; @Resource private IGameBettingDetailsService gameBettingDetailsService; @@ -88,6 +92,9 @@ public class ApiGameController extends BaseController { @Qualifier("threadPoolTaskExecutor") private ThreadPoolTaskExecutor threadPoolTaskExecutor; + @Resource + private IPlatformBiz platformBiz; + @Resource private IPlatformService platformService; @@ -98,9 +105,9 @@ public class ApiGameController extends BaseController { */ @PostMapping("/list") public AjaxResult list() { - List gameResponses = gameService.selectGameResponseList(); + List gameResponses = gameBiz.selectGameResponseList(); for (GameResponse gameResponse : gameResponses) { - Platform platform = platformService.get(gameResponse.getPlatformCode()); + Platform platform = platformBiz.get(gameResponse.getPlatformCode()); if (null == platform) { continue; } @@ -125,7 +132,7 @@ public class ApiGameController extends BaseController { Game game = gameService.selectGameByGameId(loginRequest.getGameId()); ApiException.notNull(game, ErrorCode.GAME_NOT_EXIST.getCode()); - Platform platform = platformService.get(game.getPlatformCode()); + Platform platform = platformBiz.get(game.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); IGamesService iGamesService = gamesService.get(platform.getPlatformCode() + Constants.SERVICE); ApiException.notNull(iGamesService, ErrorCode.PLATFORM_NOT_EXIST.getCode()); @@ -191,7 +198,7 @@ public class ApiGameController extends BaseController { TenantSecretKey tenantSecretKey = keyConfig.get(); - Platform platform = platformService.get(gameExchangeBalanceRequest.getPlatformCode()); + Platform platform = platformBiz.get(gameExchangeBalanceRequest.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(gameExchangeBalanceRequest.getCurrencyCode()); @@ -210,7 +217,7 @@ public class ApiGameController extends BaseController { BigDecimal quota = BigDecimal.ZERO; //如果是扣钱提前扣 if (TransferType.GAMES.getCode().equals(gameExchangeBalanceRequest.getTransferType())) { - quota = tenantGameQuotaService.gameBalanceExchange(GameBalanceExchange.builder() + quota = tenantGameQuotaBiz.gameBalanceExchange(GameBalanceExchange.builder() .platformCode(gameExchangeBalanceRequest.getPlatformCode()) .sourceId(gameExchangeBalanceRequest.getOrderId()) .currencyCode(gameExchangeBalanceRequest.getCurrencyCode()) @@ -296,7 +303,7 @@ public class ApiGameController extends BaseController { // .platformCode(gameCreateFreeSpinRequest.getPlatformCode()) // .systemCurrency(gameCreateFreeSpinRequest.getCurrencyCode()).build()); // ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode()); - Platform platform = platformService.get(gameCreateFreeSpinRequest.getPlatformCode()); + Platform platform = platformBiz.get(gameCreateFreeSpinRequest.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(gameCreateFreeSpinRequest.getCurrencyCode()); @@ -383,7 +390,7 @@ public class ApiGameController extends BaseController { */ @PostMapping("/get/detail") public AjaxResult getDetail(@Validated @RequestBody GameGetDetailRequest gameGetDetailRequest) { - Platform platform = platformService.get(gameGetDetailRequest.getPlatformCode()); + Platform platform = platformBiz.get(gameGetDetailRequest.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(gameGetDetailRequest.getCurrencyCode()); @@ -447,7 +454,7 @@ public class ApiGameController extends BaseController { // .systemCurrency(gameKickMemeberRequest.getCurrencyCode()).build()); // ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode()); - Platform platform = platformService.get(gameKickMemeberRequest.getPlatformCode()); + Platform platform = platformBiz.get(gameKickMemeberRequest.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(gameKickMemeberRequest.getCurrencyCode()); @@ -490,7 +497,7 @@ public class ApiGameController extends BaseController { // .systemCurrency(gameKickMemeberAllRequest.getCurrencyCode()).build()); // // ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode()); - Platform platform = platformService.get(gameKickMemeberAllRequest.getPlatformCode()); + Platform platform = platformBiz.get(gameKickMemeberAllRequest.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(gameKickMemeberAllRequest.getCurrencyCode()); @@ -576,7 +583,7 @@ public class ApiGameController extends BaseController { // .systemCurrency(gameGetFreeSpinDashflowRequest.getCurrencyCode()).build()); // ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode()); - Platform platform = platformService.get(request.getPlatformCode()); + Platform platform = platformBiz.get(request.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(request.getCurrencyCode()); @@ -756,7 +763,7 @@ public class ApiGameController extends BaseController { //GamePlatform gamePlatform = gamePlatformService.selectGamePlatformById(game.getPlatformId()); //ApiException.notNull(gamePlatform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); - Platform platform = platformService.get(game.getPlatformCode()); + Platform platform = platformBiz.get(game.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); IGamesService iGamesService = gamesService.get(platform.getPlatformCode() + Constants.SERVICE); diff --git a/ff-game/src/main/java/com/ff/api/controller/ApiMemberController.java b/ff-game/src/main/java/com/ff/api/controller/ApiMemberController.java index 56bd037..8804988 100644 --- a/ff-game/src/main/java/com/ff/api/controller/ApiMemberController.java +++ b/ff-game/src/main/java/com/ff/api/controller/ApiMemberController.java @@ -23,8 +23,10 @@ import com.ff.game.api.request.MemberInfoRequestDTO; import com.ff.game.api.request.MemberInfoResponseDTO; import com.ff.game.domain.KeyInfo; import com.ff.game.domain.Platform; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import com.ff.member.domain.Member; +import com.ff.member.service.IMemberBiz; import com.ff.member.service.IMemberService; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -77,6 +79,10 @@ public class ApiMemberController extends BaseController { @Resource private IPlatformService platformService; + @Autowired + private IPlatformBiz platformBiz; + @Autowired + private IMemberBiz memberBiz; /** * 创建成员 @@ -93,7 +99,7 @@ public class ApiMemberController extends BaseController { TenantSecretKey tenantSecretKey = keyConfig.get(); - Platform platform = platformService.get(memberCreateApiRequest.getPlatformCode()); + Platform platform = platformBiz.get(memberCreateApiRequest.getPlatformCode()); ApiException.notNull(platform, ErrorCode.CURRENCY_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(memberCreateApiRequest.getCurrencyCode()); ApiException.notNull(targetCurrency, ErrorCode.CURRENCY_NOT_EXIST.getCode()); @@ -109,7 +115,7 @@ public class ApiMemberController extends BaseController { } ApiException.notNull(keyInfo, ErrorCode.CURRENCY_NOT_EXIST.getCode()); - String gameAccount =memberService.getMemberGameAccount(memberCreateApiRequest.getPlatformCode(), tenantSecretKey.getTenantSn()); + String gameAccount = memberBiz.getMemberGameAccount(memberCreateApiRequest.getPlatformCode(), tenantSecretKey.getTenantSn()); // 获取用户信息 @@ -146,8 +152,6 @@ public class ApiMemberController extends BaseController { Assert.isTrue(result, "建立游戏账号失败"); - - return toAjax(Boolean.TRUE); } @@ -165,7 +169,7 @@ public class ApiMemberController extends BaseController { ApiException.notNull(iGamesService, ErrorCode.PLATFORM_NOT_EXIST.getCode()); - Platform platform = platformService.get(request.getPlatformCode()); + Platform platform = platformBiz.get(request.getPlatformCode()); ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode()); String targetCurrency = platform.getCurrencyInfo().get(request.getCurrencyCode()); @@ -220,7 +224,7 @@ public class ApiMemberController extends BaseController { List keys = new ArrayList<>(); for (GamePlatforms platformEnum : GamePlatforms.values()) { - Platform platform = platformService.get(platformEnum.getCode()); + Platform platform = platformBiz.get(platformEnum.getCode()); String targetCurrency = platform.getCurrencyInfo().get(memberInfoAllApiRequest.getCurrencyCode()); if (StringUtils.isEmpty(targetCurrency)) { continue; diff --git a/ff-game/src/main/java/com/ff/api/controller/ApiTenantController.java b/ff-game/src/main/java/com/ff/api/controller/ApiTenantController.java index c9d245c..c1939a7 100644 --- a/ff-game/src/main/java/com/ff/api/controller/ApiTenantController.java +++ b/ff-game/src/main/java/com/ff/api/controller/ApiTenantController.java @@ -6,11 +6,11 @@ import com.ff.api.response.TenantInfoResponse; import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; import com.ff.base.enums.QuotaType; +import com.ff.base.system.domain.TenantSecretKey; import com.ff.base.utils.bean.BeanUtils; import com.ff.common.domain.TenantGameQuota; -import com.ff.base.system.domain.TenantSecretKey; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.config.KeyConfig; +import com.ff.tenant.service.ITenantGameQuotaService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +30,6 @@ import javax.annotation.Resource; @Slf4j public class ApiTenantController extends BaseController { - @Resource private ITenantGameQuotaService tenantGameQuotaService; @Resource @@ -45,8 +44,8 @@ public class ApiTenantController extends BaseController { public AjaxResult info() { TenantSecretKey tenantSecretKey = keyConfig.get(); TenantGameQuota tenantGameQuota = tenantGameQuotaService.selectTenantGameQuotaByTenantKey(tenantSecretKey.getTenantKey(), QuotaType.BALANCE.getCode()); - TenantInfoResponse tenantInfoResponse= new TenantInfoResponse(); - BeanUtils.copyProperties(tenantGameQuota,tenantInfoResponse); + TenantInfoResponse tenantInfoResponse = new TenantInfoResponse(); + BeanUtils.copyProperties(tenantGameQuota, tenantInfoResponse); return AjaxResult.success(tenantInfoResponse); } diff --git a/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaController.java b/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaController.java index efed705..273d775 100644 --- a/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaController.java +++ b/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaController.java @@ -1,25 +1,19 @@ package com.ff.common.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ff.base.annotation.Log; import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; -import com.ff.base.enums.BusinessType; -import com.ff.common.domain.TenantGameQuota; -import com.ff.common.service.ITenantGameQuotaService; -import com.ff.base.utils.poi.ExcelUtil; import com.ff.base.core.page.TableDataInfo; +import com.ff.base.enums.BusinessType; +import com.ff.base.utils.poi.ExcelUtil; +import com.ff.common.domain.TenantGameQuota; +import com.ff.tenant.service.ITenantGameQuotaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 租户游戏配额Controller @@ -29,8 +23,7 @@ import com.ff.base.core.page.TableDataInfo; */ @RestController @RequestMapping("/common/quota") -public class TenantGameQuotaController extends BaseController -{ +public class TenantGameQuotaController extends BaseController { @Autowired private ITenantGameQuotaService tenantGameQuotaService; @@ -39,8 +32,7 @@ public class TenantGameQuotaController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:quota:list')") @GetMapping("/list") - public TableDataInfo list(TenantGameQuota tenantGameQuota) - { + public TableDataInfo list(TenantGameQuota tenantGameQuota) { startPage(); List list = tenantGameQuotaService.selectTenantGameQuotaList(tenantGameQuota); return getDataTable(list); @@ -52,8 +44,7 @@ public class TenantGameQuotaController extends BaseController @PreAuthorize("@ss.hasPermi('common:quota:export')") @Log(title = "租户游戏配额", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, TenantGameQuota tenantGameQuota) - { + public void export(HttpServletResponse response, TenantGameQuota tenantGameQuota) { List list = tenantGameQuotaService.selectTenantGameQuotaList(tenantGameQuota); ExcelUtil util = new ExcelUtil(TenantGameQuota.class); util.exportExcel(response, list, "租户游戏配额数据"); @@ -64,8 +55,7 @@ public class TenantGameQuotaController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:quota:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(tenantGameQuotaService.selectTenantGameQuotaById(id)); } @@ -75,8 +65,7 @@ public class TenantGameQuotaController extends BaseController @PreAuthorize("@ss.hasPermi('common:quota:add')") @Log(title = "租户游戏配额", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody TenantGameQuota tenantGameQuota) - { + public AjaxResult add(@RequestBody TenantGameQuota tenantGameQuota) { return toAjax(tenantGameQuotaService.insertTenantGameQuota(tenantGameQuota)); } @@ -86,8 +75,7 @@ public class TenantGameQuotaController extends BaseController @PreAuthorize("@ss.hasPermi('common:quota:edit')") @Log(title = "租户游戏配额", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody TenantGameQuota tenantGameQuota) - { + public AjaxResult edit(@RequestBody TenantGameQuota tenantGameQuota) { return toAjax(tenantGameQuotaService.updateTenantGameQuota(tenantGameQuota)); } @@ -96,9 +84,8 @@ public class TenantGameQuotaController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:quota:remove')") @Log(title = "租户游戏配额", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(tenantGameQuotaService.deleteTenantGameQuotaByIds(ids)); } } diff --git a/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaFlowController.java b/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaFlowController.java index b2ac893..9ffee0c 100644 --- a/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaFlowController.java +++ b/ff-game/src/main/java/com/ff/common/controller/TenantGameQuotaFlowController.java @@ -1,25 +1,19 @@ package com.ff.common.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ff.base.annotation.Log; import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; -import com.ff.base.enums.BusinessType; -import com.ff.common.domain.TenantGameQuotaFlow; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.base.utils.poi.ExcelUtil; import com.ff.base.core.page.TableDataInfo; +import com.ff.base.enums.BusinessType; +import com.ff.base.utils.poi.ExcelUtil; +import com.ff.common.domain.TenantGameQuotaFlow; +import com.ff.tenant.service.ITenantGameQuotaFlowService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 租户游戏额度流水Controller @@ -29,8 +23,7 @@ import com.ff.base.core.page.TableDataInfo; */ @RestController @RequestMapping("/common/flow") -public class TenantGameQuotaFlowController extends BaseController -{ +public class TenantGameQuotaFlowController extends BaseController { @Autowired private ITenantGameQuotaFlowService tenantGameQuotaFlowService; @@ -39,8 +32,7 @@ public class TenantGameQuotaFlowController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:flow:list')") @GetMapping("/list") - public TableDataInfo list(TenantGameQuotaFlow tenantGameQuotaFlow) - { + public TableDataInfo list(TenantGameQuotaFlow tenantGameQuotaFlow) { startPage(); List list = tenantGameQuotaFlowService.selectTenantGameQuotaFlowList(tenantGameQuotaFlow); return getDataTable(list); @@ -52,8 +44,7 @@ public class TenantGameQuotaFlowController extends BaseController @PreAuthorize("@ss.hasPermi('common:flow:export')") @Log(title = "租户游戏额度流水", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, TenantGameQuotaFlow tenantGameQuotaFlow) - { + public void export(HttpServletResponse response, TenantGameQuotaFlow tenantGameQuotaFlow) { List list = tenantGameQuotaFlowService.selectTenantGameQuotaFlowList(tenantGameQuotaFlow); ExcelUtil util = new ExcelUtil(TenantGameQuotaFlow.class); util.exportExcel(response, list, "租户游戏额度流水数据"); @@ -64,8 +55,7 @@ public class TenantGameQuotaFlowController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:flow:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(tenantGameQuotaFlowService.selectTenantGameQuotaFlowById(id)); } @@ -75,8 +65,7 @@ public class TenantGameQuotaFlowController extends BaseController @PreAuthorize("@ss.hasPermi('common:flow:add')") @Log(title = "租户游戏额度流水", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody TenantGameQuotaFlow tenantGameQuotaFlow) - { + public AjaxResult add(@RequestBody TenantGameQuotaFlow tenantGameQuotaFlow) { return toAjax(tenantGameQuotaFlowService.insertTenantGameQuotaFlow(tenantGameQuotaFlow)); } @@ -86,8 +75,7 @@ public class TenantGameQuotaFlowController extends BaseController @PreAuthorize("@ss.hasPermi('common:flow:edit')") @Log(title = "租户游戏额度流水", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody TenantGameQuotaFlow tenantGameQuotaFlow) - { + public AjaxResult edit(@RequestBody TenantGameQuotaFlow tenantGameQuotaFlow) { return toAjax(tenantGameQuotaFlowService.updateTenantGameQuotaFlow(tenantGameQuotaFlow)); } @@ -96,9 +84,8 @@ public class TenantGameQuotaFlowController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:flow:remove')") @Log(title = "租户游戏额度流水", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(tenantGameQuotaFlowService.deleteTenantGameQuotaFlowByIds(ids)); } } diff --git a/ff-game/src/main/java/com/ff/common/controller/TenantQuotaExchangeController.java b/ff-game/src/main/java/com/ff/common/controller/TenantQuotaExchangeController.java index 662b270..8a75d14 100644 --- a/ff-game/src/main/java/com/ff/common/controller/TenantQuotaExchangeController.java +++ b/ff-game/src/main/java/com/ff/common/controller/TenantQuotaExchangeController.java @@ -1,25 +1,19 @@ package com.ff.common.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ff.base.annotation.Log; import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; -import com.ff.base.enums.BusinessType; -import com.ff.common.domain.TenantQuotaExchange; -import com.ff.common.service.ITenantQuotaExchangeService; -import com.ff.base.utils.poi.ExcelUtil; import com.ff.base.core.page.TableDataInfo; +import com.ff.base.enums.BusinessType; +import com.ff.base.utils.poi.ExcelUtil; +import com.ff.common.domain.TenantQuotaExchange; +import com.ff.tenant.service.ITenantQuotaExchangeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 币种汇率Controller @@ -29,8 +23,7 @@ import com.ff.base.core.page.TableDataInfo; */ @RestController @RequestMapping("/common/exchange") -public class TenantQuotaExchangeController extends BaseController -{ +public class TenantQuotaExchangeController extends BaseController { @Autowired private ITenantQuotaExchangeService tenantQuotaExchangeService; @@ -39,8 +32,7 @@ public class TenantQuotaExchangeController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:exchange:list')") @GetMapping("/list") - public TableDataInfo list(TenantQuotaExchange tenantQuotaExchange) - { + public TableDataInfo list(TenantQuotaExchange tenantQuotaExchange) { startPage(); List list = tenantQuotaExchangeService.selectTenantQuotaExchangeList(tenantQuotaExchange); return getDataTable(list); @@ -52,8 +44,7 @@ public class TenantQuotaExchangeController extends BaseController @PreAuthorize("@ss.hasPermi('common:exchange:export')") @Log(title = "币种汇率", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, TenantQuotaExchange tenantQuotaExchange) - { + public void export(HttpServletResponse response, TenantQuotaExchange tenantQuotaExchange) { List list = tenantQuotaExchangeService.selectTenantQuotaExchangeList(tenantQuotaExchange); ExcelUtil util = new ExcelUtil(TenantQuotaExchange.class); util.exportExcel(response, list, "币种汇率数据"); @@ -64,8 +55,7 @@ public class TenantQuotaExchangeController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:exchange:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(tenantQuotaExchangeService.selectTenantQuotaExchangeById(id)); } @@ -75,8 +65,7 @@ public class TenantQuotaExchangeController extends BaseController @PreAuthorize("@ss.hasPermi('common:exchange:add')") @Log(title = "币种汇率", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody TenantQuotaExchange tenantQuotaExchange) - { + public AjaxResult add(@RequestBody TenantQuotaExchange tenantQuotaExchange) { return toAjax(tenantQuotaExchangeService.insertTenantQuotaExchange(tenantQuotaExchange)); } @@ -86,8 +75,7 @@ public class TenantQuotaExchangeController extends BaseController @PreAuthorize("@ss.hasPermi('common:exchange:edit')") @Log(title = "币种汇率", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody TenantQuotaExchange tenantQuotaExchange) - { + public AjaxResult edit(@RequestBody TenantQuotaExchange tenantQuotaExchange) { return toAjax(tenantQuotaExchangeService.updateTenantQuotaExchange(tenantQuotaExchange)); } @@ -96,9 +84,8 @@ public class TenantQuotaExchangeController extends BaseController */ @PreAuthorize("@ss.hasPermi('common:exchange:remove')") @Log(title = "币种汇率", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(tenantQuotaExchangeService.deleteTenantQuotaExchangeByIds(ids)); } } diff --git a/ff-game/src/main/java/com/ff/config/ContentRefreshedEventListener.java b/ff-game/src/main/java/com/ff/config/ContentRefreshedEventListener.java index a1964ef..6e943b9 100644 --- a/ff-game/src/main/java/com/ff/config/ContentRefreshedEventListener.java +++ b/ff-game/src/main/java/com/ff/config/ContentRefreshedEventListener.java @@ -5,6 +5,7 @@ import com.ff.base.system.domain.SysDatasource; import com.ff.base.system.mapper.SysDatasourceMapper; import com.ff.base.system.service.ISysConfigService; import com.ff.base.system.service.ISysDictTypeService; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -38,6 +39,10 @@ public class ContentRefreshedEventListener implements ApplicationListener gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList( GameExchangeMoney.builder() .tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey()) diff --git a/ff-game/src/main/java/com/ff/game/api/jili/address/MyJILIAddressSource.java b/ff-game/src/main/java/com/ff/game/api/jili/address/MyJILIAddressSource.java index 592bae2..7d645c7 100644 --- a/ff-game/src/main/java/com/ff/game/api/jili/address/MyJILIAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/jili/address/MyJILIAddressSource.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ import javax.annotation.Resource; public class MyJILIAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/game/api/jili/service/impl/GamesJILIServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/jili/service/impl/GamesJILIServiceImpl.java index f2c36d3..580cdad 100644 --- a/ff-game/src/main/java/com/ff/game/api/jili/service/impl/GamesJILIServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/jili/service/impl/GamesJILIServiceImpl.java @@ -15,15 +15,11 @@ import com.ff.base.utils.sign.Md5Utils; import com.ff.base.utils.uuid.IdUtils; import com.ff.config.KeyConfig; import com.ff.game.api.IGamesService; -import com.ff.game.api.fc.dto.ApiCFBalanceTransferStatusResponseDTO; import com.ff.game.api.jili.client.JILIClient; import com.ff.game.api.jili.dto.*; import com.ff.game.api.request.*; import com.ff.game.domain.*; -import com.ff.game.service.IGameBettingDetailsService; -import com.ff.game.service.IGameExchangeMoneyService; -import com.ff.game.service.IGameFreeRecordService; -import com.ff.game.service.IGameService; +import com.ff.game.service.*; import com.ff.member.domain.Member; import com.ff.member.service.IMemberService; import lombok.extern.slf4j.Slf4j; @@ -63,6 +59,8 @@ public class GamesJILIServiceImpl implements IGamesService { @Resource private IGameService gameService; + @Resource + private IGameBiz gameBiz; @Resource @@ -503,7 +501,7 @@ public class GamesJILIServiceImpl implements IGamesService { List gameIds = createFreeSpinRequest.getGameIds(); GameUniqueDTO gameUniqueDTO = new GameUniqueDTO(); gameUniqueDTO.setGameIds(gameIds); - List gameList = gameService.selectGameUniqueList(gameUniqueDTO); + List gameList = gameBiz.selectGameUniqueList(gameUniqueDTO); String gameCodes = gameList.stream() .map(Game::getGameCode) .map(String::valueOf) diff --git a/ff-game/src/main/java/com/ff/game/api/km/address/MyKMAddressSource.java b/ff-game/src/main/java/com/ff/game/api/km/address/MyKMAddressSource.java index c93baab..01f35d3 100644 --- a/ff-game/src/main/java/com/ff/game/api/km/address/MyKMAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/km/address/MyKMAddressSource.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ import javax.annotation.Resource; public class MyKMAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/game/api/km/impl/GamesKMServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/km/impl/GamesKMServiceImpl.java index 189ca02..d010eb1 100644 --- a/ff-game/src/main/java/com/ff/game/api/km/impl/GamesKMServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/km/impl/GamesKMServiceImpl.java @@ -22,10 +22,7 @@ import com.ff.game.api.km.dto.*; import com.ff.game.api.request.*; import com.ff.game.api.xk.dto.XKGamesDTO; import com.ff.game.domain.*; -import com.ff.game.service.IGameBettingDetailsService; -import com.ff.game.service.IGameExchangeMoneyService; -import com.ff.game.service.IGameService; -import com.ff.game.service.IPlatformService; +import com.ff.game.service.*; import com.ff.member.domain.Member; import com.ff.member.service.IMemberService; import lombok.extern.slf4j.Slf4j; @@ -55,6 +52,8 @@ public class GamesKMServiceImpl implements IGamesService { @Resource private IPlatformService platformService; + @Resource + private IPlatformBiz platformBiz; @Resource private RedisCache redisCache; @@ -191,7 +190,7 @@ public class GamesKMServiceImpl implements IGamesService { kmUserToken = redisCache.getCacheObject(CacheConstants.KM_USER_TOKEN + gamesLogin.getAccount()); } - String loginUrl = platformService.get(GamePlatforms.KM.getCode()).getUrlInfo().getLoginUrl(); + String loginUrl = platformBiz.get(GamePlatforms.KM.getCode()).getUrlInfo().getLoginUrl(); return loginUrl + "/gamelauncher?gpcode=" + gamesLogin.getGameType() + "&gcode=" + gamesLogin.getGameId() @@ -595,7 +594,7 @@ public class GamesKMServiceImpl implements IGamesService { log.info("GamesKMServiceImpl [gameDemoLogin] 请求参数 {}", gameDemoLoginRequestDTO); Map params = new LinkedHashMap<>(); params.put("lang", gameDemoLoginRequestDTO.getLang()); - String loginUrl = platformService.get(GamePlatforms.KM.getCode()).getUrlInfo().getLoginUrl(); + String loginUrl = platformBiz.get(GamePlatforms.KM.getCode()).getUrlInfo().getLoginUrl(); //String selectConfigByKey = configService.selectConfigByKey(Constants.KM_API_BASE_LOGIN_URL); return GameDemoLoginResponseDTO.builder() .url(loginUrl + "/demolauncher?gpcode=" + gameDemoLoginRequestDTO.getGameType() diff --git a/ff-game/src/main/java/com/ff/game/api/meitian/address/MeiTianAddressSource.java b/ff-game/src/main/java/com/ff/game/api/meitian/address/MeiTianAddressSource.java index 299414b..470a8c0 100644 --- a/ff-game/src/main/java/com/ff/game/api/meitian/address/MeiTianAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/meitian/address/MeiTianAddressSource.java @@ -4,7 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; -import com.ff.game.service.IPlatformService; +import com.ff.game.service.IPlatformBiz; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -18,7 +18,7 @@ import javax.annotation.Resource; public class MeiTianAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/game/api/ng/address/MyNGAddressSource.java b/ff-game/src/main/java/com/ff/game/api/ng/address/MyNGAddressSource.java index 3a6b35a..59b43d3 100644 --- a/ff-game/src/main/java/com/ff/game/api/ng/address/MyNGAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/ng/address/MyNGAddressSource.java @@ -4,7 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; -import com.ff.game.service.IPlatformService; +import com.ff.game.service.IPlatformBiz; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -13,7 +13,7 @@ import javax.annotation.Resource; public class MyNGAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override diff --git a/ff-game/src/main/java/com/ff/game/api/ng/service/impl/GamesPGServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/ng/service/impl/GamesPGServiceImpl.java index 6f04a19..899aefb 100644 --- a/ff-game/src/main/java/com/ff/game/api/ng/service/impl/GamesPGServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/ng/service/impl/GamesPGServiceImpl.java @@ -21,9 +21,7 @@ import com.ff.game.api.request.*; import com.ff.game.domain.*; import com.ff.game.dto.GameBettingDetailsDTO; import com.ff.game.dto.GameDTO; -import com.ff.game.service.IGameBettingDetailsService; -import com.ff.game.service.IGameExchangeMoneyService; -import com.ff.game.service.IGameService; +import com.ff.game.service.*; import com.ff.member.domain.Member; import com.ff.member.service.IMemberService; import lombok.extern.slf4j.Slf4j; @@ -67,9 +65,13 @@ public class GamesPGServiceImpl implements IGamesService { @Resource private IGameExchangeMoneyService gameExchangeMoneyService; + @Resource + private IGameExchangeMoneyBiz gameExchangeMoneyBiz; @Resource private IGameService gameService; + @Resource + private IGameBiz gameBiz; @Resource @@ -286,7 +288,7 @@ public class GamesPGServiceImpl implements IGamesService { Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount()); - String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.PG.getCode(), 32); + String transactionId = gameExchangeMoneyBiz.getTransactionId(GamePlatforms.PG.getCode(), 32); List gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList( GameExchangeMoney.builder() .tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey()) @@ -679,7 +681,7 @@ public class GamesPGServiceImpl implements IGamesService { } String platform = ngPlatforms.getPlatform(); - List games = gameService.selectGameDTOList(GameDTO.builder() + List games = gameBiz.selectGameDTOList(GameDTO.builder() .gameName(resultBean.getGameName()) .platformCode(platform) .build()); diff --git a/ff-game/src/main/java/com/ff/game/api/pgt/address/MyPGTAddressSource.java b/ff-game/src/main/java/com/ff/game/api/pgt/address/MyPGTAddressSource.java index f8e4654..6386947 100644 --- a/ff-game/src/main/java/com/ff/game/api/pgt/address/MyPGTAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/pgt/address/MyPGTAddressSource.java @@ -3,10 +3,8 @@ package com.ff.game.api.pgt.address; import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; -import com.ff.base.constant.Constants; import com.ff.base.enums.GamePlatforms; -import com.ff.base.system.service.ISysConfigService; -import com.ff.game.service.IPlatformService; +import com.ff.game.service.IPlatformBiz; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -21,15 +19,12 @@ import javax.annotation.Resource; @Component public class MyPGTAddressSource implements AddressSource { @Resource - private IPlatformService platformService; - @Resource - private ISysConfigService configService; - + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { String apiBaseUrl = platformService.get(GamePlatforms.PGT.getCode()) .getUrlInfo().getUrl(); - return new ForestAddress("https",apiBaseUrl, 443,""); + return new ForestAddress("https", apiBaseUrl, 443, ""); } } \ No newline at end of file diff --git a/ff-game/src/main/java/com/ff/game/api/pgt/impl/GamesPGTServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/pgt/impl/GamesPGTServiceImpl.java index 48c42cf..bd5d4f8 100644 --- a/ff-game/src/main/java/com/ff/game/api/pgt/impl/GamesPGTServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/pgt/impl/GamesPGTServiceImpl.java @@ -66,6 +66,8 @@ public class GamesPGTServiceImpl implements IGamesService { @Resource private IGameExchangeMoneyService gameExchangeMoneyService; + @Resource + private IGameExchangeMoneyBiz gameExchangeMoneyBiz; @Resource private IGameService gameService; @@ -272,7 +274,7 @@ public class GamesPGTServiceImpl implements IGamesService { Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount()); - String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.PGX.getInfo(), 17); + String transactionId = gameExchangeMoneyBiz.getTransactionId(GamePlatforms.PGX.getInfo(), 17); List gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList( GameExchangeMoney.builder() .tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey()) diff --git a/ff-game/src/main/java/com/ff/game/api/pgx/address/MyPGXAddressSource.java b/ff-game/src/main/java/com/ff/game/api/pgx/address/MyPGXAddressSource.java index e3349d0..041a75c 100644 --- a/ff-game/src/main/java/com/ff/game/api/pgx/address/MyPGXAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/pgx/address/MyPGXAddressSource.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ import javax.annotation.Resource; public class MyPGXAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/game/api/pgx/impl/GamesPGXServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/pgx/impl/GamesPGXServiceImpl.java index ed72b4a..9557684 100644 --- a/ff-game/src/main/java/com/ff/game/api/pgx/impl/GamesPGXServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/pgx/impl/GamesPGXServiceImpl.java @@ -21,6 +21,7 @@ import com.ff.game.api.pgx.dto.*; import com.ff.game.api.request.*; import com.ff.game.domain.*; import com.ff.game.service.IGameBettingDetailsService; +import com.ff.game.service.IGameExchangeMoneyBiz; import com.ff.game.service.IGameExchangeMoneyService; import com.ff.game.service.IGameService; import com.ff.member.domain.Member; @@ -62,6 +63,8 @@ public class GamesPGXServiceImpl implements IGamesService { @Resource private IGameExchangeMoneyService gameExchangeMoneyService; + @Resource + private IGameExchangeMoneyBiz gameExchangeMoneyBiz; @Resource private IGameService gameService; @@ -279,7 +282,7 @@ public class GamesPGXServiceImpl implements IGamesService { Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount()); - String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.PGX.getInfo(), 17); + String transactionId = gameExchangeMoneyBiz.getTransactionId(GamePlatforms.PGX.getInfo(), 17); List gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList( GameExchangeMoney.builder() .tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey()) diff --git a/ff-game/src/main/java/com/ff/game/api/sa/address/MySAAddressSource.java b/ff-game/src/main/java/com/ff/game/api/sa/address/MySAAddressSource.java index de51edf..77ea979 100644 --- a/ff-game/src/main/java/com/ff/game/api/sa/address/MySAAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/sa/address/MySAAddressSource.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ import javax.annotation.Resource; public class MySAAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override diff --git a/ff-game/src/main/java/com/ff/game/api/sv388/address/SV388Adrress.java b/ff-game/src/main/java/com/ff/game/api/sv388/address/SV388Adrress.java index 4474614..b0bcfe4 100644 --- a/ff-game/src/main/java/com/ff/game/api/sv388/address/SV388Adrress.java +++ b/ff-game/src/main/java/com/ff/game/api/sv388/address/SV388Adrress.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ import javax.annotation.Resource; public class SV388Adrress implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/game/api/xk/address/MyXKAddressSource.java b/ff-game/src/main/java/com/ff/game/api/xk/address/MyXKAddressSource.java index 64144db..55b95f3 100644 --- a/ff-game/src/main/java/com/ff/game/api/xk/address/MyXKAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/xk/address/MyXKAddressSource.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -20,7 +21,7 @@ import javax.annotation.Resource; public class MyXKAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/game/service/IGameService.java b/ff-game/src/main/java/com/ff/game/service/IGameService.java deleted file mode 100644 index bab4681..0000000 --- a/ff-game/src/main/java/com/ff/game/service/IGameService.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.ff.game.service; - -import com.ff.api.response.GameResponse; -import com.ff.game.api.request.GameUniqueDTO; -import com.ff.game.domain.Game; -import com.ff.game.dto.GameDTO; - -import java.util.List; - -/** - * 平台子游戏管理Service接口 - * - * @author shi - * @date 2025-02-10 - */ -public interface IGameService { - /** - * 查询平台子游戏管理 - * - * @param id 平台子游戏管理主键 - * @return 平台子游戏管理 - */ - Game selectGameById(Long id); - - - /** - * 按游戏id选择游戏 - * - * @param gameId 游戏id - * @return {@link Game } - */ - Game selectGameByGameId(String gameId); - - /** - * 查询平台子游戏管理列表 - * - * @param game 平台子游戏管理 - * @return 平台子游戏管理集合 - */ - List selectGameList(Game game); - - - /** - * 选择游戏数据列表 - * - * @param gameDTO 游戏dto - * @return {@link List }<{@link Game }> - */ - List selectGameDTOList(GameDTO gameDTO); - - /** - * 新增平台子游戏管理 - * - * @param game 平台子游戏管理 - * @return 结果 - */ - int insertGame(Game game); - - /** - * 修改平台子游戏管理 - * - * @param game 平台子游戏管理 - * @return 结果 - */ - int updateGame(Game game); - - /** - * 批量删除平台子游戏管理 - * - * @param ids 需要删除的平台子游戏管理主键集合 - * @return 结果 - */ - int deleteGameByIds(Long[] ids); - - /** - * 删除平台子游戏管理信息 - * - * @param id 平台子游戏管理主键 - * @return 结果 - */ - int deleteGameById(Long id); - - /** - * 按平台id选择最大排序号 - * - * @return {@link Integer } - */ - Integer selectMaxSortNo(Integer platformType, String platformCode); - - /** - * 选择游戏唯一列表 - * - * @param gameUniqueDTO 游戏独有dto - * @return {@link List }<{@link Game }> - */ - List selectGameUniqueList(GameUniqueDTO gameUniqueDTO); - - /** - * 选择游戏响应列表 - * - * @return {@link List }<{@link GameResponse }> - */ - List selectGameResponseList(); - - -} diff --git a/ff-game/src/main/java/com/ff/game/service/impl/GameServiceImpl.java b/ff-game/src/main/java/com/ff/game/service/impl/GameServiceImpl.java deleted file mode 100644 index 78ed93d..0000000 --- a/ff-game/src/main/java/com/ff/game/service/impl/GameServiceImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.ff.game.service.impl; - -import cn.hutool.core.util.IdUtil; -import com.ff.api.response.GameResponse; -import com.ff.base.utils.DateUtils; -import com.ff.game.api.IGamesService; -import com.ff.game.api.request.GameUniqueDTO; -import com.ff.game.domain.Game; -import com.ff.game.dto.GameDTO; -import com.ff.game.mapper.GameMapper; -import com.ff.game.service.IGameService; -import com.ff.member.service.IMemberService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 平台子游戏管理Service业务层处理 - * - * @author shi - * @date 2025-02-10 - */ -@Service -@Slf4j -public class GameServiceImpl implements IGameService { - - @Autowired - private GameMapper gameMapper; - /** - * 查询平台子游戏管理 - * - * @param id 平台子游戏管理主键 - * @return 平台子游戏管理 - */ - @Override - public Game selectGameById(Long id) { - return gameMapper.selectGameById(id); - } - - /** - * 按游戏id选择游戏 - * - * @param gameId 游戏id - * @return {@link Game } - */ - @Override - public Game selectGameByGameId(String gameId) { - return gameMapper.selectGameByGameId(gameId); - } - - /** - * 查询平台子游戏管理列表 - * - * @param game 平台子游戏管理 - * @return 平台子游戏管理 - */ - @Override - public List selectGameList(Game game) { - return gameMapper.selectGameList(game); - } - - /** - * 选择游戏数据列表 - * - * @param gameDTO 游戏dto - * @return {@link List }<{@link Game }> - */ - @Override - public List selectGameDTOList(GameDTO gameDTO) { - return gameMapper.selectGameDTOList(gameDTO); - } - - /** - * 新增平台子游戏管理 - * - * @param game 平台子游戏管理 - * @return 结果 - */ - @Override - public int insertGame(Game game) { - if (game.getId() == null) { - game.setId(IdUtil.getSnowflakeNextId()); - } - game.setCreateTime(DateUtils.getNowDate()); - return gameMapper.insertGame(game); - } - - /** - * 修改平台子游戏管理 - * - * @param game 平台子游戏管理 - * @return 结果 - */ - @Override - public int updateGame(Game game) { - game.setUpdateTime(DateUtils.getNowDate()); - return gameMapper.updateGame(game); - } - - /** - * 批量删除平台子游戏管理 - * - * @param ids 需要删除的平台子游戏管理主键 - * @return 结果 - */ - @Override - public int deleteGameByIds(Long[] ids) { - return gameMapper.deleteGameByIds(ids); - } - - /** - * 删除平台子游戏管理信息 - * - * @param id 平台子游戏管理主键 - * @return 结果 - */ - @Override - public int deleteGameById(Long id) { - return gameMapper.deleteGameById(id); - } - - /** - * 选择游戏唯一列表 - * - * @param gameUniqueDTO 游戏独有dto - * @return {@link List }<{@link Game }> - */ - @Override - public List selectGameUniqueList(GameUniqueDTO gameUniqueDTO) { - return gameMapper.selectGameUniqueList(gameUniqueDTO); - } - - /** - * 选择游戏响应列表 - * - * @return {@link List }<{@link GameResponse }> - */ - @Override - public List selectGameResponseList() { - return gameMapper.selectGameResponseList(); - } - - @Override - public Integer selectMaxSortNo(Integer platformType, String platformCode) { - return gameMapper.selectMaxSortNoBy(platformType, platformCode); - } - - -} diff --git a/ff-game/src/main/java/com/ff/game/service/impl/PlatformBizImpl.java b/ff-game/src/main/java/com/ff/game/service/impl/PlatformBizImpl.java index b1ea441..c5b825a 100644 --- a/ff-game/src/main/java/com/ff/game/service/impl/PlatformBizImpl.java +++ b/ff-game/src/main/java/com/ff/game/service/impl/PlatformBizImpl.java @@ -6,7 +6,6 @@ import com.ff.base.datasource.DynamicDataSourceContextHolder; import com.ff.game.domain.Platform; import com.ff.game.mapper.PlatformMapper; import com.ff.game.service.IPlatformBiz; -import com.ff.game.service.IPlatformService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,7 +31,7 @@ public class PlatformBizImpl implements IPlatformBiz { Object key = entry.getKey(); // 设置数据源类型 DynamicDataSourceContextHolder.setDataSourceType(key.toString()); - List list = selectList(new Platform()); + List list = platformMapper.selectList(new Platform()); for (Platform pp : list) { redisCache.setCacheObject(getCacheKey(pp.getPlatformCode()), pp); } diff --git a/ff-game/src/main/java/com/ff/sports/db/address/DBSportsAddress.java b/ff-game/src/main/java/com/ff/sports/db/address/DBSportsAddress.java index c2e1843..3c6f51f 100644 --- a/ff-game/src/main/java/com/ff/sports/db/address/DBSportsAddress.java +++ b/ff-game/src/main/java/com/ff/sports/db/address/DBSportsAddress.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -21,7 +22,7 @@ import javax.annotation.Resource; public class DBSportsAddress implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/sports/fb/address/FBSportsAddress.java b/ff-game/src/main/java/com/ff/sports/fb/address/FBSportsAddress.java index e0aaa84..2ee8134 100644 --- a/ff-game/src/main/java/com/ff/sports/fb/address/FBSportsAddress.java +++ b/ff-game/src/main/java/com/ff/sports/fb/address/FBSportsAddress.java @@ -4,6 +4,7 @@ import com.dtflys.forest.callback.AddressSource; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -19,7 +20,7 @@ import javax.annotation.Resource; public class FBSportsAddress implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Override public ForestAddress getAddress(ForestRequest request) { diff --git a/ff-game/src/main/java/com/ff/tenant/controller/TenantBettingDetailsController.java b/ff-game/src/main/java/com/ff/tenant/controller/TenantBettingDetailsController.java index 1b5f853..b43ee4f 100644 --- a/ff-game/src/main/java/com/ff/tenant/controller/TenantBettingDetailsController.java +++ b/ff-game/src/main/java/com/ff/tenant/controller/TenantBettingDetailsController.java @@ -1,19 +1,10 @@ package com.ff.tenant.controller; import com.ff.base.core.controller.BaseController; -import com.ff.base.core.domain.AjaxResult; import com.ff.base.core.page.TableDataInfo; -import com.ff.base.system.domain.TenantPlatform; -import com.ff.base.system.domain.TenantSecretKey; -import com.ff.base.system.service.ITenantPlatformService; -import com.ff.base.system.service.ITenantSecretKeyService; -import com.ff.common.domain.TenantGameQuota; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.game.domain.GameBettingDetails; import com.ff.game.dto.GameBettingDetailsDTO; import com.ff.game.service.IGameBettingDetailsService; -import com.ff.tenant.dto.TenantDTO; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,8 +37,7 @@ public class TenantBettingDetailsController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tenant:betting:list')") @GetMapping("/list") - public TableDataInfo list(GameBettingDetailsDTO gameBettingDetails) - { + public TableDataInfo list(GameBettingDetailsDTO gameBettingDetails) { gameBettingDetails.setTenantKey(getUsername()); startPage(); List gameBettingDetailsList = gameBettingDetailsService.selectGameBettingDetailsList(gameBettingDetails); diff --git a/ff-game/src/main/java/com/ff/tenant/controller/TenantController.java b/ff-game/src/main/java/com/ff/tenant/controller/TenantController.java index 9df1415..a7918d2 100644 --- a/ff-game/src/main/java/com/ff/tenant/controller/TenantController.java +++ b/ff-game/src/main/java/com/ff/tenant/controller/TenantController.java @@ -4,15 +4,16 @@ import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; import com.ff.base.system.domain.TenantPlatform; import com.ff.base.system.domain.TenantSecretKey; -import com.ff.base.system.service.ITenantAgentService; import com.ff.base.system.service.ITenantPlatformService; import com.ff.base.system.service.ITenantSecretKeyService; import com.ff.common.domain.TenantGameQuota; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.tenant.dto.TenantDTO; +import com.ff.tenant.service.ITenantGameQuotaService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -57,8 +58,8 @@ public class TenantController extends BaseController { @GetMapping("/platforms/{currencyCode}") public AjaxResult getTenantPlatformsInfo(@PathVariable("currencyCode") String currencyCode) { return success(tenantPlatformService.selectTenantPlatformList(TenantPlatform.builder() - .currencyCode(currencyCode) - .tenantId(getUserId()) + .currencyCode(currencyCode) + .tenantId(getUserId()) .build())); } diff --git a/ff-game/src/main/java/com/ff/tenant/controller/TenantExchangeController.java b/ff-game/src/main/java/com/ff/tenant/controller/TenantExchangeController.java index c1f4dd3..0ecbc17 100644 --- a/ff-game/src/main/java/com/ff/tenant/controller/TenantExchangeController.java +++ b/ff-game/src/main/java/com/ff/tenant/controller/TenantExchangeController.java @@ -6,6 +6,7 @@ import com.ff.game.domain.GameBettingDetails; import com.ff.game.domain.GameExchangeMoney; import com.ff.game.dto.GameExchangeMoneyDTO; import com.ff.game.service.IGameBettingDetailsService; +import com.ff.game.service.IGameExchangeMoneyBiz; import com.ff.game.service.IGameExchangeMoneyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,6 +32,8 @@ public class TenantExchangeController extends BaseController { @Resource private IGameExchangeMoneyService gameExchangeMoneyService; + @Resource + private IGameExchangeMoneyBiz gameExchangeMoneyBiz; /** * 列表 @@ -43,7 +46,7 @@ public class TenantExchangeController extends BaseController { public TableDataInfo list(GameExchangeMoneyDTO gameExchangeMoneyDTO) { gameExchangeMoneyDTO.setTenantKey(getUsername()); startPage(); - List gameExchangeMoneyDTOS = gameExchangeMoneyService.selectGameExchangeMoneyDTOList(gameExchangeMoneyDTO); + List gameExchangeMoneyDTOS = gameExchangeMoneyBiz.selectGameExchangeMoneyDTOList(gameExchangeMoneyDTO); return getDataTable(gameExchangeMoneyDTOS); } diff --git a/ff-game/src/main/java/com/ff/tenant/controller/TenantQuotaFlowController.java b/ff-game/src/main/java/com/ff/tenant/controller/TenantQuotaFlowController.java index 55948ac..cb3f67c 100644 --- a/ff-game/src/main/java/com/ff/tenant/controller/TenantQuotaFlowController.java +++ b/ff-game/src/main/java/com/ff/tenant/controller/TenantQuotaFlowController.java @@ -3,10 +3,7 @@ package com.ff.tenant.controller; import com.ff.base.core.controller.BaseController; import com.ff.base.core.page.TableDataInfo; import com.ff.common.domain.TenantGameQuotaFlow; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.game.domain.GameBettingDetails; -import com.ff.game.service.IGameBettingDetailsService; -import org.springframework.beans.factory.annotation.Autowired; +import com.ff.tenant.service.ITenantGameQuotaFlowService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,7 +24,6 @@ import java.util.List; public class TenantQuotaFlowController extends BaseController { - @Resource private ITenantGameQuotaFlowService tenantGameQuotaFlowService; @@ -40,8 +36,7 @@ public class TenantQuotaFlowController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tenant:quota:flow:list')") @GetMapping("/list") - public TableDataInfo list(TenantGameQuotaFlow tenantGameQuotaFlow) - { + public TableDataInfo list(TenantGameQuotaFlow tenantGameQuotaFlow) { tenantGameQuotaFlow.setTenantKey(getUsername()); startPage(); List tenantGameQuotaFlows = tenantGameQuotaFlowService.selectTenantGameQuotaFlowList(tenantGameQuotaFlow); diff --git a/ff-game/src/main/resources/mapper/game/GameBizMapper.xml b/ff-game/src/main/resources/mapper/game/GameBizMapper.xml index 452da98..3b61850 100644 --- a/ff-game/src/main/resources/mapper/game/GameBizMapper.xml +++ b/ff-game/src/main/resources/mapper/game/GameBizMapper.xml @@ -24,7 +24,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - + + select * from ff_game +