diff --git a/ff-base/src/main/java/com/ff/base/constant/CacheConstants.java b/ff-base/src/main/java/com/ff/base/constant/CacheConstants.java index 08791ae..1a2895d 100644 --- a/ff-base/src/main/java/com/ff/base/constant/CacheConstants.java +++ b/ff-base/src/main/java/com/ff/base/constant/CacheConstants.java @@ -63,6 +63,12 @@ public class CacheConstants */ public static final String FC_GAMES= "fc_games:"; + /** + * sa游戏 + */ + public static final String SA_GAMES= "sa_games:"; + + /** * pg游戏投注货币 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 99cb218..599b792 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 @@ -28,6 +28,7 @@ public enum ErrorCode { INSUFFICIENT_PLAYER_BALANCE(1012, "玩家余额不足"), KICK_OUT_AILED(1013, "玩家踢出失败"), ACCOUNT_NOT_ONLINE(1014, "账号不在线"), + FREQUENT_BALANCE_TRANSFER(1015, "当前游戏账号余额转移频繁"), ; // 获取错误码 diff --git a/ff-base/src/main/java/com/ff/base/enums/GamePlatforms.java b/ff-base/src/main/java/com/ff/base/enums/GamePlatforms.java index 2cf8761..1343a79 100644 --- a/ff-base/src/main/java/com/ff/base/enums/GamePlatforms.java +++ b/ff-base/src/main/java/com/ff/base/enums/GamePlatforms.java @@ -8,6 +8,7 @@ public enum GamePlatforms { XK("XK", "XK"), PG("PG", "PG"), FC("FC", "FC"), + SA("SA", "SA"), ; private final String code; diff --git a/ff-base/src/main/java/com/ff/base/enums/SAGameType.java b/ff-base/src/main/java/com/ff/base/enums/SAGameType.java new file mode 100644 index 0000000..2171f23 --- /dev/null +++ b/ff-base/src/main/java/com/ff/base/enums/SAGameType.java @@ -0,0 +1,64 @@ +package com.ff.base.enums; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; + +/** + * sagame类型 + * + * @author shi + * @date 2025/03/26 + */ +@Getter +@AllArgsConstructor +public enum SAGameType { + // 编号与名称映射 + M_COLOR_DISC(531, "M 色碟"), + M_DICE_BAO(532, "M 骰宝"), + M_ROULETTE(533, "M 轮盘"), + M_DRAGON_TIGER(534, "M 龙虎"), + M_BODING(535, "M 博丁"), + M_BLACKJACK(536, "M 黑杰克"), + M_ANDABAH(537, "M 安达巴哈"), + M_INDIA_ZHA_ZHENG(538, "M 印度炸金花"), + M_THAI_DICE_BAO(539, "M 泰国骰宝"), + M_FISH_SHRIMP_CRAB(540, "M 鱼虾蟹"), + C_ROULETTE(861, "C 轮盘"), + C_BACCARAT_C01(871, "百家乐 C01"), + C_BACCARAT_C02(872, "百家乐 C02"), + C_BACCARAT_C03(873, "百家乐 C03"), + C_BACCARAT_C04(874, "百家乐 C04"), + C_BACCARAT_C05(875, "百家乐 C05"), + C_BACCARAT_C06(876, "百家乐 C06"), + C_BACCARAT_C07(877, "百家乐 C07"), + C_FAST_BACCARAT_C08(878, "极速百家乐 C08"), + D_BACCARAT_D01(901, "百家乐 D01"), + D_BACCARAT_D02(902, "百家乐 D02"), + D_BACCARAT_D03(903, "百家乐 D03"), + D_BACCARAT_D04(904, "百家乐 D04"), + D_BACCARAT_D05(905, "百家乐 D05"), + D_BACCARAT_D06(906, "百家乐 D06"), + D_BACCARAT_D07(907, "百家乐 D07"), + D_FAST_BACCARAT_D08(908, "极速百家乐 D08"), + D_BLACKJACK(921, "D 黑杰克"), + D_DRAGON_TIGER(922, "D 龙虎"), + D_BODING(923, "D 博丁"), + D_ROULETTE(924, "D 轮盘"), + D_DICE_BAO(925, "D 骰宝"), + D_THAI_DICE_BAO(926, "D 泰国骰宝"), + D_COLOR_DISC(927, "D 色碟"); + + + private final int code; + private final String name; + + public static String getNameByCode(int code) { + for (SAGameType gameType : values()) { + if (gameType.getCode() == code) { + return gameType.getName(); + } + } + return null; + } +} diff --git a/ff-game/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java b/ff-game/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java index b592727..3186d9e 100644 --- a/ff-game/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java +++ b/ff-game/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java @@ -291,7 +291,7 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService { // 获取平台接口密钥 GameSecretKeyCurrencyDTO gameSecretKey = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTO(GameSecretKeyCurrencyDTO.builder() .platformCode(gameBalanceExchange.getPlatformCode()) - .currency(gameBalanceExchange.getCurrencyCode()).build()); + .systemCurrency(gameBalanceExchange.getCurrencyCode()).build()); // 检查平台密钥是否存在，否则抛出异常 ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode()); diff --git a/ff-game/src/main/java/com/ff/game/api/sa/client/SAClient.java b/ff-game/src/main/java/com/ff/game/api/sa/client/SAClient.java index 5e8bdb0..7d70ff5 100644 --- a/ff-game/src/main/java/com/ff/game/api/sa/client/SAClient.java +++ b/ff-game/src/main/java/com/ff/game/api/sa/client/SAClient.java @@ -58,23 +58,44 @@ public interface SAClient { @Post("/getGameList") XKGamesDTO getGameList(@JSONBody Map params); + /** - * 按代理id进行交换转账 + * 兑换转入 * * @param params 参数 - * @return {@link JILIExchangeMoneyResponseDTO } + * @return {@link String } */ - @Post(url = "/exchangeTransferByAgentId") - XKExchangeMoneyResponseDTO exchangeTransferByAgentId( @JSONBody Map params); + @Post( url ="/api.aspx/CreditBalanceDV", + headers = { + "Content-type: application/x-www-form-urlencoded" + }) + String exchangeTransferByInto(@Body String params); + + + /** + * 外汇转出 + * + * @param params 参数 + * @return {@link String } + */ + @Post( url ="/api.aspx/DebitAllBalanceDV", + headers = { + "Content-type: application/x-www-form-urlencoded" + }) + String exchangeTransferByOut(@Body String params); + /** * 按时间获取投注记录 * * @param params 参数 - * @return {@link XKBetRecordResponseDTO } + * @return {@link String } */ - @Post(url = "/getGameRecordByTime") - XKBetRecordResponseDTO getBetRecordByTime( @JSONBody Map params); + @Post( url ="/api.aspx/GetAllBetDetailsForTimeIntervalDV", + headers = { + "Content-type: application/x-www-form-urlencoded" + }) + String getBetRecordByTime( @Body String params); /** diff --git a/ff-game/src/main/java/com/ff/game/api/sa/dto/SACreditBalanceResponse.java b/ff-game/src/main/java/com/ff/game/api/sa/dto/SACreditBalanceResponse.java new file mode 100644 index 0000000..a2d5635 --- /dev/null +++ b/ff-game/src/main/java/com/ff/game/api/sa/dto/SACreditBalanceResponse.java @@ -0,0 +1,59 @@ +package com.ff.game.api.sa.dto; + + +import lombok.Data; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.math.BigDecimal; + + +/** + * 信贷余额响应 + * + * @author shi + * @date 2025/03/26 + */ +@Data +@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement(name = "CreditBalanceResponse") +public class SACreditBalanceResponse { + + /** + * 错误消息 ID + */ + @XmlElement(name = "ErrorMsgId") + private int errorMsgId; + + /** + * 错误消息 + */ + @XmlElement(name = "ErrorMsg") + private String errorMsg; + + /** + * 用户名 + */ + @XmlElement(name = "Username") + private String username; + + /** + * 余额 + */ + @XmlElement(name = "Balance") + private BigDecimal balance; + + /** + * 信用额度 + */ + @XmlElement(name = "CreditAmount") + private BigDecimal creditAmount; + + /** + * 订单号 + */ + @XmlElement(name = "OrderId") + private String orderId; +} \ No newline at end of file diff --git a/ff-game/src/main/java/com/ff/game/api/sa/dto/SADebitAllBalanceResponse.java b/ff-game/src/main/java/com/ff/game/api/sa/dto/SADebitAllBalanceResponse.java new file mode 100644 index 0000000..220641d --- /dev/null +++ b/ff-game/src/main/java/com/ff/game/api/sa/dto/SADebitAllBalanceResponse.java @@ -0,0 +1,51 @@ +package com.ff.game.api.sa.dto; + +import lombok.Data; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.math.BigDecimal; + +/** + * sadebit全平衡反应 + * + * @author shi + * @date 2025/03/26 + */ +@Data +@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement(name = "DebitAllBalanceResponse") +public class SADebitAllBalanceResponse { + + /** + * 错误消息 ID + */ + @XmlElement(name = "ErrorMsgId") + private int errorMsgId; + + /** + * 错误消息 + */ + @XmlElement(name = "ErrorMsg") + private String errorMsg; + + /** + * 用户名 + */ + @XmlElement(name = "Username") + private String username; + + /** + * 借记金额 + */ + @XmlElement(name = "DebitAmount") + private BigDecimal debitAmount; + + /** + * 订单号 + */ + @XmlElement(name = "OrderId") + private String orderId; +} \ No newline at end of file diff --git a/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetAllBetDetailsResponse.java b/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetAllBetDetailsResponse.java new file mode 100644 index 0000000..4ab18b7 --- /dev/null +++ b/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetAllBetDetailsResponse.java @@ -0,0 +1,431 @@ +package com.ff.game.api.sa.dto; + +import lombok.Data; + +import javax.smartcardio.Card; +import javax.xml.bind.annotation.*; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * GetAllBetDetailsResponse 类表示获取所有投注详情的响应数据。 + */ +@Data +@XmlRootElement(name = "GetAllBetDetailsForTimeIntervalResponse") +@XmlAccessorType(XmlAccessType.FIELD) +public class SAGetAllBetDetailsResponse { + + /** + * 返回的记录数。 + */ + @XmlElement(name = "NumOfRecord") + private int numOfRecord; + + /** + * 包含投注详情的列表。 + */ + @XmlElementWrapper(name = "BetDetailList") + @XmlElement(name = "BetDetail") + private List betDetailList; + + /** + * 错误信息的 ID。 + */ + @XmlElement(name = "ErrorMsgId") + private int errorMsgId; + + /** + * 错误信息描述。 + */ + @XmlElement(name = "ErrorMsg") + private String errorMsg; + + /** + * BetDetail 类表示单个投注的详细信息。 + */ + @XmlAccessorType(XmlAccessType.FIELD) + @Data + public static class BetDetail { + + /** + * 投注时间。 + */ + @XmlElement(name = "BetTime") + private Date betTime; + + /** + * 结算时间。 + */ + @XmlElement(name = "PayoutTime") + private Date payoutTime; + + /** + * 用户名。 + */ + @XmlElement(name = "Username") + private String username; + + /** + * 桌台 ID。 + */ + @XmlElement(name = "HostID") + private int hostID; + + /** + * 保留字段。 + */ + @XmlElement(name = "Detail") + private String detail; + + /** + * 游戏编号。 + */ + @XmlElement(name = "GameID") + private String gameID; + + /** + * 局编号。 + */ + @XmlElement(name = "Round") + private int round; + + /** + * 靴编号。 + */ + @XmlElement(name = "Set") + private int set; + + /** + * 投注编号。 + */ + @XmlElement(name = "BetID") + private long betID; + + /** + * 币种。 + */ + @XmlElement(name = "Currency") + private String currency; + + /** + * 投注金额。 + */ + @XmlElement(name = "BetAmount") + private BigDecimal betAmount; + + /** + * 有效投注额或洗码量。 + */ + @XmlElement(name = "Rolling") + private BigDecimal rolling; + + /** + * 输赢金额。 + */ + @XmlElement(name = "ResultAmount") + private BigDecimal resultAmount; + + /** + * 投注后的余额。 + */ + @XmlElement(name = "Balance") + private BigDecimal balance; + + /** + * 游戏类型。 + */ + @XmlElement(name = "GameType") + private String gameType; + + /** + * 投注类型。 + */ + @XmlElement(name = "BetType") + private int betType; + + /** + * 投注来源。 + */ + @XmlElement(name = "BetSource") + private int betSource; + + /** + * 单一钱包下注交易编号。 + */ + @XmlElement(name = "TransactionID") + private long transactionID; + + /** + * 下注确认状态：0 - 手动，1 - 自动。 + */ + @XmlElement(name = "BetConfirmation") + private int betConfirmation; + + /** + * 游戏结果。 + */ + @XmlElement(name = "GameResult") + private GameResult gameResult; + + } + + /** + * GameResult 类表示游戏的结果。 + */ + @XmlAccessorType(XmlAccessType.FIELD) + @Data + public static class GameResult { + + /** + * 百家乐游戏的结果。 + */ + @XmlElement(name = "BaccaratResult") + private BaccaratResult baccaratResult; + + } + + /** + * BaccaratResult 类表示百家乐游戏的具体结果。 + */ + @XmlAccessorType(XmlAccessType.FIELD) + @Data + public static class BaccaratResult { + + /** + * 玩家卡1。 + */ + @XmlElement(name = "PlayerCard1") + private Card playerCard1; + + /** + * 玩家卡2。 + */ + @XmlElement(name = "PlayerCard2") + private Card playerCard2; + + /** + * 玩家卡3。 + */ + @XmlElement(name = "PlayerCard3") + private Card playerCard3; + + /** + * 庄家卡1。 + */ + @XmlElement(name = "BankerCard1") + private Card bankerCard1; + + /** + * 庄家卡2。 + */ + @XmlElement(name = "BankerCard2") + private Card bankerCard2; + + /** + * 游戏结果详情。 + */ + @XmlElement(name = "ResultDetail") + private ResultDetail resultDetail; + + } + + /** + * Card 类表示一张牌的基本信息，包括花色和点数。 + */ + @XmlAccessorType(XmlAccessType.FIELD) + @Data + public static class Card { + + /** + * 花色（例如：1 = 黑桃, 2 = 红心, 3 = 方块, 4 = 梅花）。 + */ + @XmlElement(name = "Suit") + private int suit; + + /** + * 点数（例如：2 - 10、J、Q、K、A）。 + */ + @XmlElement(name = "Rank") + private int rank; + + } + + /** + * ResultDetail 类表示游戏的详细结果，包括多个胜负状态和奖励信息。 + */ + @XmlAccessorType(XmlAccessType.FIELD) + @Data + public static class ResultDetail { + + /** + * 是否平局。 + */ + @XmlElement(name = "BRTie") + private boolean brTie; + + /** + * 是否玩家赢。 + */ + @XmlElement(name = "BRPlayerWin") + private boolean brPlayerWin; + + /** + * 是否庄家赢。 + */ + @XmlElement(name = "BRBankerWin") + private boolean brBankerWin; + + /** + * 是否玩家对子。 + */ + @XmlElement(name = "BRPlayerPair") + private boolean brPlayerPair; + + /** + * 是否庄家对子。 + */ + @XmlElement(name = "BRBankerPair") + private boolean brBankerPair; + + /** + * 是否两张牌幸运六。 + */ + @XmlElement(name = "BRS2CardsLuckySix") + private boolean brS2CardsLuckySix; + + /** + * 是否三张牌幸运六。 + */ + @XmlElement(name = "BRS3CardsLuckySix") + private boolean brS3CardsLuckySix; + + /** + * 是否三张牌幸运六（SS）。 + */ + @XmlElement(name = "BRSSS2CardsLuckySix") + private boolean brSSS2CardsLuckySix; + + /** + * 是否三张牌幸运六（SS）。 + */ + @XmlElement(name = "BRSSS3CardsLuckySix") + private boolean brSSS3CardsLuckySix; + + /** + * 是否玩家奖金（SS）。 + */ + @XmlElement(name = "BRSPlayerBonus") + private boolean brSPlayerBonus; + + /** + * 是否庄家奖金（SS）。 + */ + @XmlElement(name = "BRSBankerBonus") + private boolean brSBankerBonus; + + /** + * 是否和局（SS）。 + */ + @XmlElement(name = "BRSSTie") + private boolean brSSTie; + + /** + * 是否玩家胜（SS）。 + */ + @XmlElement(name = "BRSSPlayerWin") + private boolean brSSPlayerWin; + + /** + * 是否庄家胜（SS）。 + */ + @XmlElement(name = "BRSSBankerWin") + private boolean brSSBankerWin; + + /** + * 是否玩家对子（SS）。 + */ + @XmlElement(name = "BRSSPlayerPair") + private boolean brSSPlayerPair; + + /** + * 是否庄家对子（SS）。 + */ + @XmlElement(name = "BRSSBankerPair") + private boolean brSSBankerPair; + + /** + * 是否玩家自然。 + */ + @XmlElement(name = "BRPlayerNatural") + private boolean brPlayerNatural; + + /** + * 是否庄家自然。 + */ + @XmlElement(name = "BRBankerNatural") + private boolean brBankerNatural; + + /** + * 是否玩家自然（SS）。 + */ + @XmlElement(name = "BRSSPlayerNatural") + private boolean brSSPlayerNatural; + + /** + * 是否庄家自然（SS）。 + */ + @XmlElement(name = "BRSSBankerNatural") + private boolean brSSBankerNatural; + + /** + * 是否任意对子。 + */ + @XmlElement(name = "BRSAnyPair") + private boolean brSAnyPair; + + /** + * 是否三张对子。 + */ + @XmlElement(name = "BRSSSAnyPair") + private boolean brSSSAnyPair; + + /** + * 是否完美对子。 + */ + @XmlElement(name = "BRSPerfectPair") + private boolean brSPerfectPair; + + /** + * 是否完美三张对子。 + */ + @XmlElement(name = "BRSSSPerfectPair") + private boolean brSSSPerfectPair; + + /** + * 是否三张牌玩家奖金。 + */ + @XmlElement(name = "BRSSSPlayerBonus") + private boolean brSSSPlayerBonus; + + /** + * 是否三张牌庄家奖金。 + */ + @XmlElement(name = "BRSSSBankerBonus") + private boolean brSSSBankerBonus; + + /** + * 是否三张牌幸运六。 + */ + @XmlElement(name = "BRSSSLuckySix") + private boolean brSSSLuckySix; + + /** + * 是否两张牌幸运六。 + */ + @XmlElement(name = "BRSLuckySix") + private boolean brSLuckySix; + + } +} + diff --git a/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetUserStatusResponse.java b/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetUserStatusResponse.java index dbefc24..e6425a2 100644 --- a/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetUserStatusResponse.java +++ b/ff-game/src/main/java/com/ff/game/api/sa/dto/SAGetUserStatusResponse.java @@ -1,6 +1,8 @@ package com.ff.game.api.sa.dto; import lombok.Data; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import java.math.BigDecimal; @@ -12,6 +14,7 @@ import java.math.BigDecimal; * @date 2025/03/26 */ @Data +@XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement(name = "GetUserStatusResponse") public class SAGetUserStatusResponse { diff --git a/ff-game/src/main/java/com/ff/game/api/sa/dto/SARegUserInfoResponse.java b/ff-game/src/main/java/com/ff/game/api/sa/dto/SARegUserInfoResponse.java index 09c9781..1ae4dbc 100644 --- a/ff-game/src/main/java/com/ff/game/api/sa/dto/SARegUserInfoResponse.java +++ b/ff-game/src/main/java/com/ff/game/api/sa/dto/SARegUserInfoResponse.java @@ -2,6 +2,8 @@ package com.ff.game.api.sa.dto; import lombok.Data; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -13,6 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement; * @date 2025/03/25 */ @Data +@XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement(name = "RegUserInfoResponse") public class SARegUserInfoResponse { @XmlElement(name = "ErrorMsgId") diff --git a/ff-game/src/main/java/com/ff/game/api/sa/impl/GamesSAServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/sa/impl/GamesSAServiceImpl.java index 86ae373..23ccaf9 100644 --- a/ff-game/src/main/java/com/ff/game/api/sa/impl/GamesSAServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/sa/impl/GamesSAServiceImpl.java @@ -17,9 +17,7 @@ import com.ff.config.KeyConfig; import com.ff.game.api.IGamesService; import com.ff.game.api.request.*; import com.ff.game.api.sa.client.SAClient; -import com.ff.game.api.sa.dto.SALoginRequestResponse; -import com.ff.game.api.sa.dto.SARegUserInfoResponse; -import com.ff.game.api.sa.dto.SAGetUserStatusResponse; +import com.ff.game.api.sa.dto.*; import com.ff.game.api.xk.dto.*; import com.ff.game.domain.*; import com.ff.game.dto.GameSecretKeyCurrencyDTO; @@ -93,6 +91,20 @@ public class GamesSAServiceImpl implements IGamesService { @Resource private IGameNameService gameNameService; + /** + * 游戏id + */ + private static final Long GAME_ID = 1904452832756002817L; + + /** + * 平台ID + */ + private static final Long PLATFORM_ID = 1904411420157108225L; + + /** + * 游戏名称id + */ + private static final Long GAME_NAME_ID = 1904452832756002817L; /** * 获得就是成功 @@ -103,6 +115,7 @@ public class GamesSAServiceImpl implements IGamesService { private Boolean getIsSuccess(Integer errorCode) { ApiException.isTrue(113 != errorCode, ErrorCode.GAME_ACCOUNT_CREATION_FAILED.getCode()); ApiException.isTrue(116 != errorCode, ErrorCode.ACCOUNT_NOT_EXIST.getCode()); + ApiException.isTrue(122 != errorCode, ErrorCode.FREQUENT_BALANCE_TRANSFER.getCode()); return 0 == errorCode; } @@ -173,8 +186,7 @@ public class GamesSAServiceImpl implements IGamesService { .balance(saGetUserStatusResponse.getBalance()) .status(saGetUserStatusResponse.isOnline() ? GameMemberStatus.ONLINE.getCode() : GameMemberStatus.OFFLINE.getCode()) .build(); - } - else { + } else { throw new ApiException(ErrorCode.ACCOUNT_NOT_EXIST.getCode()); } } @@ -187,7 +199,7 @@ public class GamesSAServiceImpl implements IGamesService { */ @Override public String loginWithoutRedirect(GamesLogin gamesLogin) { - log.info("GamesXKServiceImpl [loginWithoutRedirect] 请求参数 {}", gamesLogin); + log.info("GamesSAServiceImpl [loginWithoutRedirect] 请求参数 {}", gamesLogin); Map params = new LinkedHashMap<>(); params.put("Username", gamesLogin.getAccount()); @@ -210,10 +222,10 @@ public class GamesSAServiceImpl implements IGamesService { params.put("token", saLoginRequestResponse.getToken()); params.put("lobby", hallCode); params.put("lang", gamesLogin.getLang()); - if (StringUtils.isEmpty(gamesLogin.getHomeUrl())){ + if (StringUtils.isEmpty(gamesLogin.getHomeUrl())) { params.put("returnurl", gamesLogin.getHomeUrl()); } - return loginUrl+"?"+JsonUtil.mapToQueryString(params); + return loginUrl + "?" + JsonUtil.mapToQueryString(params); } else { throw new ApiException(ErrorCode.ACCOUNT_NOT_EXIST.getCode()); } @@ -229,77 +241,38 @@ public class GamesSAServiceImpl implements IGamesService { @Transactional @Override public String getGameList(GamesBaseRequestDTO gamesBaseRequestDTO) { - - List gamesDatas = redisCache.getCacheList(CacheConstants.XK_GAMES); - if (!CollectionUtils.isEmpty(gamesDatas)) { - return CacheConstants.XK_GAMES; + GamePlatform gamePlatform = gamePlatformService.selectGamePlatformById(PLATFORM_ID); + //没有此平台就新增一个平台 + if (ObjectUtils.isEmpty(gamePlatform)) { + gamePlatform = new GamePlatform(); + gamePlatform.setPlatformType(PlatformType.CARD_GAME.getCode()); + gamePlatform.setPlatformName(GamePlatforms.SA.getInfo() + PlatformType.CARD_GAME.getName()); + gamePlatform.setSortNo(gamePlatformService.selectMaxSortNo() + 1); + gamePlatform.setCreateBy(Constants.SYSTEM); + gamePlatformService.insertGamePlatform(gamePlatform); } - - - Map params = new LinkedHashMap<>(); - params.put("agentId", gamesBaseRequestDTO.getAgentId()); - String query = JsonUtil.mapToQueryString(params); - gamesBaseRequestDTO.setQuery(query); - String key = this.getKey(gamesBaseRequestDTO, null); - params.put("key", key); - - XKGamesDTO xkGamesDTO = SAClient.getGameList(params); - //判断是否获取成功 - if (this.getIsSuccess(xkGamesDTO.getCode())) { - - for (XKGamesDTO.DataBean gamesDataDTO : xkGamesDTO.getData()) { - GamePlatform gamePlatform = GamePlatform.builder() - .platformType(XKGameType.findSystemByCode(gamesDataDTO.getGameCategoryId())) - .platformCode(GamePlatforms.XK.getCode()) - .build(); - List gamePlatforms = gamePlatformService.selectGamePlatformList(gamePlatform); - //没有此平台就新增一个平台 - if (CollectionUtils.isEmpty(gamePlatforms)) { - gamePlatform.setPlatformName(GamePlatforms.XK.getInfo() + XKGameType.findInfoByCode(gamesDataDTO.getGameCategoryId())); - gamePlatform.setSortNo(gamePlatformService.selectMaxSortNo() + 1); - gamePlatform.setCreateBy(Constants.SYSTEM); - gamePlatformService.insertGamePlatform(gamePlatform); - } else { - gamePlatform = gamePlatforms.get(0); - } - Game game = Game.builder() - .platformId(gamePlatform.getId()) - .gameCode(String.valueOf(gamesDataDTO.getGameId())) - .build(); - List games = gameService.selectGameList(game); - //不存在这个游戏 - if (CollectionUtils.isEmpty(games)) { - game.setGameSourceType(gamesDataDTO.getGameCategoryId()); - game.setFreespin(gamesDataDTO.isFreeSpin()); - game.setSortNo(gameService.selectMaxSortNoByPlatformId(gamePlatform.getId()) + 1); - game.setGameName(gamesDataDTO.getName()); - game.setCreateBy(Constants.SYSTEM); - gameService.insertGame(game); - } else { - game = games.get(0); - } - gamesDataDTO.setSystemGameId(game.getId()); - List gameNames = gameNameService.selectGameNameList(GameName.builder().gameId(game.getId()).gameName(game.getGameName()).build()); - if (CollectionUtils.isEmpty(gameNames)) { - gameNameService.insertGameName(GameName.builder() - .gameId(game.getId()) - .gameName(game.getGameName()) - .langCode("zh-CN") - .createBy(Constants.SYSTEM) - .build()); - } - - } - - redisCache.deleteObject(CacheConstants.XK_GAMES); - redisCache.setCacheList(CacheConstants.XK_GAMES, xkGamesDTO.getData()); - redisCache.expire(CacheConstants.XK_GAMES, 5L, TimeUnit.HOURS); - } else { - throw new BaseException(xkGamesDTO.getMsg()); - + Game game = gameService.selectGameById(GAME_ID); + //不存在这个游戏 + if (ObjectUtils.isEmpty(game)) { + game = new Game(); + game.setSortNo(gameService.selectMaxSortNoByPlatformId(gamePlatform.getId()) + 1); + game.setPlatformId(gamePlatform.getId()); + game.setGameCode("1"); + game.setGameSourceType(1); + game.setGameName("真人棋牌"); + game.setCreateBy(Constants.SYSTEM); + gameService.insertGame(game); } - - return CacheConstants.XK_GAMES; + GameName gameName = gameNameService.selectGameNameById(GAME_NAME_ID); + if (ObjectUtils.isEmpty(gameName)) { + gameNameService.insertGameName(GameName.builder() + .gameId(game.getId()) + .gameName(game.getGameName()) + .langCode("zh-CN") + .createBy(Constants.SYSTEM) + .build()); + } + return CacheConstants.SA_GAMES; } /** @@ -311,14 +284,14 @@ public class GamesSAServiceImpl implements IGamesService { @Override @Transactional public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) { - log.info("GamesXKServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO); + log.info("GamesSAServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO); GameSecretKeyCurrency currencyDTO = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTO(GameSecretKeyCurrencyDTO.builder() - .platformCode(GamePlatforms.XK.getInfo()) + .platformCode(GamePlatforms.SA.getInfo()) .code(exchangeTransferMoneyRequestDTO.getAgentId()) .build()); Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount()); - String transactionId = GamePlatforms.XK.getCode() + IdUtils.simpleUUID(); + List gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList( GameExchangeMoney.builder() .tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey()) @@ -326,6 +299,12 @@ public class GamesSAServiceImpl implements IGamesService { .build() ); Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复"); + //判断是转入还是转出 + String transactionId = "OUT" + DateUtils.dateTimeNow() + exchangeTransferMoneyRequestDTO.getAccount(); + if (!TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) { + transactionId = "IN" + DateUtils.dateTimeNow() + exchangeTransferMoneyRequestDTO.getAccount(); + } + //获取下一个自增id GameExchangeMoney exchangeMoney = GameExchangeMoney @@ -338,40 +317,66 @@ public class GamesSAServiceImpl implements IGamesService { .currencyCode(currencyDTO.getSystemCurrency()) .memberId(member.getId()) .transactionId(transactionId) - .platformCode(GamePlatforms.XK.getCode()) + .platformCode(GamePlatforms.SA.getCode()) .build(); exchangeMoney.setCreateBy(Constants.SYSTEM); - //接口限制限制50字符 - exchangeMoney.setTransactionId(GamePlatforms.XK.getCode() + IdUtils.simpleUUID()); - Map params = new LinkedHashMap<>(); - params.put("account", exchangeTransferMoneyRequestDTO.getAccount()); - params.put("transactionId", exchangeMoney.getTransactionId()); - params.put("amount", exchangeTransferMoneyRequestDTO.getAmount().stripTrailingZeros().toString()); - params.put("transferType", exchangeTransferMoneyRequestDTO.getTransferType()); - params.put("agentId", exchangeTransferMoneyRequestDTO.getAgentId()); - String query = JsonUtil.mapToQueryString(params); - exchangeTransferMoneyRequestDTO.setQuery(query); - String key = this.getKey(exchangeTransferMoneyRequestDTO, null); - params.put("key", key); - XKExchangeMoneyResponseDTO exchangeMoneyResponse = SAClient.exchangeTransferByAgentId(params); - //判断是否转移成功 - if (this.getIsSuccess(exchangeMoneyResponse.getCode())) { - XKExchangeMoneyResponseDTO.DataBean exchangeMoneyResponseData = exchangeMoneyResponse.getData(); - ApiException.isTrue(!StatusType.FAILURE.getValue().equals(exchangeMoneyResponseData.getStatus()), ErrorCode.BALANCE_TRANSFER_FAILED.getCode()); + if (TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) { + Map params = new LinkedHashMap<>(); + params.put("Username", exchangeTransferMoneyRequestDTO.getAccount()); + params.put("OrderId", exchangeMoney.getTransactionId()); + String query = JsonUtil.mapToQueryString(params); + exchangeTransferMoneyRequestDTO.setQuery(query); + String key = this.getKey(exchangeTransferMoneyRequestDTO, "DebitAllBalanceDV"); + String result = SAClient.exchangeTransferByOut(key); + SADebitAllBalanceResponse saDebitAllBalanceResponse = XmlUtils.xmlDecrypt(result, SADebitAllBalanceResponse.class); + Integer errorCode = saDebitAllBalanceResponse.getErrorMsgId(); + //判断是否转移成功 + if (this.getIsSuccess(errorCode)) { - //更新数据 - exchangeMoney.setBalance(NumberUtil.sub(exchangeMoneyResponseData.getCurrencyAfter(), exchangeMoneyResponseData.getCurrencyBefore()).abs()); - exchangeMoney.setCoinBefore(exchangeMoneyResponseData.getCoinBefore()); - exchangeMoney.setCoinAfter(exchangeMoneyResponseData.getCoinAfter()); - exchangeMoney.setCurrencyBefore(exchangeMoneyResponseData.getCurrencyBefore()); - exchangeMoney.setCurrencyAfter(exchangeMoneyResponseData.getCurrencyAfter()); - exchangeMoney.setStatus(exchangeMoneyResponseData.getStatus()); - gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney); + + //更新数据 + exchangeMoney.setBalance(saDebitAllBalanceResponse.getDebitAmount()); + exchangeMoney.setCoinBefore(saDebitAllBalanceResponse.getDebitAmount()); + exchangeMoney.setCoinAfter(BigDecimal.ZERO); + exchangeMoney.setCurrencyBefore(exchangeMoney.getCurrencyBefore()); + exchangeMoney.setCurrencyAfter(exchangeMoney.getCurrencyAfter()); + exchangeMoney.setStatus(StatusType.SUCCESS.getValue()); + gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney); + } else { + log.error("GamesXKServiceImpl [exchangeTransferByAgentId] 金额转移失败,错误代码{}", errorCode); + throw new ApiException(ErrorCode.BALANCE_TRANSFER_FAILED.getCode()); + } } else { - log.error("GamesXKServiceImpl [exchangeTransferByAgentId] 金额转移失败,错误代码{},错误信息{}", exchangeMoneyResponse.getCode(), exchangeMoneyResponse.getMsg()); - throw new BaseException(exchangeMoneyResponse.getMsg()); + Map params = new LinkedHashMap<>(); + params.put("Username", exchangeTransferMoneyRequestDTO.getAccount()); + params.put("OrderId", exchangeMoney.getTransactionId()); + params.put("CreditAmount", exchangeTransferMoneyRequestDTO.getAmount().stripTrailingZeros().toPlainString()); + params.put("CurrencyType", currencyDTO.getCurrency()); + String query = JsonUtil.mapToQueryString(params); + exchangeTransferMoneyRequestDTO.setQuery(query); + String key = this.getKey(exchangeTransferMoneyRequestDTO, "CreditBalanceDV"); + String result = SAClient.exchangeTransferByInto(key); + SACreditBalanceResponse saCreditBalanceResponse = XmlUtils.xmlDecrypt(result, SACreditBalanceResponse.class); + Integer errorCode = saCreditBalanceResponse.getErrorMsgId(); + //判断是否转移成功 + if (this.getIsSuccess(errorCode)) { + + + //更新数据 + exchangeMoney.setBalance(saCreditBalanceResponse.getCreditAmount()); + exchangeMoney.setCoinBefore(NumberUtil.sub(saCreditBalanceResponse.getBalance(), saCreditBalanceResponse.getCreditAmount()).abs()); + exchangeMoney.setCoinAfter(saCreditBalanceResponse.getBalance()); + exchangeMoney.setCurrencyBefore(exchangeMoney.getCoinBefore()); + exchangeMoney.setCurrencyAfter(exchangeMoney.getCoinAfter()); + exchangeMoney.setStatus(StatusType.SUCCESS.getValue()); + gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney); + } else { + log.error("GamesXKServiceImpl [exchangeTransferByAgentId] 金额转移失败,错误代码{}", errorCode); + throw new ApiException(ErrorCode.BALANCE_TRANSFER_FAILED.getCode()); + } } + return exchangeMoney.getId(); } @@ -395,52 +400,33 @@ public class GamesSAServiceImpl implements IGamesService { */ @Override public Boolean getBetRecordByTime(BetRecordByTimeDTO betRecordByTimeDTO) { - List gameBettingDetails = new ArrayList<>(); + String startTime = DateUtils.convertTimeZone(betRecordByTimeDTO.getStartTime(), "Asia/Shanghai", DateUtils.YYYY_MM_DD_HH_MM_SS); + String endTime = DateUtils.convertTimeZone(betRecordByTimeDTO.getEndTime(), "Asia/Shanghai", DateUtils.YYYY_MM_DD_HH_MM_SS); + //请求参数 - log.info("GamesXKServiceImpl [getBetRecordByTime] 请求参数 {}", betRecordByTimeDTO); + log.info("GamesSAServiceImpl [getBetRecordByTime] 请求参数 {}", betRecordByTimeDTO); Map params = new LinkedHashMap<>(); - params.put("startTime", betRecordByTimeDTO.getStartTime()); - params.put("endTime", betRecordByTimeDTO.getEndTime()); - params.put("page", betRecordByTimeDTO.getPage()); - params.put("pageLimit", betRecordByTimeDTO.getPageLimit()); - params.put("agentId", betRecordByTimeDTO.getAgentId()); + params.put("FromTime", startTime); + params.put("ToTime",endTime); String query = JsonUtil.mapToQueryString(params); betRecordByTimeDTO.setQuery(query); - String key = this.getKey(betRecordByTimeDTO, null); - params.put("key", key); - XKBetRecordResponseDTO xkBetRecordResponseDTO = SAClient.getBetRecordByTime(params); + String key = this.getKey(betRecordByTimeDTO, "GetAllBetDetailsForTimeIntervalDV"); + + String result = SAClient.getBetRecordByTime(key); + SAGetAllBetDetailsResponse saGetAllBetDetailsResponse = XmlUtils.xmlDecrypt(result, SAGetAllBetDetailsResponse.class); + Integer errorCode = saGetAllBetDetailsResponse.getErrorMsgId(); + //判断是否获取成功 - if (this.getIsSuccess(xkBetRecordResponseDTO.getCode())) { + if (this.getIsSuccess(errorCode)) { //数据组装 - XKBetRecordResponseDTO.DataBean dataBean = xkBetRecordResponseDTO.getData(); - this.batchInsert(xkBetRecordResponseDTO); - - //获取下一页数据 - while (!Objects.equals(dataBean.getCurrentPage(), dataBean.getTotalPages()) && dataBean.getTotalPages() > 0) { - betRecordByTimeDTO.setPage(dataBean.getCurrentPage() + 1); - //请求参数 - params = new LinkedHashMap<>(); - params.put("startTime", betRecordByTimeDTO.getStartTime()); - params.put("endTime", betRecordByTimeDTO.getEndTime()); - params.put("page", betRecordByTimeDTO.getPage()); - params.put("pageLimit", betRecordByTimeDTO.getPageLimit()); - params.put("agentId", betRecordByTimeDTO.getAgentId()); - query = JsonUtil.mapToQueryString(params); - betRecordByTimeDTO.setQuery(query); - key = this.getKey(betRecordByTimeDTO, null); - params.put("key", key); - xkBetRecordResponseDTO = SAClient.getBetRecordByTime(params); - this.batchInsert(xkBetRecordResponseDTO); - } - + this.batchInsert(saGetAllBetDetailsResponse); return Boolean.TRUE; } else { - log.error("GamesXKServiceImpl [getBetRecordByTime] 获取投注记录失败,错误代码{},错误信息{}", xkBetRecordResponseDTO.getCode(), xkBetRecordResponseDTO.getMsg()); - throw new BaseException(xkBetRecordResponseDTO.getMsg()); + log.error("GamesXKServiceImpl [getBetRecordByTime] 获取投注记录失败,错误代码{}", errorCode); } - + return Boolean.FALSE; } /** @@ -538,21 +524,21 @@ public class GamesSAServiceImpl implements IGamesService { /** * 批量插入 * - * @param xkBetRecordResponseDTO xk下注记录响应dto + * @param saGetAllBetDetailsResponse sa获取所有投注详细信息响应 */ - private void batchInsert(XKBetRecordResponseDTO xkBetRecordResponseDTO) { + private void batchInsert(SAGetAllBetDetailsResponse saGetAllBetDetailsResponse) { List gameBettingDetails = new ArrayList<>(); List wagersIds = new ArrayList<>(); //数据组装 - XKBetRecordResponseDTO.DataBean dataBean = xkBetRecordResponseDTO.getData(); + List result = saGetAllBetDetailsResponse.getBetDetailList(); //数据转化 - for (XKBetRecordResponseDTO.DataBean.ResultBean bean : dataBean.getResult()) { + for (SAGetAllBetDetailsResponse.BetDetail bean : result) { GameBettingDetails bettingDetails = this.dataBuild(GamesDataBuildDTO.builder().data(bean).build()); if (!ObjectUtils.isEmpty(bettingDetails)) { bettingDetails.setId(IdUtil.getSnowflakeNextId()); gameBettingDetails.add(bettingDetails); } - wagersIds.add(String.valueOf(bean.getWagersId())); + wagersIds.add(String.valueOf(bean.getBetID())); } if (!CollectionUtils.isEmpty(gameBettingDetails)) { //查询重复数据id @@ -577,50 +563,56 @@ public class GamesSAServiceImpl implements IGamesService { @Override public GameBettingDetails dataBuild(GamesDataBuildDTO gamesDataBuildDTO) { //转化类 - XKBetRecordResponseDTO.DataBean.ResultBean resultBean = (XKBetRecordResponseDTO.DataBean.ResultBean) gamesDataBuildDTO.getData(); + SAGetAllBetDetailsResponse.BetDetail resultBean = (SAGetAllBetDetailsResponse.BetDetail) gamesDataBuildDTO.getData(); GameSecretKeyCurrency currencyDTO = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTO(GameSecretKeyCurrencyDTO.builder() - .platformCode(GamePlatforms.XK.getInfo()) - .code(resultBean.getAgentId()) + .platformCode(GamePlatforms.SA.getInfo()) + .currency(resultBean.getCurrency()) .build()); - Member member = memberService.selectMemberByGameAccount(resultBean.getAccount()); + Member member = memberService.selectMemberByGameAccount(resultBean.getUsername()); if (ObjectUtils.isEmpty(member)) { return null; } - List gamesDatas = redisCache.getCacheList(CacheConstants.XK_GAMES); - Map dataDTOMap = gamesDatas.stream().collect(Collectors.toMap(XKGamesDTO.DataBean::getGameId, e -> e)); - XKGamesDTO.DataBean gamesDataDTO = dataDTOMap.get(resultBean.getGameId()); - BigDecimal payoffAmount = BigDecimal.ZERO; - if (GameStatus.WIN.getCode().equals(resultBean.getStatus())) { - payoffAmount = NumberUtil.sub(resultBean.getPayoffAmount(), resultBean.getTurnover()); - } else if (GameStatus.FAIL.getCode().equals(resultBean.getStatus())) { - payoffAmount = NumberUtil.sub(resultBean.getPayoffAmount(), resultBean.getTurnover()).negate(); + + Game game = gameService.selectGameById(GAME_ID); + + // 判断输赢 + Integer gameStatus = GameStatus.FLAT.getCode(); + if (BigDecimal.ZERO.compareTo(resultBean.getResultAmount()) > 0) { + gameStatus = GameStatus.FAIL.getCode(); + } else if (BigDecimal.ZERO.compareTo(resultBean.getResultAmount()) < 0) { + gameStatus = GameStatus.WIN.getCode(); } + + //数据构造 GameBettingDetails gameBettingDetails = GameBettingDetails.builder() .tenantKey(member.getTenantKey()) //保存我们的币种id .currencyCode(currencyDTO.getSystemCurrency()) .memberId(member.getId()) - .gameCode(resultBean.getGameId()) - .gameType(XKGameType.findSystemByCode(resultBean.getGameCategoryId())) - .platformCode(GamePlatforms.XK.getCode()) - .gameId(gamesDataDTO.getSystemGameId()) - .gameName(gamesDataDTO.getName()) - .gameStatus(resultBean.getStatus()) - .gameStatusType(resultBean.getType()) - .gameCurrencyCode(resultBean.getAgentId()) - .account(String.valueOf(resultBean.getAccount())) - .wagersId(String.valueOf(resultBean.getWagersId())) - .wagersTime(resultBean.getWagersTime()) - .betAmount(resultBean.getBetAmount().abs()) - .payoffTime(resultBean.getPayoffTime()) - .payoffAmount(payoffAmount) - .settlementTime(resultBean.getSettlementTime()) - .turnover(resultBean.getTurnover()) - .orderNo(String.valueOf(resultBean.getRoundIndex())) + .gameCode(resultBean.getGameID()) + .gameType(1) + .platformCode(GamePlatforms.SA.getCode()) + .gameId(GAME_ID) + .gameName(game.getGameName()) + .gameStatus(gameStatus) + .gameStatusType(1) + .gameCurrencyCode(resultBean.getCurrency()) + .account(resultBean.getUsername()) + .wagersId(String.valueOf(resultBean.getBetID())) + .wagersTime(resultBean.getBetTime().getTime()) + .betAmount(resultBean.getBetAmount()) + .payoffTime(resultBean.getPayoutTime().getTime()) + .payoffAmount(resultBean.getResultAmount().abs()) + .settlementTime(resultBean.getPayoutTime().getTime()) + .turnover(resultBean.getRolling()) + .orderNo(null) + .round(String.valueOf(resultBean.getRound())) + .table(String.valueOf(resultBean.getHostID())) + .seat(String.valueOf(resultBean.getSet())) .settlementStatus(SettlementStatusEnum.COMPLETED.getCode()) .build(); gameBettingDetails.setCreateBy(Constants.SYSTEM); diff --git a/ff-game/src/main/java/com/ff/game/api/xk/service/impl/GamesXKServiceImpl.java b/ff-game/src/main/java/com/ff/game/api/xk/service/impl/GamesXKServiceImpl.java index f402b87..df6fc88 100644 --- a/ff-game/src/main/java/com/ff/game/api/xk/service/impl/GamesXKServiceImpl.java +++ b/ff-game/src/main/java/com/ff/game/api/xk/service/impl/GamesXKServiceImpl.java @@ -347,7 +347,7 @@ public class GamesXKServiceImpl implements IGamesService { Map params = new LinkedHashMap<>(); params.put("account", exchangeTransferMoneyRequestDTO.getAccount()); params.put("transactionId", exchangeMoney.getTransactionId()); - params.put("amount", exchangeTransferMoneyRequestDTO.getAmount().stripTrailingZeros().toString()); + params.put("amount", exchangeTransferMoneyRequestDTO.getAmount().stripTrailingZeros().toPlainString()); params.put("transferType", exchangeTransferMoneyRequestDTO.getTransferType()); params.put("agentId", exchangeTransferMoneyRequestDTO.getAgentId()); String query = JsonUtil.mapToQueryString(params);