From 01178478e09ad1ec8272d589b9634c93fd6c0e5a Mon Sep 17 00:00:00 2001 From: shi Date: Sat, 12 Apr 2025 15:06:38 +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=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新了多个类中的服务接口引用 - 重命名了部分接口和类，如 IPlatformService 改为 IPlatformBiz - 调整了部分代码结构，提高了代码的可读性和可维护性 --- .../impl/GameExchangeMoneyServiceImpl.java | 1 + .../java/com/ff/exception/ApiException.java | 5 ++-- .../src/main/java}/enums/ErrorCode.java | 2 +- .../ff/api/controller/ApiGameController.java | 2 +- .../java/com/ff/base/enums/TimeOutType.java | 25 +++++++++++++++++++ .../java/com/ff/base/enums/TriggerType.java | 20 +++++++++++++++ .../game/api/db/impl/DBSportsServiceImpl.java | 5 +++- .../exchange/impl/AddBalanceServiceImpl.java | 9 ++++--- .../impl/DeductBalanceServiceImpl.java | 10 +++++--- .../impl/PlatformTransactionServiceImpl.java | 5 ++-- .../game/api/fc/impl/GamesFCServiceImpl.java | 2 +- .../ng/service/impl/GamesPGServiceImpl.java | 2 +- .../api/pgt/impl/GamesPGTServiceImpl.java | 2 +- .../api/pgx/impl/GamesPGXServiceImpl.java | 2 +- .../api/pp/address/MyPPAddressSource.java | 9 ++++--- .../controller/GamePlatformController.java | 5 ++-- .../service/impl/TenantGameQuotaBizImpl.java | 4 --- .../java/com/ff/impl/DBSportsServiceImpl.java | 2 +- 18 files changed, 81 insertions(+), 31 deletions(-) rename ff-bean/{xk-client/src/main/java/com/ff => ff-exception/src/main/java}/enums/ErrorCode.java (98%) create mode 100644 ff-game/src/main/java/com/ff/base/enums/TimeOutType.java create mode 100644 ff-game/src/main/java/com/ff/base/enums/TriggerType.java diff --git a/ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java b/ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java index 8985c45..7262e46 100644 --- a/ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java +++ b/ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil; import com.ff.game.domain.GameExchangeMoney; import com.ff.game.mapper.GameExchangeMoneyMapper; import com.ff.game.service.IGameExchangeMoneyService; +import com.ff.utils.DateUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ff-bean/ff-exception/src/main/java/com/ff/exception/ApiException.java b/ff-bean/ff-exception/src/main/java/com/ff/exception/ApiException.java index 1b6f286..188596a 100644 --- a/ff-bean/ff-exception/src/main/java/com/ff/exception/ApiException.java +++ b/ff-bean/ff-exception/src/main/java/com/ff/exception/ApiException.java @@ -1,8 +1,9 @@ package com.ff.exception; -import com.ff.base.enums.ErrorCode; + +import com.sun.istack.internal.Nullable; +import enums.ErrorCode; import lombok.Getter; -import org.springframework.lang.Nullable; /** * 基础异常 diff --git a/ff-bean/xk-client/src/main/java/com/ff/enums/ErrorCode.java b/ff-bean/ff-exception/src/main/java/enums/ErrorCode.java similarity index 98% rename from ff-bean/xk-client/src/main/java/com/ff/enums/ErrorCode.java rename to ff-bean/ff-exception/src/main/java/enums/ErrorCode.java index 7a3195b..9197444 100644 --- a/ff-bean/xk-client/src/main/java/com/ff/enums/ErrorCode.java +++ b/ff-bean/ff-exception/src/main/java/enums/ErrorCode.java @@ -1,4 +1,4 @@ -package com.ff.enums; +package enums; import lombok.Getter; 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 d972121..8fe7fb6 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 @@ -83,7 +83,7 @@ public class ApiGameController extends BaseController { private IMemberService memberService; @Resource - private ITenantGameQuotaService tenantGameQuotaService; + private ITenantGameQuotaBiz tenantGameQuotaService; @Resource private ITenantGameQuotaBiz tenantGameQuotaBiz; diff --git a/ff-game/src/main/java/com/ff/base/enums/TimeOutType.java b/ff-game/src/main/java/com/ff/base/enums/TimeOutType.java new file mode 100644 index 0000000..d1ea786 --- /dev/null +++ b/ff-game/src/main/java/com/ff/base/enums/TimeOutType.java @@ -0,0 +1,25 @@ +package com.ff.base.enums; + +import com.alibaba.druid.filter.AutoLoad; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 超时类型 + * + * @author shi + * @date 2025/04/09 + */ +@AllArgsConstructor +@Getter +public enum TimeOutType { + GAME_EXCHANGE_MONEY("gameExchangeMoney", "游戏余额转移"); + /** + * 代码 + */ + private final String code; + /** + * 信息 + */ + private final String info; +} diff --git a/ff-game/src/main/java/com/ff/base/enums/TriggerType.java b/ff-game/src/main/java/com/ff/base/enums/TriggerType.java new file mode 100644 index 0000000..719732b --- /dev/null +++ b/ff-game/src/main/java/com/ff/base/enums/TriggerType.java @@ -0,0 +1,20 @@ +package com.ff.base.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 触发类型 + * + * @author shi + * @date 2025/04/09 + */ +@Getter +@AllArgsConstructor +public enum TriggerType { + MANUAL(1, "用户调用手动触发"), + TIMER(2, "定时器触发"); + + private final int code; + private final String description; +} diff --git a/ff-game/src/main/java/com/ff/game/api/db/impl/DBSportsServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/db/impl/DBSportsServiceImpl.java index a2d158b..37416e9 100644 --- a/ff-game/src/main/java/com/ff/game/api/db/impl/DBSportsServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/db/impl/DBSportsServiceImpl.java @@ -16,6 +16,7 @@ import com.ff.game.api.db.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; @@ -54,6 +55,8 @@ public class DBSportsServiceImpl implements IGamesService { @Resource private IGameService gameService; + @Resource + private IGameExchangeMoneyBiz gameExchangeMoneyBiz; @Resource @@ -221,7 +224,7 @@ public class DBSportsServiceImpl implements IGamesService { */ @Override public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) { - return gameExchangeMoneyService.getTransactionId(GamePlatforms.DBSports.getInfo(), 11); + return gameExchangeMoneyBiz.getTransactionId(GamePlatforms.DBSports.getInfo(), 11); } /** diff --git a/ff-game/src/main/java/com/ff/game/api/exchange/impl/AddBalanceServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/exchange/impl/AddBalanceServiceImpl.java index b45e7d3..714adaf 100644 --- a/ff-game/src/main/java/com/ff/game/api/exchange/impl/AddBalanceServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/exchange/impl/AddBalanceServiceImpl.java @@ -7,8 +7,6 @@ import com.ff.base.utils.StringUtils; import com.ff.common.domain.TenantGameQuotaFlow; import com.ff.common.dto.BalanceChangesDTO; import com.ff.common.dto.GameBalanceExchange; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.game.api.IGamesService; import com.ff.game.api.exchange.AbstractStepProcessor; import com.ff.game.api.exchange.dto.GameExchangeDTO; @@ -18,9 +16,12 @@ import com.ff.game.api.request.ExchangeTransferStatusResponseDTO; import com.ff.game.domain.KeyInfo; import com.ff.game.domain.Platform; import com.ff.game.service.IGameExchangeMoneyService; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; @@ -49,13 +50,13 @@ public class AddBalanceServiceImpl extends AbstractStepProcessor { private IMemberService memberService; @Resource - private ITenantGameQuotaService tenantGameQuotaService; + private ITenantGameQuotaBiz tenantGameQuotaService; @Resource private IGameExchangeMoneyService gameExchangeMoneyService; @Resource private PlatformTransactionManager transactionManager; @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; /** * 步进键 * diff --git a/ff-game/src/main/java/com/ff/game/api/exchange/impl/DeductBalanceServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/exchange/impl/DeductBalanceServiceImpl.java index a400b1c..3822307 100644 --- a/ff-game/src/main/java/com/ff/game/api/exchange/impl/DeductBalanceServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/exchange/impl/DeductBalanceServiceImpl.java @@ -11,8 +11,6 @@ import com.ff.common.domain.TenantGameQuota; import com.ff.common.domain.TenantGameQuotaFlow; import com.ff.common.dto.BalanceChangesDTO; import com.ff.common.dto.GameBalanceExchange; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.game.api.exchange.AbstractStepProcessor; import com.ff.game.api.exchange.StepProcessorFactory; import com.ff.game.api.exchange.dto.GameExchangeDTO; @@ -20,8 +18,12 @@ import com.ff.game.domain.GameExchangeMoney; import com.ff.game.domain.KeyInfo; import com.ff.game.domain.Platform; import com.ff.game.service.IGameExchangeMoneyService; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import com.ff.member.service.IMemberService; +import com.ff.tenant.service.ITenantGameQuotaBiz; +import com.ff.tenant.service.ITenantGameQuotaFlowService; +import com.ff.tenant.service.ITenantGameQuotaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; @@ -49,13 +51,13 @@ public class DeductBalanceServiceImpl extends AbstractStepProcessor { private IGameExchangeMoneyService gameExchangeMoneyService; @Resource - private ITenantGameQuotaService tenantGameQuotaService; + private ITenantGameQuotaBiz tenantGameQuotaService; @Resource private IMemberService memberService; @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Resource private ITenantGameQuotaFlowService tenantGameQuotaFlowService; @Autowired diff --git a/ff-game/src/main/java/com/ff/game/api/exchange/impl/PlatformTransactionServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/exchange/impl/PlatformTransactionServiceImpl.java index f0c5798..e476747 100644 --- a/ff-game/src/main/java/com/ff/game/api/exchange/impl/PlatformTransactionServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/exchange/impl/PlatformTransactionServiceImpl.java @@ -7,8 +7,6 @@ import com.ff.base.utils.StringUtils; import com.ff.common.domain.TenantGameQuotaFlow; import com.ff.common.dto.BalanceChangesDTO; import com.ff.common.dto.GameBalanceExchange; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.common.service.ITenantGameQuotaService; import com.ff.game.api.IGamesService; import com.ff.game.api.exchange.AbstractStepProcessor; import com.ff.game.api.exchange.dto.GameExchangeDTO; @@ -19,6 +17,7 @@ import com.ff.game.domain.GameExchangeMoney; import com.ff.game.domain.KeyInfo; import com.ff.game.domain.Platform; import com.ff.game.service.IGameExchangeMoneyService; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import com.ff.member.domain.Member; import com.ff.member.service.IMemberService; @@ -50,7 +49,7 @@ public class PlatformTransactionServiceImpl extends AbstractStepProcessor { private IMemberService memberService; @Resource - private IPlatformService platformService; + private IPlatformBiz platformService; @Autowired private Map gamesService; diff --git a/ff-game/src/main/java/com/ff/game/api/fc/impl/GamesFCServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/fc/impl/GamesFCServiceImpl.java index c229ec9..f2381cf 100644 --- a/ff-game/src/main/java/com/ff/game/api/fc/impl/GamesFCServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/fc/impl/GamesFCServiceImpl.java @@ -379,7 +379,7 @@ public class GamesFCServiceImpl implements IGamesService { */ @Override public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) { - return gameExchangeMoneyService.getTransactionId(GamePlatforms.FC.getInfo(), 30); + return gameExchangeMoneyBiz.getTransactionId(GamePlatforms.FC.getInfo(), 30); } 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 f99c8c0..e670823 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 @@ -290,7 +290,7 @@ public class GamesPGServiceImpl implements IGamesService { */ @Override public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) { - return gameExchangeMoneyService.getTransactionId(GamePlatforms.PG.getCode(), 32); + return gameExchangeMoneyBiz.getTransactionId(GamePlatforms.PG.getCode(), 32); } 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 508b072..3d1564e 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 @@ -271,7 +271,7 @@ public class GamesPGTServiceImpl implements IGamesService { */ @Override public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) { - return gameExchangeMoneyService.getTransactionId(GamePlatforms.PGT.getInfo(), 17); + return gameExchangeMoneyBiz.getTransactionId(GamePlatforms.PGT.getInfo(), 17); } /** * 按代理id进行交换转账 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 9c3c973..7d91776 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 @@ -447,7 +447,7 @@ public class GamesPGXServiceImpl implements IGamesService { */ @Override public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) { - return gameExchangeMoneyService.getTransactionId(GamePlatforms.PGX.getInfo(), 17); + return gameExchangeMoneyBiz.getTransactionId(GamePlatforms.PGX.getInfo(), 17); } diff --git a/ff-game/src/main/java/com/ff/game/api/pp/address/MyPPAddressSource.java b/ff-game/src/main/java/com/ff/game/api/pp/address/MyPPAddressSource.java index 2a2fb7b..18c0894 100644 --- a/ff-game/src/main/java/com/ff/game/api/pp/address/MyPPAddressSource.java +++ b/ff-game/src/main/java/com/ff/game/api/pp/address/MyPPAddressSource.java @@ -6,6 +6,7 @@ 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.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.stereotype.Component; @@ -21,16 +22,16 @@ import javax.annotation.Resource; @Component public class MyPPAddressSource implements AddressSource { @Resource - private IPlatformService platformService; + private IPlatformBiz platformBiz; @Override public ForestAddress getAddress(ForestRequest request) { - String apiBaseUrl = platformService.get(GamePlatforms.PP.getCode()) + String apiBaseUrl = platformBiz.get(GamePlatforms.PP.getCode()) .getUrlInfo().getUrl(); - String host = platformService.get(GamePlatforms.PP.getCode()) + String host = platformBiz.get(GamePlatforms.PP.getCode()) .getUrlInfo().getHost(); - String https = platformService.get(GamePlatforms.PP.getCode()) + String https = platformBiz.get(GamePlatforms.PP.getCode()) .getUrlInfo().getHttps(); return new ForestAddress(https,apiBaseUrl, Integer.parseInt(host),"/IntegrationService/v3/http/CasinoGameAPI"); } diff --git a/ff-game/src/main/java/com/ff/game/controller/GamePlatformController.java b/ff-game/src/main/java/com/ff/game/controller/GamePlatformController.java index cca88be..e307977 100644 --- a/ff-game/src/main/java/com/ff/game/controller/GamePlatformController.java +++ b/ff-game/src/main/java/com/ff/game/controller/GamePlatformController.java @@ -3,6 +3,7 @@ package com.ff.game.controller; import com.ff.base.core.controller.BaseController; import com.ff.base.core.domain.AjaxResult; import com.ff.base.enums.GamePlatforms; +import com.ff.game.service.IPlatformBiz; import com.ff.game.service.IPlatformService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +24,7 @@ public class GamePlatformController extends BaseController { @Resource - private IPlatformService platformService; + private IPlatformBiz platformBiz; /** * 选择 @@ -44,7 +45,7 @@ public class GamePlatformController extends BaseController { @PreAuthorize("@ss.hasPermi('game:platform:all')") @GetMapping("/all") public AjaxResult all() { - platformService.loadToCache(); + platformBiz.loadToCache(); return AjaxResult.success(); } } diff --git a/ff-game/src/main/java/com/ff/tenant/service/impl/TenantGameQuotaBizImpl.java b/ff-game/src/main/java/com/ff/tenant/service/impl/TenantGameQuotaBizImpl.java index 2129678..17acd03 100644 --- a/ff-game/src/main/java/com/ff/tenant/service/impl/TenantGameQuotaBizImpl.java +++ b/ff-game/src/main/java/com/ff/tenant/service/impl/TenantGameQuotaBizImpl.java @@ -21,8 +21,6 @@ import com.ff.base.system.domain.TenantSecretKey; import com.ff.common.dto.BalanceChangesDTO; import com.ff.common.dto.BalanceRealChangesDTO; import com.ff.common.dto.GameBalanceExchange; -import com.ff.common.service.ITenantGameQuotaFlowService; -import com.ff.common.service.ITenantQuotaExchangeService; import com.ff.base.system.service.ITenantSecretKeyService; import com.ff.game.api.IGamesService; import com.ff.game.api.request.MemberInfoRequestDTO; @@ -34,9 +32,7 @@ import com.ff.tenant.service.ITenantGameQuotaFlowService; import com.ff.tenant.service.ITenantQuotaExchangeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ff.common.mapper.TenantGameQuotaMapper; import com.ff.common.domain.TenantGameQuota; -import com.ff.common.service.ITenantGameQuotaService; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/ff-platform/xk-dbsports/src/main/java/com/ff/impl/DBSportsServiceImpl.java b/ff-platform/xk-dbsports/src/main/java/com/ff/impl/DBSportsServiceImpl.java index 4ebc174..ef08559 100644 --- a/ff-platform/xk-dbsports/src/main/java/com/ff/impl/DBSportsServiceImpl.java +++ b/ff-platform/xk-dbsports/src/main/java/com/ff/impl/DBSportsServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.IdUtil; import com.ff.client.DBSportsClient; import com.ff.client.IGamesService; import com.ff.dto.*; -import com.ff.enums.ErrorCode; +import enums.ErrorCode; import com.ff.enums.GamePlatforms; import com.ff.enums.PlatformType; import com.ff.enums.StatusType;