diff --git a/ff-base/src/main/java/com/ff/base/enums/ErrorCode.java b/ff-base/src/main/java/com/ff/base/enums/ErrorCode.java index 26f4173..943cbe6 100644 --- a/ff-base/src/main/java/com/ff/base/enums/ErrorCode.java +++ b/ff-base/src/main/java/com/ff/base/enums/ErrorCode.java @@ -23,6 +23,7 @@ public enum ErrorCode { FREQUENT_INTERFACE_REQUESTS (1007, "接口请求频繁"), BALANCE_TRANSFER_FAILED (1008, "余额转移失败"), LANG_NOT_EXIST(1009, "游戏平台不支持的语言"), + ORDER_NOT_EXIST(1010, "订单不存在") ; // 获取错误码 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 89a8f71..e5fb141 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 @@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -236,6 +237,29 @@ public class ApiGameController extends BaseController { } + /** + * 交换状态 + * + * @param gameExchangeStateRequest 游戏兑换余额状态请求 + * @return {@link AjaxResult } + */ + @PostMapping("/exchange/state") + @Transactional + public AjaxResult exchangeState(@Validated @RequestBody GameExchangeStateRequest gameExchangeStateRequest) { + TenantSecretKey tenantSecretKey = keyConfig.get(); + GameExchangeMoney gameExchangeMoney = GameExchangeMoney.builder() + .tenantKey(tenantSecretKey.getTenantKey()) + .orderId(gameExchangeStateRequest.getOrderId()) + .build(); + List gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(gameExchangeMoney); + ApiException.isTrue(!CollectionUtils.isEmpty(gameExchangeMonies), ErrorCode.ORDER_NOT_EXIST.getCode()); + GameExchangeBalanceResponse gameExchangeBalanceResponse = new GameExchangeBalanceResponse(); + BeanUtils.copyProperties(gameExchangeMonies.get(0), gameExchangeBalanceResponse); + return AjaxResult.success(gameExchangeBalanceResponse); + } + + + /** * 赠送免费局数 * diff --git a/ff-game/src/main/java/com/ff/api/request/GameExchangeStateRequest.java b/ff-game/src/main/java/com/ff/api/request/GameExchangeStateRequest.java new file mode 100644 index 0000000..e58bd5c --- /dev/null +++ b/ff-game/src/main/java/com/ff/api/request/GameExchangeStateRequest.java @@ -0,0 +1,21 @@ +package com.ff.api.request; + + +import lombok.Data; + +import java.io.Serializable; + +/** + * 游戏交换状态请求 + * + * @author shi + * @date 2025/03/14 + */ +@Data +public class GameExchangeStateRequest implements Serializable { + private final static long serialVersionUID = 5862750025968209889L; + /** + * 交易编号 + */ + private String orderId; +} diff --git a/ff-game/src/main/java/com/ff/api/response/GameExchangeBalanceResponse.java b/ff-game/src/main/java/com/ff/api/response/GameExchangeBalanceResponse.java index 3b27b5a..04bcd80 100644 --- a/ff-game/src/main/java/com/ff/api/response/GameExchangeBalanceResponse.java +++ b/ff-game/src/main/java/com/ff/api/response/GameExchangeBalanceResponse.java @@ -62,8 +62,9 @@ public class GameExchangeBalanceResponse implements Serializable /** 转出类型 1游戏商转入到用户全部转出 2 用户转移到游戏商 */ private Integer exchangeType; - /** 状态 1 成功 2失败 */ + /** 状态,0:进行中、1:成功、2:失败 */ private Integer status; + }