Compare commits
No commits in common. "main" and "main-meitian" have entirely different histories.
main
...
main-meiti
|
|
@ -137,14 +137,8 @@ public class CacheConstants {
|
|||
public static final String SV388_TIME_FROM= "sv388:time:from";
|
||||
|
||||
public static final String SV388_GAMES = "sv388_games:";
|
||||
/**
|
||||
* pp游戏
|
||||
*/
|
||||
public static final String PP_GAMES= "pp_games:";
|
||||
/**
|
||||
* pp时间点
|
||||
*/
|
||||
public static final String PP_TIME_POINT = "pp:time:point:";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ public enum ErrorCode {
|
|||
Transfer_Not_Exist(1021, "转帐操作不存在"),
|
||||
Get_Url_Failure(1022, "获取URL失败"),
|
||||
Miss_Config(1023, "缺少配置"),
|
||||
DUPLICATE_ORDER_ID (1024, "重复的订单id"),
|
||||
;
|
||||
|
||||
// 获取错误码
|
||||
|
|
|
|||
|
|
@ -15,20 +15,10 @@ import lombok.Getter;
|
|||
@AllArgsConstructor
|
||||
public enum GameExchangeStep {
|
||||
CREATE_ORDER(1, "创建订单"),
|
||||
DEDUCT_BALANCE(2, "转入提前扣租户余额"),
|
||||
PLATFORM_TRANSACTION(3, "平台交易成功"),
|
||||
TENANT_QUOTA_DEDUCTED(4, "转出租户额度增加成功");
|
||||
PLATFORM_TRANSACTION(2, "平台交易成功"),
|
||||
PLATFORM_TRANSACTION_CONFIRM(3, "平台交易状态确认"),
|
||||
TENANT_QUOTA_DEDUCTED(4, "租户额度扣减成功");
|
||||
|
||||
private final Integer code;
|
||||
private final int code;
|
||||
private final String description;
|
||||
|
||||
// 根据 code 获取对应的枚举
|
||||
public static GameExchangeStep getByCode(int code) {
|
||||
for (GameExchangeStep step : GameExchangeStep.values()) {
|
||||
if (step.getCode() == code) {
|
||||
return step;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
package com.ff.base.enums;
|
||||
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -19,7 +17,6 @@ public enum GamePlatforms {
|
|||
PGT("PGT", "PGT"),
|
||||
FBSports("FBSports", "FB体育"),
|
||||
SV388("SV388", "SV388真人"),
|
||||
PP("PP", "PP"),
|
||||
DBSports("DBSports", "DB体育");
|
||||
|
||||
private final String code;
|
||||
|
|
@ -30,20 +27,6 @@ public enum GamePlatforms {
|
|||
this.info = info;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过代码获取
|
||||
*
|
||||
* @param code 代码
|
||||
* @return {@link GamePlatforms }
|
||||
*/
|
||||
public static GamePlatforms getByCode(String code) {
|
||||
for (GamePlatforms platform : GamePlatforms.values()) {
|
||||
if (platform.getCode().equals(code)) {
|
||||
return platform;
|
||||
}
|
||||
}
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_EXIST.getCode());
|
||||
}
|
||||
|
||||
public static List<String> getCodes() {
|
||||
List<String> result = new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
package com.ff.base.enums;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
|
||||
/**
|
||||
* xkgame类型
|
||||
*
|
||||
* @author shi
|
||||
* @date 2024/11/13
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum PPGameType {
|
||||
|
||||
ELECTRONIC("vs", 1,"电子"),
|
||||
// CARD_GAME("rl",2, "轮盘"),
|
||||
// VIDEO("vp",6, "视频扑克"),
|
||||
// SCRATCH_CARD("sc",7, "刮刮乐"),
|
||||
// BLACK_JACK("bj",2, "21点"),
|
||||
// CLASSIC_SLOTS("cs",1, "电子"),
|
||||
// BACCARAT_NEW("bn",2, "百家乐新"),
|
||||
// BACCARAT("bc",2, "百家乐"),
|
||||
// LIVE_GAMES("lg",6, "现场游戏"),
|
||||
;
|
||||
|
||||
private final String code;
|
||||
private final Integer systemCode;
|
||||
private final String info;
|
||||
|
||||
|
||||
/**
|
||||
* 按代码查找系统
|
||||
*
|
||||
* @param code 代码
|
||||
* @return {@link String }
|
||||
*/
|
||||
public static Integer findSystemByCode(String code) {
|
||||
Optional<Integer> system = Stream.of(PPGameType.values())
|
||||
.filter(gameType -> gameType.getCode().equals(code))
|
||||
.map(PPGameType::getSystemCode)
|
||||
.findFirst();
|
||||
return system.orElse(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按代码查找信息
|
||||
*
|
||||
* @param code 代码
|
||||
* @return {@link String }
|
||||
*/
|
||||
public static String findInfoByCode(String code) {
|
||||
Optional<String> system = Stream.of(PPGameType.values())
|
||||
.filter(gameType -> gameType.getCode().equals(code))
|
||||
.map(PPGameType::getInfo)
|
||||
.findFirst();
|
||||
return system.orElse(null);
|
||||
}
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ public enum PlatformType {
|
|||
GAME_HALL(3, "游戏大厅"),
|
||||
FISHING(4, "捕鱼"),
|
||||
BETTING_MACHINE(5, "押分机 (含宾果)"),
|
||||
VIDEO(6, "真人视讯"),
|
||||
VIDEO(6, "视讯"),
|
||||
LOTTERY(7, "彩票"),
|
||||
SPORTS(8, "体育"),
|
||||
HUNTING(9, "捕猎"),
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
package com.ff.base.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
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;
|
||||
}
|
||||
|
|
@ -2,12 +2,11 @@ package com.ff.base.manager;
|
|||
|
||||
import com.ff.base.utils.Threads;
|
||||
import com.ff.base.utils.spring.SpringUtils;
|
||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.TimerTask;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 异步任务管理器
|
||||
|
|
@ -25,33 +24,10 @@ public class AsyncManager {
|
|||
*/
|
||||
private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService");
|
||||
|
||||
|
||||
/**
|
||||
* 顺序执行线程池
|
||||
*/
|
||||
private List<ExecutorService> orderedExecutor = new ArrayList<>();
|
||||
/**
|
||||
* 最大线程数
|
||||
*/
|
||||
public static final int MAX_THREAD_COUNT = 16;
|
||||
|
||||
/**
|
||||
* 线程池
|
||||
*/
|
||||
private ThreadPoolTaskExecutor taskExecutor;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 单例模式
|
||||
*/
|
||||
private AsyncManager() {
|
||||
for (int i = 0; i < MAX_THREAD_COUNT; i++) {
|
||||
orderedExecutor.add(Executors.newSingleThreadExecutor());
|
||||
}
|
||||
executor = SpringUtils.getBean("scheduledExecutorService");
|
||||
taskExecutor = SpringUtils.getBean("threadPoolTaskExecutor");
|
||||
|
||||
}
|
||||
|
||||
private static AsyncManager me = new AsyncManager();
|
||||
|
|
@ -60,22 +36,6 @@ public class AsyncManager {
|
|||
return me;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public void executeOrdered(String key, Runnable task) {
|
||||
|
||||
if (null == key || key.isEmpty()) {
|
||||
taskExecutor.execute(task);
|
||||
return;
|
||||
}
|
||||
|
||||
int hash = key.hashCode();
|
||||
int index = Math.abs(hash % MAX_THREAD_COUNT);
|
||||
orderedExecutor.get(index).execute(task);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 执行任务
|
||||
*
|
||||
|
|
|
|||
|
|
@ -38,10 +38,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
|||
|
||||
public static String DAY_END_TIME = "23:59:59";
|
||||
|
||||
public static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
|
||||
public static final String ISO_8601_FORMAT= "yyyy-MM-dd'T'HH:mm:ss";
|
||||
|
||||
|
||||
public static final String ISO_8601_FORMAT_Z = "yyyy-MM-dd'T'HH:mm:ss'Z'";
|
||||
|
||||
public static final String ISO_8601_FORMAT_Z= "yyyy-MM-dd'T'HH:mm:ss'Z'";
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -212,8 +213,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
|||
* 将时间戳转换为指定格式的时间字符串
|
||||
*
|
||||
* @param timestamp 时间戳(毫秒)
|
||||
* @param format 目标时间格式,例如:yyyy-MM-dd'T'HH:mm:ssXXX
|
||||
* @param timeZone 时区,例如:GMT+8,UTC等
|
||||
* @param format 目标时间格式,例如:yyyy-MM-dd'T'HH:mm:ssXXX
|
||||
* @param timeZone 时区,例如:GMT+8,UTC等
|
||||
* @return 格式化后的时间字符串
|
||||
*/
|
||||
public static String convertTimestampToFormattedDate(long timestamp, String format, String timeZone) {
|
||||
|
|
@ -250,6 +251,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 增加 LocalDate ==> Date
|
||||
*/
|
||||
|
|
@ -941,57 +943,4 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
|||
public static boolean isBetween(Long value, Long minValue, Long maxValue) {
|
||||
return value >= minValue && value <= maxValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将日期字符串转换为指定时区的毫秒时间戳
|
||||
*
|
||||
* @param dateString 日期字符串,格式为 "yyyy-MM-dd'T'HH:mm:ss.SSS"
|
||||
* @param timezone 时区(如 UTC、Asia/Shanghai)
|
||||
* @return 时区下的毫秒时间戳
|
||||
* @throws Exception 日期解析异常
|
||||
*/
|
||||
public static long convertToMillisWithTimezone(String dateString, String timezone) {
|
||||
try {
|
||||
// 设置日期格式
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
|
||||
|
||||
// 设置解析时使用的时区
|
||||
sdf.setTimeZone(TimeZone.getTimeZone(timezone));
|
||||
|
||||
// 解析日期字符串为 Date 对象
|
||||
Date date = sdf.parse(dateString);
|
||||
|
||||
// 获取项目默认时区
|
||||
TimeZone defaultTimeZone = TimeZone.getDefault();
|
||||
|
||||
// 使用默认时区的 Calendar 计算
|
||||
Calendar calendar = Calendar.getInstance(defaultTimeZone);
|
||||
calendar.setTime(date);
|
||||
|
||||
// 返回该时区对应的毫秒时间戳
|
||||
return calendar.getTimeInMillis();
|
||||
} catch (Exception e) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 将自定义格式的时间字符串转换为毫秒级时间戳(UTC)
|
||||
*
|
||||
* @param dateStr 时间字符串
|
||||
* @param pattern 时间格式模式(如"yyyy-MM-dd HH:mm:ss")
|
||||
* @return 毫秒级时间戳
|
||||
* @throws ParseException 如果解析失败
|
||||
*/
|
||||
public static long toTimestamp(String dateStr, String pattern) {
|
||||
try {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
|
||||
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
return sdf.parse(dateStr).getTime();
|
||||
} catch (Exception e) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.ff.api.controller;
|
||||
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.ff.annotation.CheckHeader;
|
||||
import com.ff.api.request.*;
|
||||
import com.ff.api.response.*;
|
||||
|
|
@ -9,9 +8,9 @@ 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.enums.ErrorCode;
|
||||
import com.ff.base.enums.TransferType;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
import com.ff.base.manager.AsyncManager;
|
||||
import com.ff.base.system.domain.TenantSecretKey;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
import com.ff.base.utils.bean.BeanUtils;
|
||||
|
|
@ -20,8 +19,6 @@ 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.exchange.StepProcessorFactory;
|
||||
import com.ff.game.api.exchange.dto.GameExchangeDTO;
|
||||
import com.ff.game.api.request.*;
|
||||
import com.ff.game.domain.*;
|
||||
import com.ff.game.dto.GameBettingDetailsDTO;
|
||||
|
|
@ -33,10 +30,8 @@ import lombok.Data;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
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;
|
||||
|
|
@ -44,14 +39,12 @@ import org.springframework.web.bind.annotation.PostMapping;
|
|||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.context.request.async.DeferredResult;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
/**
|
||||
* api控制器
|
||||
|
|
@ -98,10 +91,6 @@ public class ApiGameController extends BaseController {
|
|||
@Resource
|
||||
private IPlatformService platformService;
|
||||
|
||||
|
||||
@Resource
|
||||
private StepProcessorFactory stepProcessorFactory;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*
|
||||
|
|
@ -159,8 +148,6 @@ public class ApiGameController extends BaseController {
|
|||
ApiException.notNull(targetLang, ErrorCode.LANG_NOT_EXIST.getCode());
|
||||
|
||||
|
||||
ApiException.isTrue(game.getStopStatus(), ErrorCode.GAME_NOT_EXIST.getCode());
|
||||
|
||||
Member member = memberService.selectMemberByAccount(loginRequest.getAccount(), loginRequest.getCurrencyCode(), platform.getPlatformCode());
|
||||
ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
|
||||
|
||||
|
|
@ -195,7 +182,8 @@ public class ApiGameController extends BaseController {
|
|||
* @return {@link AjaxResult }
|
||||
*/
|
||||
@PostMapping("/exchange/balance")
|
||||
public DeferredResult<AjaxResult> exchangeBalance(@Validated @RequestBody GameExchangeBalanceRequest gameExchangeBalanceRequest) {
|
||||
@Transactional
|
||||
public AjaxResult exchangeBalance(@Validated @RequestBody GameExchangeBalanceRequest gameExchangeBalanceRequest) {
|
||||
|
||||
IGamesService iGamesService = gamesService.get(gameExchangeBalanceRequest.getPlatformCode() + Constants.SERVICE);
|
||||
ApiException.notNull(iGamesService, ErrorCode.PLATFORM_NOT_EXIST.getCode());
|
||||
|
|
@ -219,77 +207,51 @@ public class ApiGameController extends BaseController {
|
|||
}
|
||||
}
|
||||
ApiException.notNull(keyInfo, ErrorCode.CURRENCY_NOT_EXIST.getCode());
|
||||
BigDecimal quota = BigDecimal.ZERO;
|
||||
//如果是扣钱提前扣
|
||||
if (TransferType.GAMES.getCode().equals(gameExchangeBalanceRequest.getTransferType())) {
|
||||
quota = tenantGameQuotaService.gameBalanceExchange(GameBalanceExchange.builder()
|
||||
.platformCode(gameExchangeBalanceRequest.getPlatformCode())
|
||||
.sourceId(gameExchangeBalanceRequest.getOrderId())
|
||||
.currencyCode(gameExchangeBalanceRequest.getCurrencyCode())
|
||||
.currency(targetCurrency)
|
||||
.transferType(gameExchangeBalanceRequest.getTransferType())
|
||||
.amount(gameExchangeBalanceRequest.getAmount())
|
||||
.account(gameExchangeBalanceRequest.getAccount())
|
||||
.tenantKey(tenantSecretKey.getTenantKey())
|
||||
.systemCurrency(gameExchangeBalanceRequest.getCurrencyCode())
|
||||
.agentId(keyInfo.getCode())
|
||||
.agentKey(keyInfo.getKey())
|
||||
.build());
|
||||
}
|
||||
|
||||
|
||||
// 获取用户信息
|
||||
Member member = memberService.selectMemberByAccount(gameExchangeBalanceRequest.getAccount(), gameExchangeBalanceRequest.getCurrencyCode(), gameExchangeBalanceRequest.getPlatformCode());
|
||||
ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
|
||||
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(tenantSecretKey.getTenantKey())
|
||||
.orderId(gameExchangeBalanceRequest.getOrderId())
|
||||
.build()
|
||||
);
|
||||
|
||||
ApiException.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), ErrorCode.DUPLICATE_ORDER_ID.getCode());
|
||||
|
||||
|
||||
Long gameExchangeMoneyId = IdUtil.getSnowflakeNextId();
|
||||
GameExchangeDTO exchangeMoney = GameExchangeDTO.builder()
|
||||
.id(gameExchangeMoneyId)
|
||||
.tenantKey(tenantSecretKey.getTenantKey())
|
||||
.memberId(member.getId())
|
||||
.gameAccount(member.getGameAccount())
|
||||
.memberAccount(member.getMemberAccount())
|
||||
.exchangeType(gameExchangeBalanceRequest.getTransferType())
|
||||
.currencyCode(gameExchangeBalanceRequest.getCurrencyCode())
|
||||
//操作第三方额度接口
|
||||
ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO = ExchangeTransferMoneyRequestDTO.builder()
|
||||
.agentId(keyInfo.getCode())
|
||||
.agentKey(keyInfo.getKey())
|
||||
.orderId(gameExchangeBalanceRequest.getOrderId())
|
||||
.balance(gameExchangeBalanceRequest.getAmount())
|
||||
.triggerType(TriggerType.MANUAL.getCode())
|
||||
.platformCode(gameExchangeBalanceRequest.getPlatformCode()).build();
|
||||
.account(member.getGameAccount())
|
||||
.currency(targetCurrency)
|
||||
.tenantKey(tenantSecretKey.getTenantKey())
|
||||
.quota(quota)
|
||||
.amount(gameExchangeBalanceRequest.getAmount())
|
||||
.transferType(gameExchangeBalanceRequest.getTransferType())
|
||||
.vendor(platform)
|
||||
.keyInfo(keyInfo)
|
||||
.systemCurrency(gameExchangeBalanceRequest.getCurrencyCode())
|
||||
|
||||
|
||||
//转出设置转出金额为0
|
||||
if (TransferType.ALL.getCode().equals(gameExchangeBalanceRequest.getTransferType())){
|
||||
exchangeMoney.setBalance(BigDecimal.ZERO);
|
||||
}
|
||||
|
||||
|
||||
ExtInfo extInfo = platform.getExtInfo();
|
||||
Long timeout = 5000L;
|
||||
if (extInfo != null) {
|
||||
timeout = extInfo.getTimeout(TimeOutType.GAME_EXCHANGE_MONEY.getCode());
|
||||
}
|
||||
|
||||
|
||||
DeferredResult<AjaxResult> output = new DeferredResult<>(timeout);
|
||||
AsyncManager.me().executeOrdered(
|
||||
exchangeMoney.getOrderId(),
|
||||
() -> {
|
||||
try {
|
||||
stepProcessorFactory.getStepProcessor(GameExchangeStep.CREATE_ORDER).process(exchangeMoney);
|
||||
|
||||
GameExchangeMoney gameExchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(gameExchangeMoneyId);
|
||||
GameExchangeBalanceResponse gameExchangeBalanceResponse = new GameExchangeBalanceResponse();
|
||||
BeanUtils.copyProperties(gameExchangeMoney, gameExchangeBalanceResponse);
|
||||
output.setResult(AjaxResult.success(gameExchangeBalanceResponse));
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("ApiGameController [exchangeBalance] 余额转移失败 gameExchangeMoneyId {}", gameExchangeMoneyId,e);
|
||||
stepProcessorFactory.getStepProcessor(GameExchangeStep.getByCode(exchangeMoney.getStep())).rollBack(exchangeMoney);
|
||||
output.setErrorResult(AjaxResult.error(ErrorCode.BALANCE_TRANSFER_FAILED.getCode(), ErrorCode.BALANCE_TRANSFER_FAILED.getMessage()));
|
||||
}
|
||||
|
||||
}
|
||||
);
|
||||
// 超时时间处理逻辑
|
||||
output.onTimeout(() -> {
|
||||
GameExchangeMoney gameExchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(gameExchangeMoneyId);
|
||||
GameExchangeBalanceResponse gameExchangeBalanceResponse = new GameExchangeBalanceResponse();
|
||||
BeanUtils.copyProperties(gameExchangeMoney, gameExchangeBalanceResponse);
|
||||
output.setErrorResult(AjaxResult.success(gameExchangeBalanceResponse));
|
||||
});
|
||||
return output;
|
||||
.build();
|
||||
Long exchangeTransferId = iGamesService.exchangeTransferByAgentId(exchangeTransferMoneyRequestDTO);
|
||||
GameExchangeMoney gameExchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferId);
|
||||
GameExchangeBalanceResponse gameExchangeBalanceResponse = new GameExchangeBalanceResponse();
|
||||
BeanUtils.copyProperties(gameExchangeMoney, gameExchangeBalanceResponse);
|
||||
return AjaxResult.success(gameExchangeBalanceResponse);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -329,6 +291,11 @@ public class ApiGameController extends BaseController {
|
|||
ApiException.notNull(iGamesService, ErrorCode.PLATFORM_NOT_EXIST.getCode());
|
||||
|
||||
|
||||
// TenantSecretKey tenantSecretKey = keyConfig.get();
|
||||
// GameSecretKeyCurrencyDTO gameSecretKey = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTO(GameSecretKeyCurrencyDTO.builder()
|
||||
// .platformCode(gameCreateFreeSpinRequest.getPlatformCode())
|
||||
// .systemCurrency(gameCreateFreeSpinRequest.getCurrencyCode()).build());
|
||||
// ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode());
|
||||
Platform platform = platformService.get(gameCreateFreeSpinRequest.getPlatformCode());
|
||||
ApiException.notNull(platform, ErrorCode.PLATFORM_NOT_EXIST.getCode());
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public class GameBettingDetailsResponse implements Serializable
|
|||
|
||||
|
||||
/** 游戏id */
|
||||
private String gameId;
|
||||
private Long gameId;
|
||||
|
||||
/** 游戏类型 ff_game_type 字典 */
|
||||
private Integer gameType;
|
||||
|
|
|
|||
|
|
@ -67,9 +67,4 @@ public class GameBalanceExchange extends GamesBaseRequestDTO implements Serializ
|
|||
*/
|
||||
private String sourceId;
|
||||
|
||||
/**
|
||||
* 就是全部
|
||||
*/
|
||||
private Boolean isAll;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +1,40 @@
|
|||
package com.ff.common.service.impl;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
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.base.utils.DateUtils;
|
||||
import com.ff.base.utils.QuotaUtils;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
import com.ff.common.domain.TenantGameQuota;
|
||||
import com.ff.common.domain.TenantGameQuotaFlow;
|
||||
import com.ff.common.domain.TenantQuotaExchange;
|
||||
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.mapper.TenantGameQuotaMapper;
|
||||
import com.ff.common.service.ITenantGameQuotaFlowService;
|
||||
import com.ff.common.service.ITenantGameQuotaService;
|
||||
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;
|
||||
import com.ff.member.domain.Member;
|
||||
import com.ff.member.service.IMemberService;
|
||||
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;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 租户游戏配额Service业务层处理
|
||||
|
|
@ -152,7 +150,7 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService {
|
|||
BigDecimal balance = balanceChangesDTO.getBalance();
|
||||
//如果有汇率 则需要计算真实扣除额度
|
||||
if (!ObjectUtils.isEmpty(balanceChangesDTO.getActualBalance())) {
|
||||
balance = NumberUtil.div(balance, balanceChangesDTO.getActualBalance(), 5, RoundingMode.FLOOR);
|
||||
balance = NumberUtil.div(balance, balanceChangesDTO.getActualBalance(), 2, RoundingMode.FLOOR);
|
||||
}
|
||||
|
||||
if (BigDecimal.ZERO.compareTo(balance) >= 0) {
|
||||
|
|
@ -222,7 +220,7 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService {
|
|||
BigDecimal balance = balanceRealChangesDTO.getBalance();
|
||||
//如果有汇率 则需要计算真实扣除额度
|
||||
if (!ObjectUtils.isEmpty(balanceRealChangesDTO.getActualBalance())) {
|
||||
balance = NumberUtil.div(balance, balanceRealChangesDTO.getActualBalance(), 5, RoundingMode.FLOOR);
|
||||
balance = NumberUtil.div(balance, balanceRealChangesDTO.getActualBalance(), 2, RoundingMode.FLOOR);
|
||||
}
|
||||
|
||||
if (BigDecimal.ZERO.compareTo(balance) >= 0) {
|
||||
|
|
@ -314,20 +312,18 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService {
|
|||
|
||||
// 如果是出账操作
|
||||
if (isOut) {
|
||||
if (ObjectUtils.isEmpty(gameBalanceExchange.getIsAll())||gameBalanceExchange.getIsAll()){
|
||||
// 获取第三方钱包余额
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(gameBalanceExchange.getAgentId())
|
||||
.currency(gameBalanceExchange.getCurrency())
|
||||
.agentKey(gameBalanceExchange.getAgentKey())
|
||||
.build();
|
||||
balanceRequestAmount = iGamesService.getMemberInfo(gamesBaseRequestDTO).getBalance();
|
||||
if (balanceRequestAmount.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
throw new ApiException(ErrorCode.INSUFFICIENT_PLAYER_BALANCE.getCode());
|
||||
}
|
||||
}
|
||||
// 获取第三方钱包余额
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(gameBalanceExchange.getAgentId())
|
||||
.currency(gameBalanceExchange.getCurrency())
|
||||
.agentKey(gameBalanceExchange.getAgentKey())
|
||||
.build();
|
||||
balanceRequestAmount = iGamesService.getMemberInfo(gamesBaseRequestDTO).getBalance();
|
||||
|
||||
if (balanceRequestAmount.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
throw new ApiException(ErrorCode.INSUFFICIENT_PLAYER_BALANCE.getCode());
|
||||
}
|
||||
|
||||
balanceRequestAmount = NumberUtil.add(balanceRequestAmount, NumberUtil.mul(balanceRequestAmount, NumberUtil.div(tenantPlatform.getUseCost(), Constants.HUNDRED)));
|
||||
|
||||
|
|
|
|||
|
|
@ -52,14 +52,6 @@ public interface IGamesService {
|
|||
*/
|
||||
String getGameList(GamesBaseRequestDTO gamesBaseRequestDTO);
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO);
|
||||
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
|
|
|
|||
|
|
@ -205,9 +205,9 @@ public class GamesAEServiceImpl implements IGamesService {
|
|||
if (ObjectUtils.isEmpty(game)) {
|
||||
game = new Game();
|
||||
game.setId(GAME_ID);
|
||||
game.setSortNo(gameService.selectMaxSortNo(PlatformType.VIDEO.getCode(), GamePlatforms.AE.getCode()) + 1);
|
||||
game.setSortNo(gameService.selectMaxSortNo(PlatformType.GAME_HALL.getCode(), GamePlatforms.AE.getCode()) + 1);
|
||||
game.setPlatformCode(platform.getPlatformCode());
|
||||
game.setPlatformType(PlatformType.VIDEO.getCode());
|
||||
game.setPlatformType(PlatformType.GAME_HALL.getCode());
|
||||
game.setGameCode("1");
|
||||
game.setGameSourceType(String.valueOf(1));
|
||||
game.setGameName("AE大厅");
|
||||
|
|
@ -218,27 +218,10 @@ public class GamesAEServiceImpl implements IGamesService {
|
|||
game.setNameInfo(Collections.singletonList(nameInfo));
|
||||
game.setGameId(StringUtils.addSuffix(GamePlatforms.AE.getCode(), 1));
|
||||
gameService.insertGame(game);
|
||||
}else {
|
||||
NameInfo nameInfo = new NameInfo();
|
||||
nameInfo.setLang("zh-CN");
|
||||
nameInfo.setName("AE大厅");
|
||||
game.setNameInfo(Collections.singletonList(nameInfo));
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
return CacheConstants.AE_GAMES;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.AE.getCode() + IdUtils.simpleUUID();
|
||||
}
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -251,8 +234,34 @@ public class GamesAEServiceImpl implements IGamesService {
|
|||
log.info("GamesAEServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = GamePlatforms.AE.getCode() + IdUtils.simpleUUID();
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.AE.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
|
||||
Map<String, Object> params = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
|
|
@ -261,13 +270,13 @@ public class GamesAEServiceImpl implements IGamesService {
|
|||
if (TransferType.GAMES.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) {
|
||||
|
||||
params.put("userId", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("txCode", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("txCode", transactionId);
|
||||
params.put("transferAmount", exchangeTransferMoneyRequestDTO.getAmount());
|
||||
deposit = AEClient.deposit(params);
|
||||
|
||||
} else {
|
||||
params.put("userId", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("txCode", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("txCode", transactionId);
|
||||
params.put("withdrawType", 1);
|
||||
deposit = AEClient.withdraw(params);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ public class GamesDGServiceImpl implements IGamesService {
|
|||
game.setId(GAME_ID);
|
||||
game.setSortNo(1);
|
||||
game.setPlatformCode(GamePlatforms.DG.getCode());
|
||||
game.setPlatformType(PlatformType.VIDEO.getCode());
|
||||
game.setPlatformType(PlatformType.GAME_HALL.getCode());
|
||||
game.setGameCode("1");
|
||||
game.setGameSourceType(String.valueOf(1));
|
||||
game.setGameName("真人棋牌");
|
||||
|
|
@ -204,28 +204,10 @@ public class GamesDGServiceImpl implements IGamesService {
|
|||
game.setNameInfo(Collections.singletonList(new NameInfo("真人棋牌", "zh-CN")));
|
||||
game.setGameId(StringUtils.addSuffix(GamePlatforms.DG.getCode(), 1));
|
||||
gameService.insertGame(game);
|
||||
}else {
|
||||
game.setNameInfo(Collections.singletonList(new NameInfo("真人棋牌", "zh-CN")));
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
return CacheConstants.DG_GAMES;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.DG.getInfo() + IdUtils.simpleUUID();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -238,14 +220,39 @@ public class GamesDGServiceImpl implements IGamesService {
|
|||
log.info("GamesDGServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = GamePlatforms.DG.getInfo() + IdUtils.simpleUUID();
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.DG.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
BigDecimal amount = exchangeTransferMoneyRequestDTO.getAmount();
|
||||
if (TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) {
|
||||
// 获取第三方钱包余额
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(exchangeTransferMoneyRequestDTO.getAccount())
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(exchangeTransferMoneyRequestDTO.getAgentId())
|
||||
.currency(exchangeTransferMoneyRequestDTO.getCurrency())
|
||||
.agentKey(exchangeTransferMoneyRequestDTO.getAgentKey())
|
||||
|
|
@ -258,7 +265,7 @@ public class GamesDGServiceImpl implements IGamesService {
|
|||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("username", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("amount", amount);
|
||||
params.put("serial", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("serial", transactionId);
|
||||
|
||||
Map<String, Object> headerMap = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
DGTransactionResponseDTO dgTransactionResponseDTO = DGClient.exchangeTransferByAgentId(params, headerMap);
|
||||
|
|
|
|||
|
|
@ -1,118 +0,0 @@
|
|||
package com.ff.game.api.exchange;
|
||||
|
||||
import com.ff.base.enums.GameExchangeStep;
|
||||
import com.ff.base.enums.GameExchangeStepStatus;
|
||||
import com.ff.base.exception.base.BaseException;
|
||||
import com.ff.game.api.exchange.dto.GameExchangeDTO;
|
||||
import com.ff.game.domain.GameExchangeMoney;
|
||||
import com.ff.game.service.IGameExchangeMoneyService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.transaction.TransactionDefinition;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 抽象步进处理机
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Slf4j
|
||||
public abstract class AbstractStepProcessor implements StepProcessorService {
|
||||
|
||||
|
||||
@Resource
|
||||
private StepProcessorFactory stepProcessorFactory;
|
||||
|
||||
|
||||
@Resource
|
||||
private IGameExchangeMoneyService gameExchangeMoneyService;
|
||||
|
||||
/**
|
||||
* 过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
*/
|
||||
@Override
|
||||
public void process(GameExchangeDTO gameExchangeMoney) {
|
||||
boolean processResult = false;
|
||||
try {
|
||||
processResult = doProcess(gameExchangeMoney);
|
||||
} catch (Exception e) {
|
||||
log.error("游戏余额转移{}-步骤任务{}-执行异常", gameExchangeMoney.getId(), stepKey().getDescription(), e);
|
||||
throw new BaseException("游戏余额转移"+gameExchangeMoney.getId()+"-步骤任务"+stepKey().getDescription()+"-执行异常" );
|
||||
}
|
||||
//更新状态
|
||||
if (processResult) {
|
||||
log.info("游戏余额转移{}-步骤任务{}-执行成功", gameExchangeMoney.getId(), stepKey().getDescription());
|
||||
triggerNextStep(gameExchangeMoney);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 降低
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
*/
|
||||
@Override
|
||||
public void rollBack(GameExchangeDTO gameExchangeMoney){
|
||||
boolean processResult = false;
|
||||
try {
|
||||
processResult = doRollBack(gameExchangeMoney);
|
||||
} catch (Exception e) {
|
||||
log.error("游戏余额转移{}-步骤任务{}-回滚异常", gameExchangeMoney.getId(), stepKey().getDescription(), e);
|
||||
}
|
||||
if (processResult) {
|
||||
log.info("游戏余额转移{}-步骤任务{}-回滚成功", gameExchangeMoney.getId(), stepKey().getDescription());
|
||||
triggerBackStep(gameExchangeMoney);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 触发后退
|
||||
*
|
||||
* @param exchangeMoney 兑换货币
|
||||
*/
|
||||
private void triggerBackStep(GameExchangeDTO exchangeMoney) {
|
||||
GameExchangeStep nextStep = backStepProcessor();
|
||||
if (nextStep != null) {
|
||||
stepProcessorFactory.getStepProcessor(nextStep).rollBack(exchangeMoney);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 触发下一步
|
||||
*
|
||||
* @param exchangeMoney 兑换货币
|
||||
*/
|
||||
private void triggerNextStep(GameExchangeDTO exchangeMoney) {
|
||||
GameExchangeStep nextStep = nextStepProcessor();
|
||||
if (nextStep != null) {
|
||||
stepProcessorFactory.getStepProcessor(nextStep).process(exchangeMoney);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 一定要回滚
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
* @throws Exception 例外
|
||||
*/
|
||||
abstract public boolean doRollBack(GameExchangeDTO gameExchangeMoney) throws Exception;
|
||||
|
||||
/**
|
||||
* do过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
* @throws Exception 例外
|
||||
*/
|
||||
abstract public boolean doProcess(GameExchangeDTO gameExchangeMoney) throws Exception;
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
package com.ff.game.api.exchange;
|
||||
|
||||
import com.ff.base.enums.GameExchangeStep;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 步进处理机厂
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Component
|
||||
public class StepProcessorFactory {
|
||||
|
||||
@Autowired
|
||||
List<StepProcessorService> stepProcessors;
|
||||
|
||||
private Map<GameExchangeStep, StepProcessorService> processorMap;
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
Map<GameExchangeStep, StepProcessorService> map = new HashMap<>();
|
||||
for (StepProcessorService stepProcessor : stepProcessors) {
|
||||
map.put(stepProcessor.stepKey(), stepProcessor);
|
||||
}
|
||||
|
||||
processorMap = Collections.unmodifiableMap(map);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取步进处理器
|
||||
*
|
||||
* @param stepKey 步进键
|
||||
* @return {@link StepProcessorService }
|
||||
*/
|
||||
public StepProcessorService getStepProcessor(GameExchangeStep stepKey) {
|
||||
return processorMap.get(stepKey);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
package com.ff.game.api.exchange;
|
||||
|
||||
import com.ff.base.enums.GameExchangeStep;
|
||||
import com.ff.game.api.exchange.dto.GameExchangeDTO;
|
||||
|
||||
/**
|
||||
* 步进处理机
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
public interface StepProcessorService {
|
||||
|
||||
/**
|
||||
* 返回处理器类型
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
GameExchangeStep stepKey();
|
||||
|
||||
|
||||
/**
|
||||
* 过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
*/
|
||||
void process(GameExchangeDTO gameExchangeMoney);
|
||||
|
||||
|
||||
/**
|
||||
* 回退
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
*/
|
||||
void rollBack(GameExchangeDTO gameExchangeMoney);
|
||||
|
||||
|
||||
/**
|
||||
* 步骤之间有依赖
|
||||
* 找出下一个步骤处理器进行处理
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
GameExchangeStep nextStepProcessor();
|
||||
|
||||
|
||||
/**
|
||||
* 步骤之间有依赖
|
||||
* 找出上一个步骤处理器进行处理
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
GameExchangeStep backStepProcessor();
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
package com.ff.game.api.exchange.dto;
|
||||
|
||||
import com.ff.base.annotation.Excel;
|
||||
import com.ff.game.domain.GameExchangeMoney;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* 游戏兑换货币dto
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@SuperBuilder
|
||||
public class GameExchangeDTO extends GameExchangeMoney {
|
||||
/**
|
||||
* 触发类型 1 用户调用手动触发 2 定时器触发
|
||||
*/
|
||||
private Integer triggerType;
|
||||
|
||||
/** 会员账号 */
|
||||
private String memberAccount;
|
||||
|
||||
/** 游戏账号 */
|
||||
private String gameAccount;
|
||||
|
||||
}
|
||||
|
|
@ -1,170 +0,0 @@
|
|||
package com.ff.game.api.exchange.impl;
|
||||
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
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;
|
||||
import com.ff.game.api.request.ExchangeTransferMoneyRequestDTO;
|
||||
import com.ff.game.api.request.ExchangeTransferStatusRequestDTO;
|
||||
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.IPlatformService;
|
||||
import com.ff.member.domain.Member;
|
||||
import com.ff.member.service.IMemberService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionDefinition;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* 增加余额
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Service
|
||||
@Order(4)
|
||||
public class AddBalanceServiceImpl extends AbstractStepProcessor {
|
||||
|
||||
|
||||
@Resource
|
||||
private IMemberService memberService;
|
||||
|
||||
@Resource
|
||||
private ITenantGameQuotaService tenantGameQuotaService;
|
||||
@Resource
|
||||
private IGameExchangeMoneyService gameExchangeMoneyService;
|
||||
@Resource
|
||||
private PlatformTransactionManager transactionManager;
|
||||
@Resource
|
||||
private IPlatformService platformService;
|
||||
/**
|
||||
* 步进键
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep stepKey() {
|
||||
return GameExchangeStep.TENANT_QUOTA_DEDUCTED;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* do过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doProcess(GameExchangeDTO gameExchangeMoney) {
|
||||
//如果不是之前的步骤代码执行过了 或者是转入操作
|
||||
if (!gameExchangeMoney.getStep().equals(GameExchangeStep.PLATFORM_TRANSACTION.getCode()) ) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
if (!gameExchangeMoney.getStepStatus().equals(StatusType.SUCCESS.getValue())){
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
|
||||
transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
|
||||
Boolean result = transactionTemplate.execute(transactionStatus -> {
|
||||
//不是转入操作
|
||||
if (!TransferType.ALL.getCode().equals(gameExchangeMoney.getExchangeType())) {
|
||||
gameExchangeMoney.setStep(GameExchangeStep.DEDUCT_BALANCE.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoney.setStatus(StatusType.SUCCESS.getValue());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
|
||||
Platform platform = platformService.get(gameExchangeMoney.getPlatformCode());
|
||||
KeyInfo keyInfo = null;
|
||||
for (KeyInfo keyData : platform.getKeyInfo()) {
|
||||
if (StringUtils.isNotEmpty(gameExchangeMoney.getCurrencyCode())) {
|
||||
if (keyData.getCurrency().equalsIgnoreCase(gameExchangeMoney.getCurrencyCode())) {
|
||||
keyInfo = keyData;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
BigDecimal decimal = tenantGameQuotaService.gameBalanceExchange(GameBalanceExchange.builder()
|
||||
.platformCode(gameExchangeMoney.getPlatformCode())
|
||||
.sourceId(String.valueOf(gameExchangeMoney.getId()))
|
||||
.currencyCode(gameExchangeMoney.getCurrencyCode())
|
||||
.currency(gameExchangeMoney.getCurrencyCode())
|
||||
.transferType(gameExchangeMoney.getExchangeType())
|
||||
.amount(gameExchangeMoney.getBalance())
|
||||
.isAll(Boolean.FALSE)
|
||||
.account(memberService.selectMemberById(gameExchangeMoney.getMemberId()).getMemberAccount())
|
||||
.tenantKey(gameExchangeMoney.getTenantKey())
|
||||
.systemCurrency(gameExchangeMoney.getCurrencyCode())
|
||||
.agentId(keyInfo.getCode())
|
||||
.agentKey(keyInfo.getKey())
|
||||
.build());
|
||||
|
||||
gameExchangeMoney.setQuota(decimal);
|
||||
gameExchangeMoney.setStep(GameExchangeStep.TENANT_QUOTA_DEDUCTED.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoney.setStatus(StatusType.SUCCESS.getValue());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
|
||||
});
|
||||
return Boolean.TRUE.equals(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 一定要回滚 最后一步成功了就结束了
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doRollBack(GameExchangeDTO gameExchangeMoney) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* 下一步处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep nextStepProcessor() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后级处理器 最后一步无法回滚
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep backStepProcessor() {
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,112 +0,0 @@
|
|||
package com.ff.game.api.exchange.impl;
|
||||
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
import com.ff.base.manager.AsyncManager;
|
||||
import com.ff.base.utils.DateUtils;
|
||||
import com.ff.base.utils.uuid.IdUtils;
|
||||
import com.ff.game.api.IGamesService;
|
||||
import com.ff.game.api.exchange.AbstractStepProcessor;
|
||||
import com.ff.game.api.exchange.StepProcessorFactory;
|
||||
import com.ff.game.api.exchange.StepProcessorService;
|
||||
import com.ff.game.api.exchange.dto.GameExchangeDTO;
|
||||
import com.ff.game.api.request.ExchangeTransferStatusRequestDTO;
|
||||
import com.ff.game.api.request.TransactionIdRequestDTO;
|
||||
import com.ff.game.domain.GameExchangeMoney;
|
||||
import com.ff.game.service.IGameExchangeMoneyService;
|
||||
import com.ff.member.domain.Member;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import java.util.Base64;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 创建订单impl
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Service
|
||||
@Order(1)
|
||||
public class CreateOrderServiceImpl extends AbstractStepProcessor {
|
||||
|
||||
@Resource
|
||||
private IGameExchangeMoneyService gameExchangeMoneyService;
|
||||
@Resource
|
||||
private StepProcessorFactory stepProcessorFactory;
|
||||
|
||||
@Autowired
|
||||
private Map<String, IGamesService> gamesService;
|
||||
|
||||
/**
|
||||
* 步进键
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep stepKey() {
|
||||
return GameExchangeStep.CREATE_ORDER;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* do过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doProcess(GameExchangeDTO gameExchangeMoney) {
|
||||
|
||||
String transactionId = gamesService.get(gameExchangeMoney.getPlatformCode()+Constants.SERVICE).getTransactionId(TransactionIdRequestDTO.builder().exchangeType(gameExchangeMoney.getExchangeType()).gameAccount(gameExchangeMoney.getGameAccount()).build());
|
||||
gameExchangeMoney.setTransactionId(transactionId);
|
||||
gameExchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
gameExchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
gameExchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
return gameExchangeMoneyService.insertGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 一定要回滚
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doRollBack(GameExchangeDTO gameExchangeMoney) {
|
||||
gameExchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
gameExchangeMoney.setStatus(StatusType.FAILURE.getValue());
|
||||
gameExchangeMoney.setUpdateBy(Constants.SYSTEM);
|
||||
gameExchangeMoney.setUpdateTime(DateUtils.getNowDate());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 下一步处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep nextStepProcessor() {
|
||||
return GameExchangeStep.DEDUCT_BALANCE;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后级处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep backStepProcessor() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,207 +0,0 @@
|
|||
package com.ff.game.api.exchange.impl;
|
||||
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
import com.ff.base.utils.DateUtils;
|
||||
import com.ff.base.utils.QuotaUtils;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
import com.ff.base.utils.uuid.IdUtils;
|
||||
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;
|
||||
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.IPlatformService;
|
||||
import com.ff.member.service.IMemberService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionDefinition;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 转入提前扣租户余额impl
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Service
|
||||
@Order(2)
|
||||
public class DeductBalanceServiceImpl extends AbstractStepProcessor {
|
||||
|
||||
@Resource
|
||||
private IGameExchangeMoneyService gameExchangeMoneyService;
|
||||
|
||||
@Resource
|
||||
private ITenantGameQuotaService tenantGameQuotaService;
|
||||
|
||||
@Resource
|
||||
private IMemberService memberService;
|
||||
|
||||
@Resource
|
||||
private IPlatformService platformService;
|
||||
@Resource
|
||||
private ITenantGameQuotaFlowService tenantGameQuotaFlowService;
|
||||
@Autowired
|
||||
private PlatformTransactionManager transactionManager;
|
||||
|
||||
/**
|
||||
* 步进键
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep stepKey() {
|
||||
return GameExchangeStep.DEDUCT_BALANCE;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* do过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doProcess(GameExchangeDTO gameExchangeMoney) {
|
||||
TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
|
||||
transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
|
||||
Boolean result = transactionTemplate.execute(transactionStatus -> {
|
||||
|
||||
//如果不是之前的步骤代码执行过了
|
||||
if (!gameExchangeMoney.getStep().equals(this.backStepProcessor().getCode())) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
//不是转入操作
|
||||
if (!TransferType.GAMES.getCode().equals(gameExchangeMoney.getExchangeType())) {
|
||||
gameExchangeMoney.setStep(GameExchangeStep.DEDUCT_BALANCE.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
|
||||
Platform platform = platformService.get(gameExchangeMoney.getPlatformCode());
|
||||
KeyInfo keyInfo = null;
|
||||
for (KeyInfo keyData : platform.getKeyInfo()) {
|
||||
if (StringUtils.isNotEmpty(gameExchangeMoney.getCurrencyCode())) {
|
||||
if (keyData.getCurrency().equalsIgnoreCase(gameExchangeMoney.getCurrencyCode())) {
|
||||
keyInfo = keyData;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
BigDecimal decimal = tenantGameQuotaService.gameBalanceExchange(GameBalanceExchange.builder()
|
||||
.platformCode(gameExchangeMoney.getPlatformCode())
|
||||
.sourceId(String.valueOf(gameExchangeMoney.getId()))
|
||||
.currencyCode(gameExchangeMoney.getCurrencyCode())
|
||||
.currency(gameExchangeMoney.getCurrencyCode())
|
||||
.transferType(gameExchangeMoney.getExchangeType())
|
||||
.amount(gameExchangeMoney.getBalance())
|
||||
.account(memberService.selectMemberById(gameExchangeMoney.getMemberId()).getMemberAccount())
|
||||
.tenantKey(gameExchangeMoney.getTenantKey())
|
||||
.systemCurrency(gameExchangeMoney.getCurrencyCode())
|
||||
.agentId(keyInfo.getCode())
|
||||
.isAll(Boolean.TRUE)
|
||||
.agentKey(keyInfo.getKey())
|
||||
.build());
|
||||
|
||||
gameExchangeMoney.setQuota(decimal);
|
||||
|
||||
|
||||
gameExchangeMoney.setStep(GameExchangeStep.DEDUCT_BALANCE.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
});
|
||||
return Boolean.TRUE.equals(result);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 一定要回滚
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doRollBack(GameExchangeDTO gameExchangeMoney) {
|
||||
//如果不是之前的步骤代码执行过了 或者是转入操作
|
||||
if (!gameExchangeMoney.getStep().equals(this.stepKey().getCode())) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
|
||||
transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
|
||||
|
||||
//如果该订单已经回滚过增加余额
|
||||
List<TenantGameQuotaFlow> tenantGameQuotaFlows = tenantGameQuotaFlowService.selectTenantGameQuotaFlowList(
|
||||
TenantGameQuotaFlow.builder()
|
||||
.sourceId(String.valueOf(gameExchangeMoney.getId()))
|
||||
.isOut(Boolean.TRUE)
|
||||
.build());
|
||||
if (!CollectionUtils.isEmpty(tenantGameQuotaFlows)){
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
tenantGameQuotaFlows = tenantGameQuotaFlowService.selectTenantGameQuotaFlowList(
|
||||
TenantGameQuotaFlow.builder()
|
||||
.sourceId(String.valueOf(gameExchangeMoney.getId()))
|
||||
.isOut(Boolean.FALSE)
|
||||
.build());
|
||||
if (CollectionUtils.isEmpty(tenantGameQuotaFlows)) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
//取出第一个
|
||||
TenantGameQuotaFlow tenantGameQuotaFlow = tenantGameQuotaFlows.get(0);
|
||||
return tenantGameQuotaService.balanceChanges(BalanceChangesDTO.builder()
|
||||
.isOut(Boolean.TRUE)
|
||||
.platformCode(tenantGameQuotaFlow.getPlatformCode())
|
||||
.currencyCode(tenantGameQuotaFlow.getCurrencyCode())
|
||||
.tenantKey(tenantGameQuotaFlow.getTenantKey())
|
||||
.balance(tenantGameQuotaFlow.getBalance())
|
||||
.sourceId(tenantGameQuotaFlow.getSourceId())
|
||||
.memberId(gameExchangeMoney.getMemberId())
|
||||
.operationType(OperationType.API_BALANCE.getCode())
|
||||
.remark(OperationType.API_BALANCE.getDescription())
|
||||
.quotaType(tenantGameQuotaFlow.getQuotaType()).build());
|
||||
}
|
||||
|
||||
/**
|
||||
* 下一步处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep nextStepProcessor() {
|
||||
return GameExchangeStep.PLATFORM_TRANSACTION;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后级处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep backStepProcessor() {
|
||||
{
|
||||
return GameExchangeStep.CREATE_ORDER;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,214 +0,0 @@
|
|||
package com.ff.game.api.exchange.impl;
|
||||
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
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;
|
||||
import com.ff.game.api.request.ExchangeTransferMoneyRequestDTO;
|
||||
import com.ff.game.api.request.ExchangeTransferStatusRequestDTO;
|
||||
import com.ff.game.api.request.ExchangeTransferStatusResponseDTO;
|
||||
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.IPlatformService;
|
||||
import com.ff.member.domain.Member;
|
||||
import com.ff.member.service.IMemberService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* 操作第三方扣减
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Service
|
||||
@Order(3)
|
||||
public class PlatformTransactionServiceImpl extends AbstractStepProcessor {
|
||||
|
||||
|
||||
@Resource
|
||||
private IGameExchangeMoneyService gameExchangeMoneyService;
|
||||
|
||||
@Resource
|
||||
private IMemberService memberService;
|
||||
|
||||
@Resource
|
||||
private IPlatformService platformService;
|
||||
|
||||
@Autowired
|
||||
private Map<String, IGamesService> gamesService;
|
||||
|
||||
/**
|
||||
* 步进键
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep stepKey() {
|
||||
return GameExchangeStep.PLATFORM_TRANSACTION;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* do过程
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doProcess(GameExchangeDTO gameExchangeMoney) {
|
||||
//如果不是之前的步骤代码执行过了 或者当前步骤成功的
|
||||
if (!gameExchangeMoney.getStep().equals(this.backStepProcessor().getCode())&&
|
||||
(GameExchangeStep.PLATFORM_TRANSACTION.getCode().equals(gameExchangeMoney.getStep())&&
|
||||
gameExchangeMoney.getStepStatus().equals(GameExchangeStepStatus.SUCCESS.getCode()))
|
||||
) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
|
||||
Platform platform = platformService.get(gameExchangeMoney.getPlatformCode());
|
||||
|
||||
String targetCurrency = platform.getCurrencyInfo().get(gameExchangeMoney.getCurrencyCode());
|
||||
ApiException.notNull(targetCurrency, ErrorCode.CURRENCY_NOT_EXIST.getCode());
|
||||
|
||||
KeyInfo keyInfo = null;
|
||||
for (KeyInfo keyData : platform.getKeyInfo()) {
|
||||
if (StringUtils.isNotEmpty(gameExchangeMoney.getCurrencyCode())) {
|
||||
if (keyData.getCurrency().equalsIgnoreCase(gameExchangeMoney.getCurrencyCode())) {
|
||||
keyInfo = keyData;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
Member member = memberService.selectMemberById(gameExchangeMoney.getMemberId());
|
||||
IGamesService iGamesService = gamesService.get(gameExchangeMoney.getPlatformCode() + Constants.SERVICE);
|
||||
|
||||
//查询订单详情
|
||||
if (TriggerType.TIMER.getCode() == gameExchangeMoney.getTriggerType()) {
|
||||
//做二次确认调订单详情接口
|
||||
this.doRollBack(gameExchangeMoney);
|
||||
if (GameExchangeStepStatus.FAILURE.getCode() == gameExchangeMoney.getStepStatus()){
|
||||
throw new ApiException(ErrorCode.BALANCE_TRANSFER_FAILED.getCode());
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
//操作第三方额度接口
|
||||
ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO = ExchangeTransferMoneyRequestDTO.builder()
|
||||
.agentId(keyInfo.getCode())
|
||||
.agentKey(keyInfo.getKey())
|
||||
.account(member.getGameAccount())
|
||||
.currency(targetCurrency)
|
||||
.amount(gameExchangeMoney.getBalance())
|
||||
.transferType(gameExchangeMoney.getExchangeType())
|
||||
.transactionId(gameExchangeMoney.getTransactionId())
|
||||
.gameExchangeId(gameExchangeMoney.getId())
|
||||
.vendor(platform)
|
||||
.keyInfo(keyInfo)
|
||||
.build();
|
||||
Long id = iGamesService.exchangeTransferByAgentId(exchangeTransferMoneyRequestDTO);
|
||||
}catch (Exception e){
|
||||
//做二次确认调订单详情接口
|
||||
this.doRollBack(gameExchangeMoney);
|
||||
if (GameExchangeStepStatus.FAILURE.getCode() == gameExchangeMoney.getStepStatus()){
|
||||
throw new ApiException(ErrorCode.BALANCE_TRANSFER_FAILED.getCode());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(gameExchangeMoney.getId());
|
||||
gameExchangeMoney.setBalance(exchangeMoney.getBalance());
|
||||
gameExchangeMoney.setStep(exchangeMoney.getStep());
|
||||
gameExchangeMoney.setStepStatus(exchangeMoney.getStepStatus());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 一定要回滚
|
||||
*
|
||||
* @param gameExchangeMoney 游戏兑换货币
|
||||
* @return boolean
|
||||
*/
|
||||
@Override
|
||||
public boolean doRollBack(GameExchangeDTO gameExchangeMoney) {
|
||||
|
||||
Platform platform = platformService.get(gameExchangeMoney.getPlatformCode());
|
||||
|
||||
String targetCurrency = platform.getCurrencyInfo().get(gameExchangeMoney.getCurrencyCode());
|
||||
ApiException.notNull(targetCurrency, ErrorCode.CURRENCY_NOT_EXIST.getCode());
|
||||
|
||||
KeyInfo keyInfo = null;
|
||||
for (KeyInfo keyData : platform.getKeyInfo()) {
|
||||
if (StringUtils.isNotEmpty(gameExchangeMoney.getCurrencyCode())) {
|
||||
if (keyData.getCurrency().equalsIgnoreCase(gameExchangeMoney.getCurrencyCode())) {
|
||||
keyInfo = keyData;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
Member member = memberService.selectMemberById(gameExchangeMoney.getMemberId());
|
||||
IGamesService iGamesService = gamesService.get(gameExchangeMoney.getPlatformCode() + Constants.SERVICE);
|
||||
|
||||
ExchangeTransferStatusRequestDTO exchangeTransferStatusRequestDTO = new ExchangeTransferStatusRequestDTO();
|
||||
exchangeTransferStatusRequestDTO.setAccount(member.getGameAccount());
|
||||
exchangeTransferStatusRequestDTO.setCurrency(targetCurrency);
|
||||
exchangeTransferStatusRequestDTO.setOrderId(gameExchangeMoney.getTransactionId());
|
||||
exchangeTransferStatusRequestDTO.setAgentId(keyInfo.getCode());
|
||||
exchangeTransferStatusRequestDTO.setAgentKey(keyInfo.getKey());
|
||||
exchangeTransferStatusRequestDTO.setGameExchangeMoneyId(gameExchangeMoney.getId());
|
||||
exchangeTransferStatusRequestDTO.setVendor(platform);
|
||||
exchangeTransferStatusRequestDTO.setKeyInfo(keyInfo);
|
||||
exchangeTransferStatusRequestDTO.setSystemCurrency(gameExchangeMoney.getCurrencyCode());
|
||||
ExchangeTransferStatusResponseDTO statusResponseDTO = iGamesService.exchangeTransferStatus(exchangeTransferStatusRequestDTO);
|
||||
//订单已成功
|
||||
if (StatusType.SUCCESS.getValue().equals(statusResponseDTO.getStatusType())) {
|
||||
gameExchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
gameExchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
gameExchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
return gameExchangeMoneyService.updateGameExchangeMoney(gameExchangeMoney) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 下一步处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep nextStepProcessor() {
|
||||
return GameExchangeStep.TENANT_QUOTA_DEDUCTED;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后级处理器
|
||||
*
|
||||
* @return {@link GameExchangeStep }
|
||||
*/
|
||||
@Override
|
||||
public GameExchangeStep backStepProcessor() {
|
||||
{
|
||||
return GameExchangeStep.DEDUCT_BALANCE;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,10 +20,6 @@ public class MyFCAddressSource implements AddressSource {
|
|||
public ForestAddress getAddress(ForestRequest request) {
|
||||
String apiBaseUrl = platformService.get(GamePlatforms.FC.getCode())
|
||||
.getUrlInfo().getUrl();
|
||||
String https = platformService.get(GamePlatforms.FC.getCode())
|
||||
.getUrlInfo().getHttps();
|
||||
String host = platformService.get(GamePlatforms.FC.getCode())
|
||||
.getUrlInfo().getHost();
|
||||
return new ForestAddress(https, apiBaseUrl, Integer.valueOf(host), "");
|
||||
return new ForestAddress("https", apiBaseUrl, 443, "");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class ApiCFBalanceTransferResponseDTO {
|
|||
* 银行ID
|
||||
*/
|
||||
@JsonProperty("BankID")
|
||||
private Long bankID;
|
||||
private int bankID;
|
||||
|
||||
/**
|
||||
* 交易ID
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class ApiCFBalanceTransferStatusResponseDTO {
|
|||
* 银行 ID
|
||||
*/
|
||||
@JsonProperty("bankID")
|
||||
private Long bankId;
|
||||
private int bankId;
|
||||
|
||||
/**
|
||||
* 交易 ID
|
||||
|
|
|
|||
|
|
@ -283,11 +283,6 @@ public class GamesFCServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(NameInfo.builder().lang("zh-CN").name(gameDetails.getGameNameOfChinese()).build());
|
||||
nameInfos.add(NameInfo.builder().lang("en-US").name(gameDetails.getGameNameOfEnglish()).build());
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
|
||||
}
|
||||
gameDetails.setSystemGameId(game.getGameId());
|
||||
|
|
@ -318,7 +313,34 @@ public class GamesFCServiceImpl implements IGamesService {
|
|||
log.info("GamesFCServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.FC.getInfo(), 30);
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.FC.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
|
||||
//获取余额
|
||||
|
|
@ -330,7 +352,7 @@ public class GamesFCServiceImpl implements IGamesService {
|
|||
|
||||
//获取当前游戏币
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(exchangeTransferMoneyRequestDTO.getAccount())
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(exchangeTransferMoneyRequestDTO.getAgentId())
|
||||
.agentKey(exchangeTransferMoneyRequestDTO.getAgentKey())
|
||||
.currency(exchangeTransferMoneyRequestDTO.getCurrency())
|
||||
|
|
@ -344,7 +366,7 @@ public class GamesFCServiceImpl implements IGamesService {
|
|||
|
||||
Map<String, Object> paramsMap = new HashMap<>();
|
||||
paramsMap.put("MemberAccount", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
paramsMap.put("TrsID", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
paramsMap.put("TrsID", transactionId);
|
||||
paramsMap.put("AllOut", type);
|
||||
paramsMap.put("Points", amount);
|
||||
paramsMap.putAll(getKeyMap(paramsMap, gamesBaseRequestDTO.getAgentKey(), gamesBaseRequestDTO.getCurrency(), gamesBaseRequestDTO.getAgentId()));
|
||||
|
|
@ -371,19 +393,6 @@ public class GamesFCServiceImpl implements IGamesService {
|
|||
return exchangeMoney.getId();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return gameExchangeMoneyService.getTransactionId(GamePlatforms.FC.getInfo(), 30);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 汇兑转移状态
|
||||
*
|
||||
|
|
|
|||
|
|
@ -252,11 +252,6 @@ public class GamesJILIServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getName().getZhCN(), "zh-CN"));
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getName().getEnUS(), "en-US"));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
gamesDataDTO.setSystemGameId(game.getGameId());
|
||||
|
||||
|
|
@ -274,17 +269,6 @@ public class GamesJILIServiceImpl implements IGamesService {
|
|||
return CacheConstants.JILI_GAMES;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.JILI.getInfo() + IdUtils.simpleUUID();
|
||||
}
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -296,10 +280,35 @@ public class GamesJILIServiceImpl implements IGamesService {
|
|||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
|
||||
String transactionId = GamePlatforms.JILI.getInfo() + IdUtils.simpleUUID();
|
||||
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.JILI.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
|
||||
String query = "Account=" + exchangeTransferMoneyRequestDTO.getAccount()
|
||||
|
|
|
|||
|
|
@ -301,30 +301,12 @@ public class GamesKMServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getName(), "zh-CN"));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
gamesDataDTO.setSystemGameId(game.getGameId());
|
||||
}
|
||||
return gameList.getGames();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.KM.getInfo() + IdUtils.simpleUUID();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -337,17 +319,41 @@ public class GamesKMServiceImpl implements IGamesService {
|
|||
log.info("GamesKMServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = GamePlatforms.KM.getInfo() + IdUtils.simpleUUID();
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.KM.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
|
||||
BigDecimal amount = exchangeTransferMoneyRequestDTO.getAmount();
|
||||
if (TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) {
|
||||
// 获取第三方钱包余额
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(exchangeTransferMoneyRequestDTO.getAccount())
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(exchangeTransferMoneyRequestDTO.getAgentId())
|
||||
.currency(exchangeTransferMoneyRequestDTO.getCurrency())
|
||||
.agentKey(exchangeTransferMoneyRequestDTO.getAgentKey())
|
||||
|
|
@ -360,7 +366,7 @@ public class GamesKMServiceImpl implements IGamesService {
|
|||
params.put("userid", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("amt", amount);
|
||||
params.put("cur", exchangeTransferMoneyRequestDTO.getCurrency());
|
||||
params.put("txid", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("txid", transactionId);
|
||||
|
||||
Map<String, Object> headerMap = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
KMTransactionResponse kmTransactionResponse;
|
||||
|
|
|
|||
|
|
@ -247,11 +247,6 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getCnName(), "zh-CN"));
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getEnName(), "en-US"));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
gamesDataDTO.setSystemGameId(game.getGameId());
|
||||
}
|
||||
|
|
@ -263,17 +258,6 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
return CacheConstants.MeiTian_GAMES;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.MT.getCode() + IdUtils.simpleUUID();
|
||||
}
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -285,10 +269,35 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
|
||||
String transactionId = GamePlatforms.MT.getCode() + IdUtils.simpleUUID();
|
||||
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.MT.getCode())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
String key = exchangeTransferMoneyRequestDTO.getAgentKey();
|
||||
String merchantId = exchangeTransferMoneyRequestDTO.getAgentId();
|
||||
|
|
@ -307,7 +316,7 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
Map<String, String> rawMap = new LinkedHashMap<>();
|
||||
rawMap.put("merchantId", merchantId);
|
||||
rawMap.put("playerName", playerName);
|
||||
rawMap.put("extTransId", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
rawMap.put("extTransId", transactionId);
|
||||
rawMap.put("coins", coins);
|
||||
String rawData = JSON.toJSONString(rawMap);
|
||||
String data = null;
|
||||
|
|
@ -326,7 +335,7 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
merchantId,
|
||||
playerName,
|
||||
coins,
|
||||
exchangeTransferMoneyRequestDTO.getTransactionId(),
|
||||
transactionId,
|
||||
md5Code,
|
||||
data
|
||||
);
|
||||
|
|
@ -359,7 +368,7 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
merchantId,
|
||||
playerName,
|
||||
coins,
|
||||
exchangeTransferMoneyRequestDTO.getTransactionId(),
|
||||
transactionId,
|
||||
md5Code,
|
||||
data
|
||||
);
|
||||
|
|
@ -464,7 +473,7 @@ public class MeiTianGameServiceImpl implements IGamesService {
|
|||
|
||||
boolean doSyncRecordByRecordID(BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
String configKey = GamePlatforms.MT.getCode() + ":lastSyncRecordID";
|
||||
Long recordID = redisCache.getCacheObject(configKey);
|
||||
long recordID = redisCache.getCacheObject(configKey);
|
||||
|
||||
//String lastRecordID = sysConfigServiceImpl.selectConfigByKey(configKey);
|
||||
/*if (lastRecordID == null || lastRecordID.isEmpty()) {
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ public class ApiGameInfoResponseDTO {
|
|||
/**
|
||||
* 系统游戏id
|
||||
*/
|
||||
private String systemGameId;
|
||||
private Long systemGameId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import com.ff.base.utils.DateUtils;
|
|||
import com.ff.base.utils.SleepUtil;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
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.ng.client.NGClient;
|
||||
|
|
@ -259,14 +258,8 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(apiGameInfoResponseDTO.getGameName().get("zh-hans"), "zh-CN"));
|
||||
nameInfos.add(new NameInfo(apiGameInfoResponseDTO.getGameName().get("zh-hant"), "zh-TW"));
|
||||
nameInfos.add(new NameInfo(apiGameInfoResponseDTO.getGameName().get("en"), "en-US"));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
apiGameInfoResponseDTO.setSystemGameId(game.getGameId());
|
||||
apiGameInfoResponseDTO.setSystemGameId(game.getId());
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -280,19 +273,6 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
return CacheConstants.PG_GAMES;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return gameExchangeMoneyService.getTransactionId(GamePlatforms.PG.getCode(), 32);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -305,27 +285,49 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
log.info("GamesNGServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.PG.getCode(), 32);
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.PG.getCode())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
|
||||
//获取余额
|
||||
String type = TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType()) ? NGTransferType.TRANSFER_OUT.getValue() : NGTransferType.TRANSFER_IN.getValue();
|
||||
//获取当前游戏币
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(exchangeTransferMoneyRequestDTO.getAccount())
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(exchangeTransferMoneyRequestDTO.getAgentId())
|
||||
.agentKey(exchangeTransferMoneyRequestDTO.getAgentKey())
|
||||
.currency(exchangeTransferMoneyRequestDTO.getCurrency())
|
||||
.build();
|
||||
|
||||
MemberInfoResponseDTO memberInfo = this.getMemberInfo(gamesBaseRequestDTO);
|
||||
//判断是不是转出
|
||||
if (NGTransferType.TRANSFER_OUT.getValue().equals(type)) {
|
||||
MemberInfoResponseDTO memberInfo = this.getMemberInfo(gamesBaseRequestDTO);
|
||||
exchangeTransferMoneyRequestDTO.setAmount(memberInfo.getBalance());
|
||||
if (exchangeTransferMoneyRequestDTO.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
throw new ApiException(ErrorCode.INSUFFICIENT_PLAYER_BALANCE.getCode());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -335,7 +337,7 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
paramsMap.put("currency", exchangeTransferMoneyRequestDTO.getCurrency());
|
||||
paramsMap.put("type", type);
|
||||
paramsMap.put("amount", exchangeTransferMoneyRequestDTO.getAmount());
|
||||
paramsMap.put("orderId", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
paramsMap.put("orderId", transactionId);
|
||||
|
||||
|
||||
Map<String, String> key = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
|
|
@ -346,20 +348,6 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
ExchangeTransferStatusRequestDTO exchangeTransferStatusRequestDTO = new ExchangeTransferStatusRequestDTO();
|
||||
exchangeTransferStatusRequestDTO.setAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
exchangeTransferStatusRequestDTO.setCurrency(exchangeTransferMoneyRequestDTO.getCurrency());
|
||||
exchangeTransferStatusRequestDTO.setOrderId(exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
exchangeTransferStatusRequestDTO.setAgentId(exchangeTransferMoneyRequestDTO.getAgentId());
|
||||
exchangeTransferStatusRequestDTO.setAgentKey(exchangeTransferMoneyRequestDTO.getAgentKey());
|
||||
ExchangeTransferStatusResponseDTO statusResponseDTO = this.exchangeTransferStatus(exchangeTransferStatusRequestDTO);
|
||||
//更新钱
|
||||
exchangeMoney.setBalance(statusResponseDTO.getBalance());
|
||||
exchangeMoney.setCoinBefore(statusResponseDTO.getCoinBefore());
|
||||
exchangeMoney.setCoinAfter(statusResponseDTO.getCoinAfter());
|
||||
exchangeMoney.setCurrencyBefore(exchangeMoney.getCoinBefore());
|
||||
exchangeMoney.setCurrencyAfter(exchangeMoney.getCoinAfter());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
} else {
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
|
|
@ -379,7 +367,6 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
@Override
|
||||
public ExchangeTransferStatusResponseDTO exchangeTransferStatus(ExchangeTransferStatusRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
|
||||
SleepUtil.sleep(1000);
|
||||
|
||||
Map<String, Object> paramsMap = new HashMap<>();
|
||||
paramsMap.put("playerId", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
|
|
@ -398,7 +385,7 @@ public class GamesPGServiceImpl implements IGamesService {
|
|||
.build();
|
||||
ApiExchangeTransferStatusResponseDTO apiNGResponseDTOData = apiNGResponseDTO.getData();
|
||||
if (!ObjectUtils.isEmpty(apiNGResponseDTOData)) {
|
||||
transferStatusResponseDTO.setBalance(apiNGResponseDTOData.getAmount().abs());
|
||||
transferStatusResponseDTO.setBalance(apiNGResponseDTOData.getAmount());
|
||||
transferStatusResponseDTO.setCoinBefore(NumberUtil.sub(apiNGResponseDTOData.getAmount(), apiNGResponseDTOData.getAfterBalance()).abs());
|
||||
transferStatusResponseDTO.setCoinAfter(apiNGResponseDTOData.getAfterBalance());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import com.ff.base.utils.DateUtils;
|
|||
import com.ff.base.utils.JsonUtil;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
import com.ff.base.utils.sign.Base64;
|
||||
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.ApiFCGameListResponseDTO;
|
||||
|
|
@ -244,10 +243,6 @@ public class GamesPGTServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(NameInfo.builder().lang("en-US").name(gameIdKey.getName()).build());
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
gameIdKey.setSystemGameId(game.getGameId());
|
||||
}
|
||||
|
|
@ -261,16 +256,7 @@ public class GamesPGTServiceImpl implements IGamesService {
|
|||
}
|
||||
return CacheConstants.PGT_GAMES;
|
||||
}
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return gameExchangeMoneyService.getTransactionId(GamePlatforms.PGT.getInfo(), 17);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -282,11 +268,39 @@ public class GamesPGTServiceImpl implements IGamesService {
|
|||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
log.info("GamesPGTServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
String currency = exchangeTransferMoneyRequestDTO.getCurrency();
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.PGX.getInfo(), 17);
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(currency)
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.PGT.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
BigDecimal amount = exchangeTransferMoneyRequestDTO.getAmount();
|
||||
BigDecimal amountBefore = BigDecimal.ZERO;
|
||||
|
||||
|
|
@ -308,7 +322,7 @@ public class GamesPGTServiceImpl implements IGamesService {
|
|||
Map<String, Object> paramsMap = new LinkedHashMap<>();
|
||||
paramsMap.put("username", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
paramsMap.put("amount", amount.setScale(2, RoundingMode.DOWN).toString());
|
||||
paramsMap.put("transactionRef", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
paramsMap.put("transactionRef", transactionId);
|
||||
paramsMap.put("productId", productId);
|
||||
Map<String, String> key = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
PGTExchangeTransferResponse errorResponse;
|
||||
|
|
@ -622,12 +636,7 @@ public class GamesPGTServiceImpl implements IGamesService {
|
|||
List<PGTGameListResponse.Game> gamesDatas = redisCache.getCacheList(CacheConstants.PGT_GAMES);
|
||||
Map<String, PGTGameListResponse.Game> dataDTOMap = gamesDatas.stream().collect(Collectors.toMap(PGTGameListResponse.Game::getCode, e -> e));
|
||||
PGTGameListResponse.Game gamesDataDTO = dataDTOMap.get(resultBean.getGameCode());
|
||||
Integer gameStatus =GameStatus.FLAT.getCode();
|
||||
if (resultBean.getPayout().compareTo(resultBean.getStake())>0){
|
||||
gameStatus=GameStatus.WIN.getCode();
|
||||
}else if (resultBean.getPayout().compareTo(resultBean.getStake())<0){
|
||||
gameStatus=GameStatus.FAIL.getCode();
|
||||
}
|
||||
|
||||
|
||||
//数据构造
|
||||
GameBettingDetails gameBettingDetails = GameBettingDetails.builder()
|
||||
|
|
@ -641,7 +650,7 @@ public class GamesPGTServiceImpl implements IGamesService {
|
|||
//.gameId(gamesDataDTO.getSystemGameId())
|
||||
.gameId(gamesDataDTO.getSystemGameId())
|
||||
.gameName(gamesDataDTO.getName())
|
||||
.gameStatus(gameStatus)
|
||||
.gameStatus(PGTPayoutStatus.getByCode(resultBean.getPayoutStatus()).getSystemCode())
|
||||
.gameStatusType(1)
|
||||
.gameCurrencyCode(resultBean.getCurrency())
|
||||
.account(resultBean.getUsername())
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public interface PGXClient {
|
|||
* @param parameters 范围
|
||||
* @return {@link PGXGameLoginResponse }
|
||||
*/
|
||||
@Get("/launchGames.aspx?${parameters}")
|
||||
@Post("/launchGames.aspx?${parameters}")
|
||||
PGXGameLoginResponse loginWithoutRedirect(@Var("parameters") String parameters);
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -79,13 +79,13 @@ public class PGXBetHistoryResponse {
|
|||
* 下注时间 (玩家实际的投注时间) 依据 GMT/UTC +0 时区
|
||||
*/
|
||||
@JsonProperty("start_time")
|
||||
private String startTime;
|
||||
private Date startTime;
|
||||
|
||||
/**
|
||||
* 结算时间 (String类型) 依据 GMT/UTC +0 时区
|
||||
*/
|
||||
@JsonProperty("end_time")
|
||||
private String endTime;
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 开赛时间 (String类型) 依据 GMT/UTC +0 时区
|
||||
|
|
|
|||
|
|
@ -251,10 +251,6 @@ public class GamesPGXServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getGameName(), "en-US"));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
gamesDataDTO.setSystemGameId(game.getGameId());
|
||||
|
||||
|
|
@ -282,9 +278,35 @@ public class GamesPGXServiceImpl implements IGamesService {
|
|||
log.info("GamesPGXServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = gameExchangeMoneyService.getTransactionId(GamePlatforms.PGX.getInfo(), 17);
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.PGX.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
//获取余额
|
||||
String type = TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType()) ? PGXTransferType.WITHDRAW.getCode() : PGXTransferType.DEPOSIT.getCode();
|
||||
|
||||
|
|
@ -317,7 +339,7 @@ public class GamesPGXServiceImpl implements IGamesService {
|
|||
paramsMap.put("operatorcode", exchangeTransferMoneyRequestDTO.getAgentId());
|
||||
paramsMap.put("password", keyInfo.getPassword());
|
||||
paramsMap.put("providercode", keyInfo.getProviderCode());
|
||||
paramsMap.put("referenceid", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
paramsMap.put("referenceid", transactionId);
|
||||
paramsMap.put("type", type);
|
||||
paramsMap.put("username", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String key = this.getKey(paramsMap, exchangeTransferMoneyRequestDTO);
|
||||
|
|
@ -434,21 +456,6 @@ public class GamesPGXServiceImpl implements IGamesService {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return gameExchangeMoneyService.getTransactionId(GamePlatforms.PGX.getInfo(), 17);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 赠送免费局数
|
||||
*
|
||||
|
|
@ -604,7 +611,6 @@ public class GamesPGXServiceImpl implements IGamesService {
|
|||
payoffAmount = NumberUtil.sub(payout, resultBean.getBet()).negate();
|
||||
gameStatus = GameStatus.FAIL.getCode();
|
||||
}
|
||||
long endTime = DateUtils.convertToMillisWithTimezone(resultBean.getEndTime(), "UTC");
|
||||
//数据构造
|
||||
GameBettingDetails gameBettingDetails = GameBettingDetails.builder()
|
||||
.tenantKey(member.getTenantKey())
|
||||
|
|
@ -622,11 +628,11 @@ public class GamesPGXServiceImpl implements IGamesService {
|
|||
.gameCurrencyCode(/*currencyDTO.getCurrency()*/gamesDataBuildDTO.getCurrencyCode())
|
||||
.account(resultBean.getMember())
|
||||
.wagersId(String.valueOf(resultBean.getId()))
|
||||
.wagersTime(DateUtils.convertToMillisWithTimezone(resultBean.getStartTime(),"UTC"))
|
||||
.wagersTime(resultBean.getStartTime().getTime())
|
||||
.betAmount(resultBean.getBet())
|
||||
.payoffTime(endTime)
|
||||
.payoffTime(resultBean.getEndTime().getTime())
|
||||
.payoffAmount(payoffAmount)
|
||||
.settlementTime(endTime)
|
||||
.settlementTime(resultBean.getEndTime().getTime())
|
||||
.turnover(resultBean.getTurnover())
|
||||
.settlementStatus(PGXBetRecordStatus.findSystemCodeByCode(resultBean.getStatus()))
|
||||
.build();
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
package com.ff.game.api.pp.address;
|
||||
|
||||
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.domain.Platform;
|
||||
import com.ff.game.service.IPlatformService;
|
||||
import com.sun.media.jfxmediaimpl.platform.PlatformManager;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
|
||||
/**
|
||||
* 我jili address来源
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/02/10
|
||||
*/
|
||||
@Component
|
||||
public class MyPPAddressSource implements AddressSource {
|
||||
@Resource
|
||||
private IPlatformService platformService;
|
||||
|
||||
|
||||
@Override
|
||||
public ForestAddress getAddress(ForestRequest request) {
|
||||
Platform platform = platformService.get(GamePlatforms.PP.getCode());
|
||||
String apiBaseUrl = platform.getUrlInfo().getUrl();
|
||||
String host = platform.getUrlInfo().getHost();
|
||||
String https = platform.getUrlInfo().getHttps();
|
||||
return new ForestAddress(https, apiBaseUrl, Integer.parseInt(host), "/IntegrationService/v3");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
package com.ff.game.api.pp.client;
|
||||
|
||||
import com.dtflys.forest.annotation.*;
|
||||
import com.ff.game.api.pp.address.MyPPAddressSource;
|
||||
import com.ff.game.api.pp.dto.*;
|
||||
import com.ff.game.api.pp.forest.MySuccessCondition;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* pp 请求
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/02/10
|
||||
*/
|
||||
@Address(source = MyPPAddressSource.class)
|
||||
public interface PPClient {
|
||||
/**
|
||||
* 创建成员
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPUserAccountResponse }
|
||||
*/
|
||||
@Post( url ="/http/CasinoGameAPI/player/account/create/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
PPUserAccountResponse createMember(@Body Map<String, Object> params);
|
||||
|
||||
|
||||
/**
|
||||
* 获取会员信息
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPPlayerAccountResponse }
|
||||
*/
|
||||
@Post( url ="/http/CasinoGameAPI/balance/current/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
PPPlayerAccountResponse getMemberInfo(@Body Map<String, Object> params);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 无重定向登录
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPGameLaunchResponse }
|
||||
*/
|
||||
@Post(url ="/http/CasinoGameAPI/game/start/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
PPGameLaunchResponse loginWithoutRedirect(@Body Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 获取游戏列表
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPGameResponseDTO }
|
||||
*/
|
||||
@Post( url ="/http/CasinoGameAPI/getCasinoGames/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
|
||||
PPGameResponseDTO getGameList(@Body Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPTransactionResponse }
|
||||
*/
|
||||
@Post(url = "/http/CasinoGameAPI/balance/transfer/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
@Success(condition = MySuccessCondition.class)
|
||||
PPTransactionResponse exchangeTransfer(@Body Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 汇兑转移状态
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPTransactionStatusResponse }
|
||||
*/
|
||||
@Post(url = "/http/CasinoGameAPI/balance/transfer/status/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
PPTransactionStatusResponse exchangeTransferStatus( @Body Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 按时间获取投注记录
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Get(url ="/DataFeeds/gamerounds/finished/?{params}")
|
||||
String getBetRecordByTime(@Var("params") String params);
|
||||
|
||||
|
||||
/**
|
||||
* 踢出队员
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link PPResponse }
|
||||
*/
|
||||
@Post(url = "/http/CasinoGameAPI/game/session/terminate/",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
PPResponse kickMember(@Body Map<String, Object> params);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* dgbet记录响应数据
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/03/27
|
||||
*/
|
||||
@Data
|
||||
public class DGBetRecordResponseDTO {
|
||||
|
||||
/** 错误码 (参考文档定义) */
|
||||
@JsonProperty("codeId")
|
||||
private Integer codeId;
|
||||
|
||||
/** 错误信息 */
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
|
||||
/** 注单报告 */
|
||||
@JsonProperty("list")
|
||||
private List<ReportDTO> list;
|
||||
|
||||
/**
|
||||
* 注单报告类
|
||||
*/
|
||||
@Data
|
||||
public static class ReportDTO {
|
||||
|
||||
/** 注单ID(唯一) */
|
||||
@JsonProperty("id")
|
||||
private Long id;
|
||||
|
||||
/** 游戏桌号(红包小费记录没有) */
|
||||
@JsonProperty("tableId")
|
||||
private Integer tableId;
|
||||
|
||||
/** 游戏靴号(红包小费记录没有) */
|
||||
@JsonProperty("shoeId")
|
||||
private Long shoeId;
|
||||
|
||||
/** 当靴局号(红包小费记录没有) */
|
||||
@JsonProperty("playId")
|
||||
private Long playId;
|
||||
|
||||
/** 游戏厅号(1:旗舰厅;2:亚洲厅;3,4:现场厅;5:性感厅;8,9:区块链厅) */
|
||||
@JsonProperty("lobbyId")
|
||||
private Integer lobbyId;
|
||||
|
||||
/** 注单类型(1:注单,2:红包小费) */
|
||||
@JsonProperty("gameType")
|
||||
private Integer gameType;
|
||||
|
||||
/** 游戏类型(百家乐,龙虎等) */
|
||||
@JsonProperty("gameId")
|
||||
private Integer gameId;
|
||||
|
||||
/** 下注时间 */
|
||||
@JsonProperty("betTime")
|
||||
private Date betTime;
|
||||
|
||||
/** 结算时间 */
|
||||
@JsonProperty("calTime")
|
||||
private Date calTime;
|
||||
|
||||
/** 派彩金额(含本金) */
|
||||
@JsonProperty("winOrLoss")
|
||||
private BigDecimal winOrLoss;
|
||||
|
||||
/** 下注前余额(仅作参考) */
|
||||
@JsonProperty("balanceBefore")
|
||||
private BigDecimal balanceBefore;
|
||||
|
||||
/** 下注金额(下注扣款金额) */
|
||||
@JsonProperty("betPoints")
|
||||
private BigDecimal betPoints;
|
||||
|
||||
/** 洗码金额(用于计算佣金) */
|
||||
@JsonProperty("availableBet")
|
||||
private BigDecimal availableBet;
|
||||
|
||||
/** 会员账号 */
|
||||
@JsonProperty("userName")
|
||||
private String userName;
|
||||
|
||||
/** 游戏结果 */
|
||||
@JsonProperty("result")
|
||||
private String result;
|
||||
|
||||
/** 注单详情 */
|
||||
@JsonProperty("betDetail")
|
||||
private String betDetail;
|
||||
|
||||
/** 客户端IP */
|
||||
@JsonProperty("ip")
|
||||
private String ip;
|
||||
|
||||
/** 游戏唯一局号 */
|
||||
@JsonProperty("ext")
|
||||
private String ext;
|
||||
|
||||
/** 结算状态(0:未结算,1:已结算,2:已撤销,3:冻结) */
|
||||
@JsonProperty("isRevocation")
|
||||
private Integer isRevocation;
|
||||
|
||||
/** 更改单时对应的注单记录 */
|
||||
@JsonProperty("parentBetId")
|
||||
private Long parentBetId;
|
||||
|
||||
/** 币种ID(请参考对应关系说明) */
|
||||
@JsonProperty("currencyId")
|
||||
private Integer currencyId;
|
||||
|
||||
/** 客户端平台ID(1: PC 2: 安卓 3: 苹果 5: H5) */
|
||||
@JsonProperty("deviceType")
|
||||
private Integer deviceType;
|
||||
|
||||
/** 钱包扣款记录(转账模式API没有) */
|
||||
@JsonProperty("transfers")
|
||||
private String transfers;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 响应结果类
|
||||
*/
|
||||
@Data
|
||||
public class DGLoginWithoutRedirectResponse {
|
||||
|
||||
/**
|
||||
* 响应的代码ID
|
||||
*/
|
||||
@JsonProperty("codeId")
|
||||
private int codeId;
|
||||
|
||||
/**
|
||||
* 响应的消息
|
||||
*/
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
|
||||
/**
|
||||
* 响应的 token
|
||||
*/
|
||||
@JsonProperty("token")
|
||||
private String token;
|
||||
|
||||
/**
|
||||
* 响应的域名信息
|
||||
*/
|
||||
@JsonProperty("domains")
|
||||
private String domains;
|
||||
|
||||
/**
|
||||
* 列表数据
|
||||
*/
|
||||
@JsonProperty("list")
|
||||
private List<String> list;
|
||||
|
||||
/**
|
||||
* 限制组
|
||||
*/
|
||||
@JsonProperty("limitGroup")
|
||||
private String limitGroup;
|
||||
|
||||
/**
|
||||
* 限制区间
|
||||
*/
|
||||
@JsonProperty("limits")
|
||||
private List<Limit> limits;
|
||||
|
||||
/**
|
||||
* 限制区间内部类
|
||||
*/
|
||||
@Data
|
||||
public static class Limit {
|
||||
|
||||
/**
|
||||
* 最小值
|
||||
*/
|
||||
@JsonProperty("min")
|
||||
private int min;
|
||||
|
||||
/**
|
||||
* 最大值
|
||||
*/
|
||||
@JsonProperty("max")
|
||||
private int max;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 响应类,用于返回基本的状态信息。
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/03/26
|
||||
*/
|
||||
@Data
|
||||
public class DGResponse {
|
||||
|
||||
/**
|
||||
* 响应的代码ID。
|
||||
*/
|
||||
@JsonProperty("codeId")
|
||||
private int codeId;
|
||||
|
||||
/**
|
||||
* 响应的消息。
|
||||
*/
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 交易信息返回实体
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/03/27
|
||||
*/
|
||||
@Data
|
||||
public class DGTransactionResponseDTO {
|
||||
|
||||
|
||||
/** 响应代码 */
|
||||
@JsonProperty("codeId")
|
||||
private Integer codeId;
|
||||
|
||||
/** 响应消息 */
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
|
||||
/** 用户名 */
|
||||
@JsonProperty("username")
|
||||
private String username;
|
||||
|
||||
/** 交易金额 */
|
||||
@JsonProperty("amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
/** 账户余额 */
|
||||
@JsonProperty("balance")
|
||||
private BigDecimal balance;
|
||||
|
||||
/** 交易流水号 */
|
||||
@JsonProperty("serial")
|
||||
private String serial;
|
||||
|
||||
/** 交易时间 */
|
||||
@JsonProperty("time")
|
||||
private String time;
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 用户账户信息响应类
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/03/26
|
||||
*/
|
||||
@Data
|
||||
public class DGUserAccountResponse {
|
||||
|
||||
/**
|
||||
* 响应的代码ID。
|
||||
*/
|
||||
@JsonProperty("codeId")
|
||||
private int codeId;
|
||||
|
||||
/**
|
||||
* 响应的消息。
|
||||
*/
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
|
||||
/**
|
||||
* 用户名。
|
||||
*/
|
||||
@JsonProperty("username")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 用户余额。
|
||||
*/
|
||||
@JsonProperty("balance")
|
||||
private BigDecimal balance;
|
||||
}
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户列表响应类
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/03/27
|
||||
*/
|
||||
@Data
|
||||
public class DGUserListResponseDTO {
|
||||
|
||||
/**
|
||||
* 响应的代码ID。
|
||||
*/
|
||||
@JsonProperty("codeId")
|
||||
private int codeId;
|
||||
|
||||
/**
|
||||
* 响应的消息。
|
||||
*/
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
/** 用户列表 */
|
||||
@JsonProperty("list")
|
||||
private List<UserDTO> list;
|
||||
|
||||
/**
|
||||
* 用户信息类
|
||||
*/
|
||||
@Data
|
||||
public static class UserDTO {
|
||||
|
||||
/** 用户名 */
|
||||
@JsonProperty("username")
|
||||
private String username;
|
||||
|
||||
/** 昵称 */
|
||||
@JsonProperty("nickname")
|
||||
private String nickname;
|
||||
|
||||
/** 币种名称 */
|
||||
@JsonProperty("currencyName")
|
||||
private String currencyName;
|
||||
|
||||
/** 用户IP */
|
||||
@JsonProperty("ip")
|
||||
private String ip;
|
||||
|
||||
/** 用户设备 */
|
||||
@JsonProperty("device")
|
||||
private String device;
|
||||
|
||||
/** 登录时间 */
|
||||
@JsonProperty("login")
|
||||
private String login;
|
||||
|
||||
/** 会员ID */
|
||||
@JsonProperty("memberId")
|
||||
private Long memberId;
|
||||
|
||||
/** 用户余额 */
|
||||
@JsonProperty("balance")
|
||||
private Double balance;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* ppgame发布响应
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/14
|
||||
*/
|
||||
@Data
|
||||
public class PPGameLaunchResponse {
|
||||
/**
|
||||
* 响应状态码
|
||||
* 示例: "0" 表示成功
|
||||
*/
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 响应状态描述
|
||||
* 示例: "OK" 表示成功
|
||||
*/
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 游戏启动URL
|
||||
* 包含token、游戏符号、技术平台、语言、货币等参数
|
||||
*/
|
||||
@JsonProperty("gameURL")
|
||||
private String gameUrl;
|
||||
}
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 响应类 - 游戏信息列表
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/03/27
|
||||
*/
|
||||
@Data
|
||||
public class PPGameResponseDTO {
|
||||
|
||||
/** 错误码 (参考文档定义) */
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/** 错误信息 */
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
/** 游戏信息列表 */
|
||||
@JsonProperty("gameList")
|
||||
private List<CasinoGame> gameList;
|
||||
|
||||
/**
|
||||
* 游戏信息类
|
||||
*/
|
||||
@Data
|
||||
public static class CasinoGame {
|
||||
|
||||
/** 游戏唯一标识符 */
|
||||
@JsonProperty("gameID")
|
||||
private String gameID;
|
||||
|
||||
/** 游戏名称 */
|
||||
@JsonProperty("gameName")
|
||||
private String gameName;
|
||||
|
||||
/** 游戏类型标识符 */
|
||||
@JsonProperty("gameTypeID")
|
||||
private String gameTypeID;
|
||||
|
||||
/** 游戏类型描述 */
|
||||
@JsonProperty("typeDescription")
|
||||
private String typeDescription;
|
||||
|
||||
/** 游戏技术描述 */
|
||||
@JsonProperty("technology")
|
||||
private String technology;
|
||||
|
||||
/** 游戏支持的平台 */
|
||||
@JsonProperty("platform")
|
||||
private String platform;
|
||||
|
||||
/** 是否提供演示游戏 */
|
||||
@JsonProperty("demoGameAvailable")
|
||||
private boolean demoGameAvailable;
|
||||
|
||||
/** 游戏宽高比 */
|
||||
@JsonProperty("aspectRatio")
|
||||
private String aspectRatio;
|
||||
|
||||
/** 游戏技术标识符 */
|
||||
@JsonProperty("technologyID")
|
||||
private String technologyID;
|
||||
|
||||
/** 数值型游戏 ID */
|
||||
@JsonProperty("gameIdNumeric")
|
||||
private Long gameIdNumeric;
|
||||
|
||||
/** 是否提供免费回合奖励 */
|
||||
@JsonProperty("frbAvailable")
|
||||
private boolean frbAvailable;
|
||||
|
||||
/** 是否提供可变免费回合奖励 */
|
||||
@JsonProperty("variableFrbAvailable")
|
||||
private boolean variableFrbAvailable;
|
||||
|
||||
/** 游戏的投注线数 */
|
||||
@JsonProperty("lines")
|
||||
private Integer lines;
|
||||
|
||||
/** 游戏支持的功能列表 */
|
||||
@JsonProperty("features")
|
||||
private List<String> features;
|
||||
|
||||
/** 游戏数据类型 */
|
||||
@JsonProperty("dataType")
|
||||
private String dataType;
|
||||
|
||||
/** 支持的司法管辖区列表 */
|
||||
@JsonProperty("jurisdictions")
|
||||
private List<String> jurisdictions;
|
||||
|
||||
|
||||
/**
|
||||
* 系统游戏id
|
||||
*/
|
||||
private String systemGameId;
|
||||
|
||||
/**
|
||||
* 系统游戏类型
|
||||
*/
|
||||
private Integer systemPlatformType;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,279 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
|
||||
import com.ff.base.utils.DateUtils;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* ppgame回合记录
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/15
|
||||
*/
|
||||
@Data
|
||||
public class PPGameRoundRecord {
|
||||
private static final DateTimeFormatter DATE_FORMATTER =
|
||||
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
/**
|
||||
* 时间戳(Unix毫秒时间戳)
|
||||
* <p>记录生成时的系统时间戳,格式为 timepoint=1618298161139</p>
|
||||
*/
|
||||
private Long timepoint;
|
||||
|
||||
/**
|
||||
* 玩家在Pragmatic Play系统中的唯一ID
|
||||
*
|
||||
* @example 531288
|
||||
*/
|
||||
private String playerID;
|
||||
|
||||
/**
|
||||
* 娱乐场运营商系统中的玩家ID
|
||||
*
|
||||
* @example 889325
|
||||
*/
|
||||
private String extPlayerID;
|
||||
|
||||
/**
|
||||
* 游戏唯一标识符
|
||||
*
|
||||
* @example "vs20magicpot"
|
||||
*/
|
||||
private String gameID;
|
||||
|
||||
/**
|
||||
* 当前游戏会话ID
|
||||
* <p>每个游戏回合的唯一编号</p>
|
||||
*
|
||||
* @example 50994065
|
||||
*/
|
||||
private String playSessionID;
|
||||
|
||||
/**
|
||||
* 父游戏会话ID
|
||||
* <p>对于免费游戏,此值为触发免费游戏的母游戏ID</p>
|
||||
*
|
||||
* @example 50994064
|
||||
*/
|
||||
private String parentSessionID;
|
||||
|
||||
/**
|
||||
* 游戏回合开始时间
|
||||
* <p>格式:yyyy-MM-dd HH:mm:ss</p>
|
||||
*
|
||||
* @example "2021-04-13 07:06:18"
|
||||
*/
|
||||
private Long startDate;
|
||||
|
||||
/**
|
||||
* 游戏回合结束时间
|
||||
* <p>未完成时为null,格式:yyyy-MM-dd HH:mm:ss</p>
|
||||
*
|
||||
* @example "2021-04-13 07:06:18"
|
||||
*/
|
||||
private Long endDate;
|
||||
|
||||
/**
|
||||
* 游戏状态
|
||||
* <p>可能值:
|
||||
* <ul>
|
||||
* <li>C - 已完成</li>
|
||||
* <li>F - 取消/最终确定</li>
|
||||
* </ul>
|
||||
* </p>
|
||||
*
|
||||
* @example "C"
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 游戏类型
|
||||
* <p>可能值:
|
||||
* <ul>
|
||||
* <li>F - 免费旋转</li>
|
||||
* </ul>
|
||||
* </p>
|
||||
*
|
||||
* @example "F"
|
||||
*/
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 投注金额(固定2位小数)
|
||||
*
|
||||
* @example 0.00
|
||||
*/
|
||||
private BigDecimal bet;
|
||||
|
||||
/**
|
||||
* 赢取金额(固定2位小数)
|
||||
*
|
||||
* @example 0.00
|
||||
*/
|
||||
private BigDecimal win;
|
||||
|
||||
/**
|
||||
* 货币代码(ISO 3字母)
|
||||
*
|
||||
* @example "EUR"
|
||||
*/
|
||||
private String currency;
|
||||
|
||||
/**
|
||||
* 累积奖金金额(固定2位小数)
|
||||
*
|
||||
* @example 0.00
|
||||
*/
|
||||
private BigDecimal jackpot;
|
||||
|
||||
/**
|
||||
* 免费回合奖励ID
|
||||
* <p>当值为"null"字符串时表示无奖励</p>
|
||||
*
|
||||
* @example "null"
|
||||
*/
|
||||
private String bonusCode;
|
||||
|
||||
/**
|
||||
* 奖金投注金额(固定2位小数)
|
||||
*
|
||||
* @example 0.00
|
||||
*/
|
||||
private BigDecimal bonusBet;
|
||||
|
||||
/**
|
||||
* 奖金赢取金额(固定2位小数)
|
||||
*
|
||||
* @example 0.00
|
||||
*/
|
||||
private BigDecimal bonusWin;
|
||||
|
||||
public static List<PPGameRoundRecord> parse(String data) {
|
||||
List<PPGameRoundRecord> transactions = new ArrayList<>();
|
||||
|
||||
// 按行分割数据
|
||||
String[] lines = data.split("\n");
|
||||
|
||||
if (lines.length < 3) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
|
||||
// 解析列名(第二行)
|
||||
String[] headers = lines[1].trim().split(",");
|
||||
|
||||
for (int j = 2; j < lines.length; j++) {
|
||||
// 解析数据行(第三行开始)
|
||||
String[] values = lines[j].trim().split(",");
|
||||
|
||||
// 确保列数和值数匹配
|
||||
if (headers.length != values.length) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 创建交易记录对象
|
||||
PPGameRoundRecord transaction = new PPGameRoundRecord();
|
||||
|
||||
// 根据列名设置对应的值
|
||||
for (int i = 0; i < headers.length; i++) {
|
||||
String header = headers[i].trim();
|
||||
String value = values[i].trim();
|
||||
|
||||
switch (header) {
|
||||
case "playerID":
|
||||
transaction.setPlayerID(value);
|
||||
break;
|
||||
case "extPlayerID":
|
||||
transaction.setExtPlayerID(value);
|
||||
break;
|
||||
case "gameID":
|
||||
transaction.setGameID(value);
|
||||
break;
|
||||
case "playSessionID":
|
||||
transaction.setPlaySessionID(value);
|
||||
break;
|
||||
case "parentSessionID":
|
||||
transaction.setParentSessionID(value);
|
||||
break;
|
||||
case "startDate":
|
||||
transaction.setStartDate(DateUtils.toTimestamp(value, DateUtils.YYYY_MM_DD_HH_MM_SS));
|
||||
break;
|
||||
case "endDate":
|
||||
transaction.setEndDate(DateUtils.toTimestamp(value, DateUtils.YYYY_MM_DD_HH_MM_SS));
|
||||
break;
|
||||
case "status":
|
||||
transaction.setStatus(value);
|
||||
break;
|
||||
case "type":
|
||||
transaction.setType(value);
|
||||
break;
|
||||
case "bet":
|
||||
transaction.setBet(new BigDecimal(value));
|
||||
break;
|
||||
case "win":
|
||||
transaction.setWin(new BigDecimal(value));
|
||||
break;
|
||||
case "currency":
|
||||
transaction.setCurrency(value);
|
||||
break;
|
||||
case "jackpot":
|
||||
transaction.setJackpot(new BigDecimal(value));
|
||||
break;
|
||||
case "bonusCode":
|
||||
transaction.setBonusCode("null".equals(value) ? null : value);
|
||||
break;
|
||||
case "bonusBet":
|
||||
transaction.setBonusBet(new BigDecimal(value));
|
||||
break;
|
||||
case "bonusWin":
|
||||
transaction.setBonusWin(new BigDecimal(value));
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
transactions.add(transaction);
|
||||
}
|
||||
|
||||
return transactions;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 解析长
|
||||
*
|
||||
* @param s s
|
||||
* @return {@link Long }
|
||||
*/// 辅助解析方法
|
||||
private static Long parseLong(String s) {
|
||||
return s.isEmpty() ? null : Long.parseLong(s);
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析双精度
|
||||
*
|
||||
* @param s s
|
||||
* @return {@link BigDecimal }
|
||||
*/
|
||||
private static BigDecimal parseDouble(String s) {
|
||||
return s.isEmpty() ? null : new BigDecimal(s);
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析日期时间
|
||||
*
|
||||
* @param s s
|
||||
* @return {@link LocalDateTime }
|
||||
*/
|
||||
private static Date parseDateTime(String s) {
|
||||
return s.isEmpty() ? null : DateUtils.parseDate(s);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 玩家账户信息响应实体
|
||||
*/
|
||||
@Data
|
||||
public class PPPlayerAccountResponse {
|
||||
|
||||
/**
|
||||
* 响应状态码 (必需)
|
||||
* 示例: "0" 表示成功
|
||||
*/
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 响应状态描述 (必需)
|
||||
* 示例: "OK" 表示成功
|
||||
*/
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 玩家余额 (必需)
|
||||
* 示例: 999.99
|
||||
*/
|
||||
@JsonProperty("balance")
|
||||
private BigDecimal balance;
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* ppgame发布响应
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/14
|
||||
*/
|
||||
@Data
|
||||
public class PPResponse {
|
||||
/**
|
||||
* 响应状态码
|
||||
* 示例: "0" 表示成功
|
||||
*/
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 响应状态描述
|
||||
* 示例: "OK" 表示成功
|
||||
*/
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 回复
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/14
|
||||
*/
|
||||
@Data
|
||||
public class PPTransactionResponse {
|
||||
/**
|
||||
* 响应状态码 (必需)
|
||||
* 示例: "0" 表示成功
|
||||
*/
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 响应状态描述 (必需)
|
||||
* 示例: "OK" 表示成功
|
||||
*/
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 交易ID (必需)
|
||||
* 示例: 1908759
|
||||
*/
|
||||
@JsonProperty("transactionId")
|
||||
private String transactionId;
|
||||
|
||||
/**
|
||||
* 账户余额 (必需)
|
||||
* 示例: 999.99
|
||||
*/
|
||||
@JsonProperty("balance")
|
||||
private BigDecimal balance;
|
||||
}
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 替换
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/14
|
||||
*/
|
||||
@Data
|
||||
public class PPTransactionStatusResponse {
|
||||
/**
|
||||
* 响应状态码
|
||||
* <p>
|
||||
* 遵循系统定义的错误码规范:
|
||||
* <ul>
|
||||
* <li>"0" - 表示成功</li>
|
||||
* <li>其他值 - 表示具体错误类型</li>
|
||||
* </ul>
|
||||
* </p>
|
||||
*
|
||||
* @apiNote 必填字段
|
||||
* @example "0"
|
||||
*/
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 响应状态描述
|
||||
* <p>人类可读的状态说明信息</p>
|
||||
*
|
||||
* @apiNote 必填字段
|
||||
* @example "OK"
|
||||
*/
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 交易唯一标识符
|
||||
* <p>系统生成的交易流水号,用于后续查询和跟踪</p>
|
||||
*
|
||||
* @apiNote 必填字段
|
||||
* @example 1908759
|
||||
*/
|
||||
@JsonProperty("transactionId")
|
||||
private Long transactionId;
|
||||
|
||||
/**
|
||||
* 交易状态
|
||||
* <p>
|
||||
* 可能的值包括:
|
||||
* <ul>
|
||||
* <li>"Success" - 交易成功</li>
|
||||
* <li>"Pending" - 处理中</li>
|
||||
* <li>"Failed" - 交易失败</li>
|
||||
* </ul>
|
||||
* </p>
|
||||
*
|
||||
* @apiNote 必填字段
|
||||
* @example "Success"
|
||||
*/
|
||||
@JsonProperty("status")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 交易金额
|
||||
* <p>
|
||||
* 字符串格式的金额数值,保留两位小数。
|
||||
* </p>
|
||||
*
|
||||
* @apiNote 必填字段
|
||||
* @example "999.99"
|
||||
*/
|
||||
@JsonProperty("amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 账户余额
|
||||
* <p>交易完成后的实时余额,使用BigDecimal保证精度</p>
|
||||
*
|
||||
* @apiNote 可选字段(某些查询接口可能返回null)
|
||||
* @example 999.99
|
||||
*/
|
||||
@JsonProperty("balance")
|
||||
private BigDecimal balance;
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
package com.ff.game.api.pp.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 娱乐场运营商系统用户账户响应实体
|
||||
* 严格保密 - 仅用于预期目的和接收者!
|
||||
*/
|
||||
@Data
|
||||
public class PPUserAccountResponse {
|
||||
|
||||
/**
|
||||
* 响应状态码 (必需)
|
||||
* 示例: "0" 表示成功
|
||||
*/
|
||||
@JsonProperty("error")
|
||||
private String error;
|
||||
|
||||
/**
|
||||
* 响应状态描述 (必需)
|
||||
* 示例: "OK" 表示成功
|
||||
*/
|
||||
@JsonProperty("description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 玩家唯一标识符 (必需)
|
||||
* 示例: 6749178
|
||||
*/
|
||||
@JsonProperty("playerId")
|
||||
private Long playerId;
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
package com.ff.game.api.pp.forest;
|
||||
|
||||
|
||||
import com.dtflys.forest.callback.SuccessWhen;
|
||||
import com.dtflys.forest.http.ForestRequest;
|
||||
import com.dtflys.forest.http.ForestResponse;
|
||||
|
||||
/**
|
||||
* 我kmsuccess状态
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/02
|
||||
*/
|
||||
public class MySuccessCondition implements SuccessWhen {
|
||||
|
||||
/**
|
||||
* 请求成功条件
|
||||
* @param req Forest请求对象
|
||||
* @param res Forest响应对象
|
||||
* @return 是否成功,true: 请求成功,false: 请求失败
|
||||
*/
|
||||
@Override
|
||||
public boolean successWhen(ForestRequest req, ForestResponse res) {
|
||||
// req 为Forest请求对象,即 ForestRequest 类实例
|
||||
// res 为Forest响应对象,即 ForestResponse 类实例
|
||||
// 返回值为 ture 则表示请求成功,false 表示请求失败
|
||||
return res.noException();
|
||||
// 当然在这里也可以写其它条件,比如 通过 res.getResult() 或 res.getContent() 获取业务数据
|
||||
// 再根据业务数据判断是否成功
|
||||
}
|
||||
}
|
||||
|
|
@ -1,645 +0,0 @@
|
|||
package com.ff.game.api.pp.impl;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import com.ff.base.constant.CacheConstants;
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.core.redis.RedisCache;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.exception.base.ApiException;
|
||||
import com.ff.base.exception.base.BaseException;
|
||||
import com.ff.base.utils.DateUtils;
|
||||
import com.ff.base.utils.JsonUtil;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import com.ff.game.api.IGamesService;
|
||||
import com.ff.game.api.pp.client.PPClient;
|
||||
import com.ff.game.api.pp.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.member.domain.Member;
|
||||
import com.ff.member.service.IMemberService;
|
||||
import com.ff.utils.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
/**
|
||||
* DG 游戏 impl
|
||||
*
|
||||
* @author shi
|
||||
* @date 2024/11/12
|
||||
*/
|
||||
@Service("PPService")
|
||||
@Slf4j
|
||||
public class GamesPPServiceImpl implements IGamesService {
|
||||
|
||||
|
||||
@Resource
|
||||
private RedisCache gRedisCache;
|
||||
|
||||
@Resource
|
||||
private IGameService gameService;
|
||||
|
||||
@Resource
|
||||
private IMemberService memberService;
|
||||
|
||||
@Resource
|
||||
private IGameFreeRecordService gameFreeRecordService;
|
||||
|
||||
@Resource
|
||||
private PPClient ppClient;
|
||||
|
||||
@Resource
|
||||
private IGameBettingDetailsService gameBettingDetailsService;
|
||||
|
||||
|
||||
@Resource
|
||||
private IGameExchangeMoneyService gameExchangeMoneyService;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获得就是成功
|
||||
*
|
||||
* @param errorCode 错误代码
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
private Boolean getIsSuccess(String errorCode) {
|
||||
ApiException.isTrue(!"7".equals(errorCode), ErrorCode.INSUFFICIENT_PLAYER_BALANCE.getCode());
|
||||
return "0".equals(errorCode);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取密钥
|
||||
*
|
||||
* @param gamesBaseRequestDTO 游戏请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
private String getKey(GamesBaseRequestDTO gamesBaseRequestDTO) {
|
||||
//取出对应的key跟密钥跟请求参数
|
||||
String agentKey = gamesBaseRequestDTO.getAgentKey();
|
||||
|
||||
return Md5Utils.md5New(gamesBaseRequestDTO.getQuery() + agentKey);
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换为ingress
|
||||
*
|
||||
* @param terminalTypes 终端类型
|
||||
* @return {@link Integer }
|
||||
*/
|
||||
public Integer convertToIngress(String terminalTypes) {
|
||||
if (terminalTypes == null || terminalTypes.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
boolean hasMobile = terminalTypes.contains("MOBILE");
|
||||
boolean hasWeb = terminalTypes.contains("WEB");
|
||||
|
||||
if (hasMobile && hasWeb) {
|
||||
return IngressType.PC_AND_MOBILE_WEB.getValue();
|
||||
} else if (hasMobile) {
|
||||
return IngressType.MOBILE_WEB.getValue();
|
||||
} else if (hasWeb) {
|
||||
return IngressType.PC_WEB.getValue();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 创建成员
|
||||
*
|
||||
* @param createMemberRequestDTO 创建成员请求dto
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public Boolean createMember(CreateMemberRequestDTO createMemberRequestDTO) {
|
||||
log.info("GamesPPServiceImpl [createMember] 请求参数 {}", createMemberRequestDTO);
|
||||
Map<String, Object> params = new TreeMap<>();
|
||||
params.put("externalPlayerId", createMemberRequestDTO.getAccount());
|
||||
params.put("secureLogin", createMemberRequestDTO.getAgentId());
|
||||
params.put("currency", createMemberRequestDTO.getCurrency());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
createMemberRequestDTO.setQuery(query);
|
||||
String key = this.getKey(createMemberRequestDTO);
|
||||
params.put("hash", key);
|
||||
PPUserAccountResponse member = ppClient.createMember(params);
|
||||
if (this.getIsSuccess(member.getError())) {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
//判断是否获取成功
|
||||
return Boolean.FALSE;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取会员信息
|
||||
*
|
||||
* @param memberInfoRequestDTO 会员信息请求dto
|
||||
* @return {@link MemberInfoResponseDTO }
|
||||
*/
|
||||
@Override
|
||||
public MemberInfoResponseDTO getMemberInfo(MemberInfoRequestDTO memberInfoRequestDTO) {
|
||||
log.info("GamesPPServiceImpl [loginWithoutRedirect] 请求参数 {}", memberInfoRequestDTO);
|
||||
Map<String, Object> params = new TreeMap<>();
|
||||
params.put("secureLogin", memberInfoRequestDTO.getAgentId());
|
||||
params.put("externalPlayerId", memberInfoRequestDTO.getAccounts());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
memberInfoRequestDTO.setQuery(query);
|
||||
String key = this.getKey(memberInfoRequestDTO);
|
||||
params.put("hash", key);
|
||||
PPPlayerAccountResponse memberInfo = ppClient.getMemberInfo(params);
|
||||
if (this.getIsSuccess(memberInfo.getError())) {
|
||||
return MemberInfoResponseDTO.builder().account(memberInfoRequestDTO.getAccounts())
|
||||
.balance(memberInfo.getBalance())
|
||||
.status(GameMemberStatus.UNKNOWN.getCode()).build();
|
||||
}
|
||||
throw new ApiException(ErrorCode.ACCOUNT_NOT_EXIST.getCode());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 无重定向登录
|
||||
*
|
||||
* @param gamesLogin 游戏登录
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String loginWithoutRedirect(GamesLogin gamesLogin) {
|
||||
log.info("GamesPPServiceImpl [loginWithoutRedirect] 请求参数 {}", gamesLogin);
|
||||
|
||||
Map<String, Object> params = new TreeMap<>();
|
||||
params.put("secureLogin", gamesLogin.getAgentId());
|
||||
params.put("externalPlayerId", gamesLogin.getAccount());
|
||||
params.put("gameId", gamesLogin.getGameId());
|
||||
params.put("language", gamesLogin.getLang());
|
||||
if (!StringUtils.isEmpty(gamesLogin.getPlatform())) {
|
||||
if ("web".equalsIgnoreCase(gamesLogin.getPlatform())) {
|
||||
params.put("platform", "WEB");
|
||||
} else {
|
||||
params.put("platform", "MOBILE");
|
||||
}
|
||||
|
||||
}
|
||||
params.put("lobbyURL", gamesLogin.getHomeUrl());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
gamesLogin.setQuery(query);
|
||||
String key = this.getKey(gamesLogin);
|
||||
params.put("hash", key);
|
||||
PPGameLaunchResponse ppGameLaunchResponse = ppClient.loginWithoutRedirect(params);
|
||||
|
||||
|
||||
if (this.getIsSuccess(ppGameLaunchResponse.getError())) {
|
||||
return ppGameLaunchResponse.getGameUrl();
|
||||
} else {
|
||||
throw new ApiException(ErrorCode.ACCOUNT_NOT_EXIST.getCode());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取游戏列表
|
||||
*
|
||||
* @param gamesBaseRequestDTO 游戏请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public String getGameList(GamesBaseRequestDTO gamesBaseRequestDTO) {
|
||||
List<PPGameResponseDTO.CasinoGame> gamesDatas = gRedisCache.getCacheList(CacheConstants.PP_GAMES);
|
||||
if (!CollectionUtils.isEmpty(gamesDatas)) {
|
||||
return CacheConstants.PP_GAMES;
|
||||
}
|
||||
|
||||
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("secureLogin", gamesBaseRequestDTO.getAgentId());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
gamesBaseRequestDTO.setQuery(query);
|
||||
String key = this.getKey(gamesBaseRequestDTO);
|
||||
params.put("hash", key);
|
||||
|
||||
PPGameResponseDTO gameList = ppClient.getGameList(params);
|
||||
if (this.getIsSuccess(gameList.getError())) {
|
||||
for (PPGameResponseDTO.CasinoGame apiGameInfoResponseDTO : gameList.getGameList()) {
|
||||
Integer platformType = PPGameType.findSystemByCode(apiGameInfoResponseDTO.getGameTypeID());
|
||||
//不支持的游戏跳过
|
||||
if (ObjectUtils.isEmpty(platformType)) {
|
||||
continue;
|
||||
}
|
||||
Integer ingress = convertToIngress(apiGameInfoResponseDTO.getPlatform());
|
||||
//不需要的平台
|
||||
if (ObjectUtils.isEmpty(ingress)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Game game = Game.builder()
|
||||
.platformCode(GamePlatforms.PP.getCode())
|
||||
.platformType(platformType)
|
||||
.gameCode(apiGameInfoResponseDTO.getGameID())
|
||||
.build();
|
||||
List<Game> games = gameService.selectGameList(game);
|
||||
//不存在这个游戏
|
||||
if (CollectionUtils.isEmpty(games)) {
|
||||
game.setIngress(ingress);
|
||||
game.setGameSourceType(apiGameInfoResponseDTO.getGameTypeID());
|
||||
game.setFreespin(Boolean.FALSE);
|
||||
game.setDemoStatus(Boolean.FALSE);
|
||||
game.setSortNo(gameService.selectMaxSortNo(platformType, GamePlatforms.PP.getCode()) + 1);
|
||||
game.setGameName(apiGameInfoResponseDTO.getGameName());
|
||||
game.setCreateBy("system");
|
||||
game.setPlatformCode(GamePlatforms.PP.getCode());
|
||||
game.setPlatformType(platformType);
|
||||
game.setGameId(StringUtils.addSuffix(GamePlatforms.PP.getCode(), apiGameInfoResponseDTO.getGameID()));
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(apiGameInfoResponseDTO.getGameName(), "en-US"));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
}
|
||||
apiGameInfoResponseDTO.setSystemGameId(game.getGameId());
|
||||
apiGameInfoResponseDTO.setSystemPlatformType(platformType);
|
||||
|
||||
}
|
||||
|
||||
gRedisCache.deleteObject(CacheConstants.PP_GAMES);
|
||||
gRedisCache.setCacheList(CacheConstants.PP_GAMES, gameList.getGameList());
|
||||
gRedisCache.expire(CacheConstants.PP_GAMES, 5L, TimeUnit.HOURS);
|
||||
} else {
|
||||
throw new BaseException(gameList.getDescription());
|
||||
}
|
||||
|
||||
return CacheConstants.PP_GAMES;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.PP.getCode() + IdUtil.getSnowflakeNextIdStr();
|
||||
}
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
* @param exchangeTransferMoneyRequestDTO 外汇转账moeny dto
|
||||
* @return {@link Long }
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
log.info("GamesKMServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
|
||||
|
||||
BigDecimal amount = exchangeTransferMoneyRequestDTO.getAmount();
|
||||
if (TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) {
|
||||
// 获取第三方钱包余额
|
||||
MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(exchangeTransferMoneyRequestDTO.getAccount())
|
||||
.agentId(exchangeTransferMoneyRequestDTO.getAgentId())
|
||||
.currency(exchangeTransferMoneyRequestDTO.getCurrency())
|
||||
.agentKey(exchangeTransferMoneyRequestDTO.getAgentKey())
|
||||
.build();
|
||||
|
||||
amount = this.getMemberInfo(gamesBaseRequestDTO).getBalance().negate();
|
||||
}
|
||||
|
||||
Map<String, Object> params = new TreeMap<>();
|
||||
params.put("secureLogin", exchangeTransferMoneyRequestDTO.getAgentId());
|
||||
params.put("externalPlayerId", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("externalTransactionId", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("amount", amount);
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
exchangeTransferMoneyRequestDTO.setQuery(query);
|
||||
String key = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
params.put("hash", key);
|
||||
|
||||
PPTransactionResponse transactionResponse = ppClient.exchangeTransfer(params);
|
||||
//判断是否转移成功
|
||||
if (this.getIsSuccess(transactionResponse.getError())) {
|
||||
amount = amount.abs();
|
||||
//更新数据
|
||||
exchangeMoney.setBalance(amount);
|
||||
exchangeMoney.setCoinBefore(NumberUtil.sub(amount, transactionResponse.getBalance()).abs());
|
||||
exchangeMoney.setCoinAfter(transactionResponse.getBalance());
|
||||
exchangeMoney.setCurrencyBefore(exchangeMoney.getCoinBefore());
|
||||
exchangeMoney.setCurrencyAfter(exchangeMoney.getCoinAfter());
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
exchangeMoney.setPartyTransactionId(transactionResponse.getTransactionId());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
} else {
|
||||
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
log.error("GamesPPServiceImpl [exchangeTransferByAgentId] 金额转移失败,错误代码{},错误信息{}", transactionResponse.getError(), transactionResponse.getDescription());
|
||||
throw new ApiException(ErrorCode.BALANCE_TRANSFER_FAILED.getCode());
|
||||
}
|
||||
|
||||
return exchangeMoney.getId();
|
||||
}
|
||||
|
||||
/**
|
||||
* 汇兑转移状态
|
||||
*
|
||||
* @param exchangeTransferMoneyRequestDTO 兑换转账请求dto
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public ExchangeTransferStatusResponseDTO exchangeTransferStatus(ExchangeTransferStatusRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
log.info("GamesPPServiceImpl [exchangeTransferStatus] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeMoneyId());
|
||||
|
||||
Map<String, Object> params = new TreeMap<>();
|
||||
params.put("secureLogin", exchangeTransferMoneyRequestDTO.getAgentId());
|
||||
params.put("externalTransactionId", StringUtils.isEmpty(exchangeMoney.getPartyTransactionId()) ? "0" : exchangeMoney.getPartyTransactionId());
|
||||
params.put("externalPlayerId", exchangeTransferMoneyRequestDTO.getOrderId());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
exchangeTransferMoneyRequestDTO.setQuery(query);
|
||||
String key = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
params.put("hash", key);
|
||||
|
||||
PPTransactionStatusResponse ppTransactionStatusResponse = ppClient.exchangeTransferStatus(params);
|
||||
if (this.getIsSuccess(ppTransactionStatusResponse.getError())) {
|
||||
Integer status = StatusType.IN_PROGRESS.getValue();
|
||||
if ("Success".equals(ppTransactionStatusResponse.getStatus())) {
|
||||
status = StatusType.SUCCESS.getValue();
|
||||
} else {
|
||||
status = StatusType.FAILURE.getValue();
|
||||
}
|
||||
return ExchangeTransferStatusResponseDTO.builder()
|
||||
.statusType(status)
|
||||
.balance(ppTransactionStatusResponse.getAmount())
|
||||
.coinAfter(ppTransactionStatusResponse.getBalance())
|
||||
.build();
|
||||
} else {
|
||||
log.error("GamesPPServiceImpl [exchangeTransferStatus] 金额转移确认失败,错误代码{},错误信息{}", ppTransactionStatusResponse.getError(), ppTransactionStatusResponse.getDescription());
|
||||
return ExchangeTransferStatusResponseDTO.builder()
|
||||
.statusType(StatusType.FAILURE.getValue())
|
||||
.build();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 按时间获取投注记录
|
||||
*
|
||||
* @param betRecordByTimeDTO 按时间dto投注记录
|
||||
* @return {@link List }<{@link GameBettingDetails }>
|
||||
*/
|
||||
@Override
|
||||
public Boolean getBetRecordByTime(BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
Long timepoint = gRedisCache.getCacheObject(CacheConstants.PP_TIME_POINT);
|
||||
if (ObjectUtils.isEmpty(timepoint)) {
|
||||
timepoint = betRecordByTimeDTO.getStartTime();
|
||||
}
|
||||
|
||||
//请求参数
|
||||
log.info("GamesPPServiceImpl [getBetRecordByTime] 请求参数 {}", betRecordByTimeDTO);
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("login", betRecordByTimeDTO.getAgentId());
|
||||
params.put("password", betRecordByTimeDTO.getAgentKey());
|
||||
params.put("timepoint", timepoint);
|
||||
String result = ppClient.getBetRecordByTime(JsonUtil.mapToQueryString(params));
|
||||
this.batchInsert(PPGameRoundRecord.parse(result), betRecordByTimeDTO);
|
||||
//重新保存最新的时间
|
||||
String[] lines = result.split("\n");
|
||||
timepoint = Long.parseLong(lines[0].replace("timepoint=", ""));
|
||||
gRedisCache.setCacheObject(CacheConstants.PP_TIME_POINT, timepoint);
|
||||
|
||||
return Boolean.TRUE;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 按历史时间获取投注记录
|
||||
*
|
||||
* @param betRecordByTimeDTO 按时间dto投注记录
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public Boolean getBetRecordByHistoryTime(BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
|
||||
//请求参数
|
||||
log.info("GamesPPServiceImpl [getBetRecordByHistoryTime] 请求参数 {}", betRecordByTimeDTO);
|
||||
long timepoint = betRecordByTimeDTO.getStartTime();
|
||||
while (timepoint < betRecordByTimeDTO.getEndTime()) {
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("login", betRecordByTimeDTO.getAgentId());
|
||||
params.put("password", betRecordByTimeDTO.getAgentKey());
|
||||
params.put("timepoint", timepoint);
|
||||
String result = ppClient.getBetRecordByTime(JsonUtil.mapToQueryString(params));
|
||||
this.batchInsert(PPGameRoundRecord.parse(result), betRecordByTimeDTO);
|
||||
//重新保存最新的时间
|
||||
String[] lines = result.split("\n");
|
||||
timepoint = Long.parseLong(lines[0].replace("timepoint=", ""));
|
||||
}
|
||||
|
||||
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* 赠送免费局数
|
||||
*
|
||||
* @param createFreeSpinRequest 创建自由旋转请求
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public Boolean createFreeSpin(CreateFreeSpinRequestDTO createFreeSpinRequest) {
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取游戏详细信息
|
||||
*
|
||||
* @param getGameDetailRequestDTO 获取游戏详细信息请求dto
|
||||
* @return {@link GetGameDetailResponseDTO }
|
||||
*/
|
||||
@Override
|
||||
public GetGameDetailResponseDTO getGameDetail(GetGameDetailRequestDTO getGameDetailRequestDTO) {
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
/**
|
||||
* 强制会员从游戏注销
|
||||
*
|
||||
* @param kickMemberRequestDTO 踢会员请求dto
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public Boolean kickMember(KickMemberRequestDTO kickMemberRequestDTO) {
|
||||
log.info("GamesPPServiceImpl [kickMember] 请求参数 {}", kickMemberRequestDTO);
|
||||
Map<String, Object> params = new TreeMap<>();
|
||||
params.put("secureLogin", kickMemberRequestDTO.getAgentId());
|
||||
params.put("externalPlayerId", kickMemberRequestDTO.getAccount());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
kickMemberRequestDTO.setQuery(query);
|
||||
String key = this.getKey(kickMemberRequestDTO);
|
||||
params.put("hash", key);
|
||||
PPResponse kickMember = ppClient.kickMember(params);
|
||||
if (this.getIsSuccess(kickMember.getError())) {
|
||||
return Boolean.TRUE;
|
||||
} else {
|
||||
throw new ApiException(ErrorCode.KICK_OUT_AILED.getCode());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 踢成员全部
|
||||
*
|
||||
* @param kickMemberAllDTO 踢成员全部dto
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public Boolean kickMemberAll(KickMemberAllDTO kickMemberAllDTO) {
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
/**
|
||||
* 免费游戏玩家使用的纪录
|
||||
*
|
||||
* @param getFreeSpinDashflowRequestDTO 获取自由旋转dashflow请求dto
|
||||
* @return {@link List }<{@link GameFreeRecord }>
|
||||
*/
|
||||
@Override
|
||||
public List<GameFreeRecord> getFreeSpinDashflow(GetFreeSpinDashflowRequestDTO getFreeSpinDashflowRequestDTO) {
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消赠送免费局数
|
||||
*
|
||||
* @param cancelFreeSpinRequestDTO 取消免费旋转请求
|
||||
* @return {@link Boolean }
|
||||
*/
|
||||
@Override
|
||||
public Boolean cancelFreeSpin(CancelFreeSpinRequestDTO cancelFreeSpinRequestDTO) {
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
@Override
|
||||
public GameDemoLoginResponseDTO gameDemoLogin(GameDemoLoginRequestDTO gameDemoLoginRequestDTO) {
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量插入
|
||||
*/
|
||||
private synchronized void batchInsert(List<PPGameRoundRecord> report, GamesBaseRequestDTO gamesBaseRequestDTO) {
|
||||
List<GameBettingDetails> gameBettingDetails = new ArrayList<>();
|
||||
List<String> wagersIds = new ArrayList<>();
|
||||
//数据转化
|
||||
for (PPGameRoundRecord bean : report) {
|
||||
GameBettingDetails bettingDetails = this.dataBuild(GamesDataBuildDTO.builder().platform(gamesBaseRequestDTO.getVendor()).data(bean).build());
|
||||
if (!ObjectUtils.isEmpty(bettingDetails)) {
|
||||
bettingDetails.setId(IdUtil.getSnowflakeNextId());
|
||||
gameBettingDetails.add(bettingDetails);
|
||||
}
|
||||
wagersIds.add(String.valueOf(bean.getPlaySessionID()));
|
||||
}
|
||||
if (!CollectionUtils.isEmpty(gameBettingDetails)) {
|
||||
//查询重复数据id
|
||||
List<String> removeWagersIds = gameBettingDetailsService.selectGameBettingDetailsByWagersId(wagersIds, GamePlatforms.PP.getCode());
|
||||
//用steam流清除list中与wagersIds集合相同的数据
|
||||
gameBettingDetails = gameBettingDetails.stream()
|
||||
.filter(detail -> !removeWagersIds.contains(detail.getWagersId()))
|
||||
.collect(Collectors.toList());
|
||||
if (!CollectionUtils.isEmpty(gameBettingDetails)) {
|
||||
gameBettingDetailsService.batchInsert(gameBettingDetails);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 数据构建
|
||||
*
|
||||
* @param gamesDataBuildDTO 数据
|
||||
* @return {@link GameBettingDetails }
|
||||
*/
|
||||
@Override
|
||||
public GameBettingDetails dataBuild(GamesDataBuildDTO gamesDataBuildDTO) {
|
||||
//转化类
|
||||
PPGameRoundRecord resultBean = (PPGameRoundRecord) gamesDataBuildDTO.getData();
|
||||
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(resultBean.getExtPlayerID());
|
||||
if (ObjectUtils.isEmpty(member)) {
|
||||
return null;
|
||||
}
|
||||
List<PPGameResponseDTO.CasinoGame> gamesDatas = gRedisCache.getCacheList(CacheConstants.PP_GAMES);
|
||||
Map<String, PPGameResponseDTO.CasinoGame> dataDTOMap = gamesDatas.stream().collect(Collectors.toMap(
|
||||
PPGameResponseDTO.CasinoGame::getGameID,
|
||||
e -> e,
|
||||
(existing, replacement) -> existing
|
||||
));
|
||||
PPGameResponseDTO.CasinoGame casinoGame = dataDTOMap.get(resultBean.getGameID());
|
||||
|
||||
BigDecimal payoffAmount = NumberUtil.sub(resultBean.getWin(), resultBean.getBet());
|
||||
Integer gameStatus = GameStatus.FLAT.getCode();
|
||||
if (payoffAmount.compareTo(BigDecimal.ZERO) > 0) {
|
||||
gameStatus = GameStatus.WIN.getCode();
|
||||
} else if (payoffAmount.compareTo(BigDecimal.ZERO) < 0) {
|
||||
gameStatus = GameStatus.FAIL.getCode();
|
||||
}
|
||||
|
||||
|
||||
//数据构造
|
||||
GameBettingDetails gameBettingDetails = GameBettingDetails.builder()
|
||||
.tenantKey(member.getTenantKey())
|
||||
//保存我们的币种id
|
||||
.currencyCode(gamesDataBuildDTO.getPlatform().getOurCurrency(resultBean.getCurrency()))
|
||||
.memberId(member.getId())
|
||||
.gameCode(resultBean.getGameID())
|
||||
.gameType(casinoGame.getSystemPlatformType())
|
||||
.platformCode(GamePlatforms.PP.getInfo())
|
||||
.gameId(casinoGame.getSystemGameId())
|
||||
.gameName(casinoGame.getGameName())
|
||||
.gameStatus(gameStatus)
|
||||
.gameStatusType("F".equals(resultBean.getType()) ? 19 : 1)
|
||||
.gameCurrencyCode(resultBean.getCurrency())
|
||||
.account(resultBean.getExtPlayerID())
|
||||
.wagersId(resultBean.getPlaySessionID())
|
||||
.wagersTime(resultBean.getStartDate())
|
||||
.betAmount(resultBean.getBet())
|
||||
.payoffTime(resultBean.getEndDate())
|
||||
.payoffAmount(payoffAmount.abs())
|
||||
.settlementTime(resultBean.getEndDate())
|
||||
.turnover(resultBean.getBet())
|
||||
.settlementStatus(SettlementStatusEnum.COMPLETED.getCode())
|
||||
.build();
|
||||
gameBettingDetails.setCreateBy(Constants.SYSTEM);
|
||||
gameBettingDetails.setCreateTime(DateUtils.getNowDate());
|
||||
return gameBettingDetails;
|
||||
}
|
||||
}
|
||||
|
|
@ -27,7 +27,15 @@ public class ExchangeTransferMoneyRequestDTO extends GamesBaseRequestDTO {
|
|||
*/
|
||||
private String account;
|
||||
|
||||
/**
|
||||
* 租户密钥
|
||||
*/
|
||||
private String tenantKey;
|
||||
|
||||
/**
|
||||
* 订单id
|
||||
*/
|
||||
private String orderId;
|
||||
/**
|
||||
* 金额
|
||||
*/
|
||||
|
|
@ -35,14 +43,9 @@ public class ExchangeTransferMoneyRequestDTO extends GamesBaseRequestDTO {
|
|||
|
||||
|
||||
/**
|
||||
* 游戏交换id
|
||||
* 租户额度
|
||||
*/
|
||||
private Long gameExchangeId;
|
||||
|
||||
/**
|
||||
* 交易编号
|
||||
*/
|
||||
private String transactionId;
|
||||
private BigDecimal quota;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
package com.ff.game.api.request;
|
||||
|
||||
import com.ff.base.annotation.Excel;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 事务id请求dto
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/11
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
public class TransactionIdRequestDTO {
|
||||
/** 转出类型 1游戏商转入到用户全部转出 2 用户转移到游戏商 3 游戏商转移额度到平台商 */
|
||||
private Integer exchangeType;
|
||||
|
||||
/** 游戏账号 */
|
||||
private String gameAccount;
|
||||
}
|
||||
|
|
@ -65,14 +65,6 @@ public interface SAClient {
|
|||
String exchangeTransferByInto(@Body String params);
|
||||
|
||||
|
||||
|
||||
@Post( url ="/api.aspx/CheckOrderDetailsDV",
|
||||
headers = {
|
||||
"Content-type: application/x-www-form-urlencoded"
|
||||
})
|
||||
String exchangeTransferStatus(@Body String params);
|
||||
|
||||
|
||||
/**
|
||||
* 外汇转出
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
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;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* CheckOrderDetailsResponse - XML 响应的 Java 类映射
|
||||
*/
|
||||
@Data
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
@XmlRootElement(name = "CheckOrderDetailsResponse")
|
||||
public class SACheckOrderDetailsResponse {
|
||||
|
||||
/**
|
||||
* 错误消息ID
|
||||
*/
|
||||
@XmlElement(name = "ErrorMsgId")
|
||||
private Integer errorMsgId;
|
||||
|
||||
/**
|
||||
* 错误消息
|
||||
*/
|
||||
@XmlElement(name = "ErrorMsg")
|
||||
private String errorMsg;
|
||||
|
||||
/**
|
||||
* 是否存在
|
||||
*/
|
||||
@XmlElement(name = "isExist")
|
||||
private Boolean isExist;
|
||||
|
||||
/**
|
||||
* 日期
|
||||
*/
|
||||
@XmlElement(name = "Date")
|
||||
private Date date;
|
||||
|
||||
/**
|
||||
* 类型
|
||||
*/
|
||||
@XmlElement(name = "Type")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 货币
|
||||
*/
|
||||
@XmlElement(name = "Currency")
|
||||
private String currency;
|
||||
|
||||
/**
|
||||
* 金额
|
||||
*/
|
||||
@XmlElement(name = "Amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 上一余额
|
||||
*/
|
||||
@XmlElement(name = "PreviousBalance")
|
||||
private BigDecimal previousBalance;
|
||||
|
||||
/**
|
||||
* 当前余额
|
||||
*/
|
||||
@XmlElement(name = "Balance")
|
||||
private BigDecimal balance;
|
||||
|
||||
}
|
||||
|
|
@ -10,7 +10,6 @@ import com.ff.base.exception.base.ApiException;
|
|||
import com.ff.base.system.service.ISysConfigService;
|
||||
import com.ff.base.utils.*;
|
||||
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.request.*;
|
||||
|
|
@ -224,7 +223,7 @@ public class GamesSAServiceImpl implements IGamesService {
|
|||
public String getGameList(GamesBaseRequestDTO gamesBaseRequestDTO) {
|
||||
|
||||
Game game = gameService.selectGameById(GAME_ID);
|
||||
Integer platformType = PlatformType.VIDEO.getCode();
|
||||
Integer platformType = PlatformType.CARD_GAME.getCode();
|
||||
//不存在这个游戏
|
||||
if (ObjectUtils.isEmpty(game)) {
|
||||
game = new Game();
|
||||
|
|
@ -241,34 +240,11 @@ public class GamesSAServiceImpl implements IGamesService {
|
|||
game.setGameId(StringUtils.addSuffix(GamePlatforms.SA.getCode(), 1));
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}else {
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo("真人棋牌", "zh-CN"));;
|
||||
game.setNameInfo(nameInfos);
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
|
||||
return CacheConstants.SA_GAMES;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
//判断是转入还是转出
|
||||
String transactionId = "OUT" + DateUtils.dateTimeNow() + transactionIdRequestDTO.getGameAccount();
|
||||
if (!TransferType.ALL.getCode().equals(transactionIdRequestDTO.getExchangeType())) {
|
||||
transactionId = "IN" + DateUtils.dateTimeNow() + transactionIdRequestDTO.getGameAccount();
|
||||
}
|
||||
|
||||
return transactionId;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
|
|
@ -280,15 +256,45 @@ public class GamesSAServiceImpl implements IGamesService {
|
|||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
log.info("GamesSAServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.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
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.SA.getInfo())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
if (TransferType.ALL.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) {
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("Username", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("OrderId", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("OrderId", exchangeMoney.getTransactionId());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
exchangeTransferMoneyRequestDTO.setQuery(query);
|
||||
String key = this.getKey(exchangeTransferMoneyRequestDTO, "DebitAllBalanceDV");
|
||||
|
|
@ -318,7 +324,7 @@ public class GamesSAServiceImpl implements IGamesService {
|
|||
} else {
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("Username", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("OrderId", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("OrderId", exchangeMoney.getTransactionId());
|
||||
params.put("CreditAmount", exchangeTransferMoneyRequestDTO.getAmount().stripTrailingZeros().toPlainString());
|
||||
params.put("CurrencyType", exchangeTransferMoneyRequestDTO.getCurrency());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
|
|
@ -361,28 +367,7 @@ public class GamesSAServiceImpl implements IGamesService {
|
|||
*/
|
||||
@Override
|
||||
public ExchangeTransferStatusResponseDTO exchangeTransferStatus(ExchangeTransferStatusRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("OrderId", exchangeTransferMoneyRequestDTO.getOrderId());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
exchangeTransferMoneyRequestDTO.setQuery(query);
|
||||
String key = this.getKey(exchangeTransferMoneyRequestDTO, "CheckOrderDetailsDV");
|
||||
String result = SAClient.exchangeTransferByInto(key);
|
||||
SACheckOrderDetailsResponse saCheckOrderDetailsResponse = XmlUtils.xmlDecrypt(result, SACheckOrderDetailsResponse.class);
|
||||
Integer errorCode = saCheckOrderDetailsResponse.getErrorMsgId();
|
||||
//判断是否转移成功
|
||||
Integer status = StatusType.IN_PROGRESS.getValue();
|
||||
if (this.getIsSuccess(errorCode)) {
|
||||
status = StatusType.SUCCESS.getValue();
|
||||
} else {
|
||||
status = StatusType.FAILURE.getValue();
|
||||
}
|
||||
|
||||
return ExchangeTransferStatusResponseDTO.builder()
|
||||
.statusType(status)
|
||||
.balance(saCheckOrderDetailsResponse.getAmount())
|
||||
.coinBefore(saCheckOrderDetailsResponse.getPreviousBalance())
|
||||
.coinAfter(saCheckOrderDetailsResponse.getBalance())
|
||||
.build();
|
||||
throw new ApiException(ErrorCode.PLATFORM_NOT_METHODS.getCode());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ public class SV388GamesServiceImpl implements IGamesService {
|
|||
List<Game> gameList = gameService.selectGameList(condition);
|
||||
Platform platform = gamesBaseRequestDTO.getVendor();
|
||||
//不存在这个游戏
|
||||
if (CollectionUtils.isEmpty(gameList)) {
|
||||
if (ObjectUtils.isEmpty(gameList)) {
|
||||
Game game = new Game();
|
||||
game.setId(IdUtil.getSnowflakeNextId());
|
||||
game.setSortNo(gameService.selectMaxSortNo(platformType, GamePlatforms.SV388.getCode()) + 1);
|
||||
|
|
@ -215,15 +215,6 @@ public class SV388GamesServiceImpl implements IGamesService {
|
|||
game.setNameInfo(Collections.singletonList(nameInfo));
|
||||
game.setGameId(StringUtils.addSuffix(GamePlatforms.SV388.getCode(), 1));
|
||||
gameService.insertGame(game);
|
||||
}else {
|
||||
for (Game game : gameList) {
|
||||
NameInfo nameInfo = new NameInfo();
|
||||
nameInfo.setLang("zh-CN");
|
||||
nameInfo.setName("SV388真人");
|
||||
game.setNameInfo(Collections.singletonList(nameInfo));
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
|
||||
}
|
||||
return CacheConstants.SV388_GAMES;
|
||||
}
|
||||
|
|
@ -238,8 +229,34 @@ public class SV388GamesServiceImpl implements IGamesService {
|
|||
@Transactional
|
||||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = GamePlatforms.SV388.getCode() + IdUtils.simpleUUID();
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.SV388.getCode())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
exchangeMoney.setStatus(StatusType.IN_PROGRESS.getValue());
|
||||
exchangeMoney.setStep(GameExchangeStep.CREATE_ORDER.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
|
||||
|
||||
Map<String, Object> params = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
|
|
@ -248,13 +265,13 @@ public class SV388GamesServiceImpl implements IGamesService {
|
|||
if (TransferType.GAMES.getCode().equals(exchangeTransferMoneyRequestDTO.getTransferType())) {
|
||||
|
||||
params.put("userId", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("txCode", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("txCode", transactionId);
|
||||
params.put("transferAmount", exchangeTransferMoneyRequestDTO.getAmount());
|
||||
deposit = sv388Client.deposit(params);
|
||||
|
||||
} else {
|
||||
params.put("userId", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("txCode", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("txCode", transactionId);
|
||||
params.put("withdrawType", 1);
|
||||
deposit = sv388Client.withdraw(params);
|
||||
}
|
||||
|
|
@ -284,17 +301,6 @@ public class SV388GamesServiceImpl implements IGamesService {
|
|||
|
||||
return exchangeMoney.getId();
|
||||
}
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.SV388.getCode() + IdUtils.simpleUUID();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 汇兑转移状态
|
||||
|
|
|
|||
|
|
@ -61,16 +61,6 @@ public interface XKClient {
|
|||
@Post(url = "/exchangeTransferByAgentId")
|
||||
XKExchangeMoneyResponseDTO exchangeTransferByAgentId( @JSONBody Map<String, Object> params);
|
||||
|
||||
|
||||
/**
|
||||
* 按代理id进行交换转账
|
||||
*
|
||||
* @param params 参数
|
||||
* @return {@link XKCheckTransferByTransactionIdDTO }
|
||||
*/
|
||||
@Post(url = "/getTransferRecordByTransactionId")
|
||||
XKCheckTransferByTransactionIdDTO checkTransferByTransactionId( @JSONBody Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 按时间获取投注记录
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
package com.ff.game.api.xk.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* xkcheck按交易id dto转账
|
||||
*
|
||||
* @author shi
|
||||
* @date 2025/04/09
|
||||
*/
|
||||
@Data
|
||||
public class XKCheckTransferByTransactionIdDTO {
|
||||
/**
|
||||
* 响应码
|
||||
*/
|
||||
@JsonProperty("code")
|
||||
private Integer code;
|
||||
|
||||
/**
|
||||
* 响应消息
|
||||
*/
|
||||
@JsonProperty("msg")
|
||||
private String msg;
|
||||
|
||||
/**
|
||||
* 响应数据
|
||||
*/
|
||||
@JsonProperty("data")
|
||||
private TransactionData data;
|
||||
|
||||
/**
|
||||
* 交易数据
|
||||
*/
|
||||
@Data
|
||||
public static class TransactionData {
|
||||
|
||||
/**
|
||||
* 会员唯一识别值
|
||||
*/
|
||||
@JsonProperty("account")
|
||||
private String account;
|
||||
|
||||
/**
|
||||
* 交易序号,额度转移纪录唯一值
|
||||
*/
|
||||
@JsonProperty("transactionId")
|
||||
private String transactionId;
|
||||
|
||||
/**
|
||||
* 交易时间(时间戳,单位毫秒)
|
||||
*/
|
||||
@JsonProperty("transferTime")
|
||||
private Long transferTime;
|
||||
|
||||
/**
|
||||
* 交易金额(Decimal(16,4))
|
||||
*/
|
||||
@JsonProperty("amount")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 转账类型
|
||||
*/
|
||||
@JsonProperty("transferType")
|
||||
private Integer transferType;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@JsonProperty("status")
|
||||
private Integer status;
|
||||
}
|
||||
}
|
||||
|
|
@ -188,7 +188,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
params.put("key", key);
|
||||
params.put("disableFullScreen", gamesLogin.getDisableFullScreen());
|
||||
params.put("homeUrl", gamesLogin.getHomeUrl());
|
||||
params.put("platform", gamesLogin.getPlatform());
|
||||
params.put("platform", gamesLogin.getVendor());
|
||||
XKLoginWithoutRedirectResponseDTO xkLoginWithoutRedirectResponseDTO = xkClient.loginWithoutRedirect(params);
|
||||
//判断是否获取成功
|
||||
if (this.getIsSuccess(xkLoginWithoutRedirectResponseDTO.getCode())) {
|
||||
|
|
@ -197,16 +197,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
throw new BaseException(xkLoginWithoutRedirectResponseDTO.getMsg());
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return GamePlatforms.XK.getCode() + IdUtils.simpleUUID();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取游戏列表
|
||||
|
|
@ -238,6 +229,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
for (XKGamesDTO.DataBean gamesDataDTO : xkGamesDTO.getData()) {
|
||||
Integer platformType = XKGameType.findSystemByCode(gamesDataDTO.getGameCategoryId());
|
||||
Game game = Game.builder()
|
||||
//.platformId(gamePlatform.getId())
|
||||
.platformCode(GamePlatforms.XK.getCode())
|
||||
.platformType(platformType)
|
||||
.gameCode(String.valueOf(gamesDataDTO.getGameId()))
|
||||
|
|
@ -252,7 +244,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
game.setPlatformType(platformType);
|
||||
game.setGameName(gamesDataDTO.getName());
|
||||
game.setCreateBy(Constants.SYSTEM);
|
||||
game.setGameId(StringUtils.addSuffix(GamePlatforms.XK.getCode(), gamesDataDTO.getGameId()));
|
||||
game.setGameId(StringUtils.addSuffix(GamePlatforms.SA.getCode(), 1));
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getName(), "zh-CN"));
|
||||
game.setNameInfo(nameInfos);
|
||||
|
|
@ -260,11 +252,6 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
gameService.insertGame(game);
|
||||
} else {
|
||||
game = games.get(0);
|
||||
List<NameInfo> nameInfos = new ArrayList<>();
|
||||
nameInfos.add(new NameInfo(gamesDataDTO.getName(), "zh-CN"));
|
||||
game.setNameInfo(nameInfos);
|
||||
|
||||
gameService.updateGame(game);
|
||||
}
|
||||
gamesDataDTO.setSystemGameId(game.getGameId());
|
||||
}
|
||||
|
|
@ -290,16 +277,40 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
@Transactional
|
||||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
log.info("GamesXKServiceImpl [exchangeTransferByAgentId] 请求参数 {}", exchangeTransferMoneyRequestDTO);
|
||||
// GameSecretKeyCurrency currencyDTO = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTO(GameSecretKeyCurrencyDTO.builder()
|
||||
// .platformCode(GamePlatforms.XK.getInfo())
|
||||
// .code(exchangeTransferMoneyRequestDTO.getAgentId())
|
||||
// .build());
|
||||
|
||||
Member member = memberService.selectMemberByGameAccount(exchangeTransferMoneyRequestDTO.getAccount());
|
||||
String transactionId = GamePlatforms.XK.getCode() + IdUtils.simpleUUID();
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(exchangeTransferMoneyRequestDTO.getGameExchangeId());
|
||||
|
||||
|
||||
|
||||
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.tenantKey(exchangeTransferMoneyRequestDTO.getTenantKey())
|
||||
.orderId(exchangeTransferMoneyRequestDTO.getOrderId())
|
||||
.quota(exchangeTransferMoneyRequestDTO.getQuota())
|
||||
.balance(exchangeTransferMoneyRequestDTO.getAmount())
|
||||
.exchangeType(exchangeTransferMoneyRequestDTO.getTransferType())
|
||||
.currencyCode(exchangeTransferMoneyRequestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.XK.getCode())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
//接口限制限制50字符
|
||||
exchangeMoney.setTransactionId(GamePlatforms.XK.getCode() + IdUtils.simpleUUID());
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("account", exchangeTransferMoneyRequestDTO.getAccount());
|
||||
params.put("transactionId", exchangeTransferMoneyRequestDTO.getTransactionId());
|
||||
params.put("transactionId", exchangeMoney.getTransactionId());
|
||||
params.put("amount", exchangeTransferMoneyRequestDTO.getAmount().stripTrailingZeros().toPlainString());
|
||||
params.put("transferType", exchangeTransferMoneyRequestDTO.getTransferType());
|
||||
params.put("agentId", exchangeTransferMoneyRequestDTO.getAgentId());
|
||||
|
|
@ -319,16 +330,9 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
exchangeMoney.setCoinAfter(exchangeMoneyResponseData.getCoinAfter());
|
||||
exchangeMoney.setCurrencyBefore(exchangeMoneyResponseData.getCurrencyBefore());
|
||||
exchangeMoney.setCurrencyAfter(exchangeMoneyResponseData.getCurrencyAfter());
|
||||
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(exchangeMoneyResponseData.getStatus());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
|
||||
exchangeMoney.setStatus(exchangeMoneyResponseData.getStatus());
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
} else {
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
|
||||
log.error("GamesXKServiceImpl [exchangeTransferByAgentId] 金额转移失败,错误代码{},错误信息{}", exchangeMoneyResponse.getCode(), exchangeMoneyResponse.getMsg());
|
||||
throw new BaseException(exchangeMoneyResponse.getMsg());
|
||||
}
|
||||
|
|
@ -344,27 +348,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
*/
|
||||
@Override
|
||||
public ExchangeTransferStatusResponseDTO exchangeTransferStatus(ExchangeTransferStatusRequestDTO exchangeTransferMoneyRequestDTO) {
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
params.put("transactionId", exchangeTransferMoneyRequestDTO.getOrderId());
|
||||
params.put("agentId", exchangeTransferMoneyRequestDTO.getAgentId());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
exchangeTransferMoneyRequestDTO.setQuery(query);
|
||||
String key = this.getKey(exchangeTransferMoneyRequestDTO);
|
||||
params.put("key", key);
|
||||
XKCheckTransferByTransactionIdDTO xkCheckTransferByTransactionIdDTO = xkClient.checkTransferByTransactionId(params);
|
||||
//判断是否转移成功
|
||||
if (this.getIsSuccess(xkCheckTransferByTransactionIdDTO.getCode())) {
|
||||
XKCheckTransferByTransactionIdDTO.TransactionData data = xkCheckTransferByTransactionIdDTO.getData();
|
||||
return ExchangeTransferStatusResponseDTO.builder()
|
||||
.statusType(data.getStatus())
|
||||
.balance(data.getAmount())
|
||||
.build();
|
||||
} else {
|
||||
return ExchangeTransferStatusResponseDTO.builder()
|
||||
.statusType(StatusType.FAILURE.getValue())
|
||||
.build();
|
||||
}
|
||||
|
||||
return new ExchangeTransferStatusResponseDTO();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -376,6 +360,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
*/
|
||||
@Override
|
||||
public Boolean getBetRecordByTime(BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
// List<GameBettingDetails> gameBettingDetails = new ArrayList<>();
|
||||
//请求参数
|
||||
log.info("GamesXKServiceImpl [getBetRecordByTime] 请求参数 {}", betRecordByTimeDTO);
|
||||
Map<String, Object> params = new LinkedHashMap<>();
|
||||
|
|
@ -432,51 +417,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
*/
|
||||
@Override
|
||||
public Boolean getBetRecordByHistoryTime(BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
//请求参数
|
||||
log.info("GamesXKServiceImpl [getBetRecordByHistoryTime] 请求参数 {}", betRecordByTimeDTO);
|
||||
Map<String, Object> 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());
|
||||
String query = JsonUtil.mapToQueryString(params);
|
||||
betRecordByTimeDTO.setQuery(query);
|
||||
String key = this.getKey(betRecordByTimeDTO);
|
||||
params.put("key", key);
|
||||
XKBetRecordResponseDTO xkBetRecordResponseDTO = xkClient.getBetRecordByTime(params);
|
||||
|
||||
//判断是否获取成功
|
||||
if (this.getIsSuccess(xkBetRecordResponseDTO.getCode())) {
|
||||
//数据组装
|
||||
XKBetRecordResponseDTO.DataBean dataBean = xkBetRecordResponseDTO.getData();
|
||||
this.batchInsert(xkBetRecordResponseDTO, betRecordByTimeDTO);
|
||||
|
||||
//获取下一页数据
|
||||
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);
|
||||
params.put("key", key);
|
||||
xkBetRecordResponseDTO = xkClient.getBetRecordByTime(params);
|
||||
dataBean = xkBetRecordResponseDTO.getData();
|
||||
this.batchInsert(xkBetRecordResponseDTO, betRecordByTimeDTO);
|
||||
}
|
||||
|
||||
|
||||
return Boolean.TRUE;
|
||||
} else {
|
||||
log.error("GamesXKServiceImpl [getBetRecordByHistoryTime] 获取投注记录失败,错误代码{},错误信息{}", xkBetRecordResponseDTO.getCode(), xkBetRecordResponseDTO.getMsg());
|
||||
throw new BaseException(xkBetRecordResponseDTO.getMsg());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -576,7 +517,7 @@ public class GamesXKServiceImpl implements IGamesService {
|
|||
*
|
||||
* @param xkBetRecordResponseDTO xk下注记录响应dto
|
||||
*/
|
||||
private synchronized void batchInsert(XKBetRecordResponseDTO xkBetRecordResponseDTO, BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
private void batchInsert(XKBetRecordResponseDTO xkBetRecordResponseDTO, BetRecordByTimeDTO betRecordByTimeDTO) {
|
||||
List<GameBettingDetails> gameBettingDetails = new ArrayList<>();
|
||||
List<String> wagersIds = new ArrayList<>();
|
||||
//数据组装
|
||||
|
|
|
|||
|
|
@ -3,14 +3,10 @@ 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.IPlatformService;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 平台管理Controller
|
||||
*
|
||||
|
|
@ -22,9 +18,6 @@ import javax.annotation.Resource;
|
|||
public class GamePlatformController extends BaseController {
|
||||
|
||||
|
||||
@Resource
|
||||
private IPlatformService platformService;
|
||||
|
||||
/**
|
||||
* 选择
|
||||
*
|
||||
|
|
@ -35,16 +28,4 @@ public class GamePlatformController extends BaseController {
|
|||
return AjaxResult.success(GamePlatforms.getCodes());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 所有
|
||||
*
|
||||
* @return {@link AjaxResult }
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('game:platform:all')")
|
||||
@GetMapping("/all")
|
||||
public AjaxResult all() {
|
||||
platformService.loadToCache();
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.ff.game.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
|
@ -14,28 +13,10 @@ public class ExtInfo implements Serializable {
|
|||
|
||||
// 币种信息,key为其它平台的币种id,value为我们自己的币种
|
||||
private Map<String, String> currency;
|
||||
/**
|
||||
* 超时时间
|
||||
*/
|
||||
private Map<String, Long> timeout;
|
||||
|
||||
private Map<String, Object> betLimit;
|
||||
|
||||
public String getOurCurrency(String currencyId) {
|
||||
return currency == null ? null : currency.get(currencyId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取超时
|
||||
*
|
||||
* @param key 钥匙
|
||||
* @return {@link Long }
|
||||
*/
|
||||
public Long getTimeout(String key) {
|
||||
Map<String, Long> timeout = this.timeout;
|
||||
if (!ObjectUtils.isEmpty(timeout) && timeout.containsKey(key)) {
|
||||
return timeout.get(key);
|
||||
}
|
||||
return 5000L;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,9 +99,4 @@ public class GameExchangeMoney extends BaseEntity
|
|||
* 步骤状态 GameExchangeStepStatus 枚举
|
||||
*/
|
||||
private Integer stepStatus;
|
||||
|
||||
/**
|
||||
* 部分平台使用 第三方平台交易id
|
||||
*/
|
||||
private String partyTransactionId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,15 +13,6 @@ public class UrlInfo implements Serializable {
|
|||
private String url;
|
||||
private String loginUrl;
|
||||
private String hallCode;
|
||||
/**
|
||||
* HTTPS协议
|
||||
*/
|
||||
private String https;
|
||||
|
||||
/**
|
||||
* 端口
|
||||
*/
|
||||
private String host;
|
||||
/**
|
||||
* 投注网址
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ package com.ff.game.dto;
|
|||
|
||||
import com.ff.game.domain.GameBettingDetails;
|
||||
import com.ff.game.domain.GameExchangeMoney;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* 游戏兑换货币dto
|
||||
|
|
@ -14,9 +11,6 @@ import lombok.experimental.SuperBuilder;
|
|||
* @date 2025/02/27
|
||||
*/
|
||||
@Data
|
||||
@SuperBuilder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class GameExchangeMoneyDTO extends GameExchangeMoney {
|
||||
/**
|
||||
* 会员帐户
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import com.ff.game.mapper.GameExchangeMoneyMapper;
|
|||
import com.ff.game.domain.GameExchangeMoney;
|
||||
import com.ff.game.service.IGameExchangeMoneyService;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
|
||||
/**
|
||||
* 会员金额转移记录Service业务层处理
|
||||
|
|
@ -66,9 +65,7 @@ public class GameExchangeMoneyServiceImpl implements IGameExchangeMoneyService
|
|||
@Override
|
||||
public int insertGameExchangeMoney(GameExchangeMoney gameExchangeMoney)
|
||||
{
|
||||
if (ObjectUtils.isEmpty(gameExchangeMoney.getId())){
|
||||
gameExchangeMoney.setId(IdUtil.getSnowflakeNextId());
|
||||
}
|
||||
gameExchangeMoney.setId(IdUtil.getSnowflakeNextId());
|
||||
gameExchangeMoney.setCreateTime(DateUtils.getNowDate());
|
||||
return gameExchangeMoneyMapper.insertGameExchangeMoney(gameExchangeMoney);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,9 +61,7 @@ public class PlatformServiceImpl implements IPlatformService {
|
|||
Object key = entry.getKey();
|
||||
// 设置数据源类型
|
||||
DynamicDataSourceContextHolder.setDataSourceType(key.toString());
|
||||
Platform platform = new Platform();
|
||||
platform.setStopStatus(Boolean.FALSE);
|
||||
List<Platform> list = selectList(platform);
|
||||
List<Platform> list = selectList(new Platform());
|
||||
for (Platform pp : list) {
|
||||
redisCache.setCacheObject(getCacheKey(pp.getPlatformCode()), pp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
package com.ff.quartz.task;
|
||||
|
||||
import com.ff.api.response.GameExchangeBalanceResponse;
|
||||
import com.ff.base.constant.Constants;
|
||||
import com.ff.base.core.domain.AjaxResult;
|
||||
import com.ff.base.enums.*;
|
||||
import com.ff.base.manager.AsyncManager;
|
||||
import com.ff.base.enums.GamePlatforms;
|
||||
import com.ff.base.enums.StatusType;
|
||||
import com.ff.base.utils.DateUtils;
|
||||
import com.ff.base.utils.StringUtils;
|
||||
import com.ff.base.utils.bean.BeanUtils;
|
||||
import com.ff.game.api.IGamesService;
|
||||
import com.ff.game.api.exchange.StepProcessorFactory;
|
||||
import com.ff.game.api.exchange.dto.GameExchangeDTO;
|
||||
import com.ff.game.api.ng.client.NGClient;
|
||||
import com.ff.game.api.request.BetRecordByTimeDTO;
|
||||
import com.ff.game.api.request.ExchangeTransferStatusRequestDTO;
|
||||
|
|
@ -28,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -58,9 +52,6 @@ public class GameTask {
|
|||
@Resource
|
||||
private IPlatformService platformService;
|
||||
|
||||
|
||||
@Resource
|
||||
private StepProcessorFactory stepProcessorFactory;
|
||||
/**
|
||||
* 同步游戏列表
|
||||
*/
|
||||
|
|
@ -213,39 +204,45 @@ public class GameTask {
|
|||
}
|
||||
|
||||
public void updateGameExchangeMoney() {
|
||||
GameExchangeMoney gameExchangeMoney = GameExchangeMoney.builder().status(StatusType.IN_PROGRESS.getValue()).build();
|
||||
Map<String, Object> params=new HashMap<>();
|
||||
params.put("endTime",DateUtils.addOrSubtractMinutes( DateUtils.getNowDate(),-5));
|
||||
gameExchangeMoney.setParams(params);
|
||||
List<GameExchangeMoney> gameExchangeMoneyList = gameExchangeMoneyService.selectGameExchangeMoneyList(gameExchangeMoney);
|
||||
List<GameExchangeMoney> gameExchangeMoneyList = gameExchangeMoneyService.selectGameExchangeMoneyList(GameExchangeMoney.builder().status(StatusType.IN_PROGRESS.getValue()).build());
|
||||
for (GameExchangeMoney exchangeMoney : gameExchangeMoneyList) {
|
||||
try {
|
||||
Platform platform = platformService.get(exchangeMoney.getPlatformCode());
|
||||
if (null == platform) {
|
||||
log.error("平台不存在platformCode:{}", exchangeMoney.getPlatformCode());
|
||||
continue;
|
||||
}
|
||||
|
||||
List<KeyInfo> keyInfos = platform.getKeyInfo();
|
||||
KeyInfo keyInfo = null;
|
||||
for (KeyInfo keyData : keyInfos) {
|
||||
if (keyData.getCurrency().equalsIgnoreCase(exchangeMoney.getCurrencyCode())) {
|
||||
keyInfo = keyData;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (null == keyInfo) {
|
||||
log.error("平台不存在currencyCode:{}", exchangeMoney.getCurrencyCode());
|
||||
continue;
|
||||
}
|
||||
String targetCurrency = platform.getCurrencyInfo().get(exchangeMoney.getCurrencyCode());
|
||||
if (StringUtils.isEmpty(targetCurrency)) {
|
||||
log.error("平台不存在currencyCode:{}", exchangeMoney.getCurrencyCode());
|
||||
continue;
|
||||
}
|
||||
Member member = memberService.selectMemberById(exchangeMoney.getMemberId());
|
||||
|
||||
Integer step = exchangeMoney.getStep();
|
||||
Integer stepStatus = exchangeMoney.getStepStatus();
|
||||
GameExchangeDTO gameExchangeDTO=new GameExchangeDTO();
|
||||
BeanUtils.copyProperties(exchangeMoney,gameExchangeDTO);
|
||||
gameExchangeDTO.setTriggerType(TriggerType.TIMER.getCode());
|
||||
gameExchangeDTO.setGameAccount(member.getGameAccount());
|
||||
gameExchangeDTO.setMemberAccount(member.getMemberAccount());
|
||||
AsyncManager.me().executeOrdered(
|
||||
exchangeMoney.getOrderId(),
|
||||
() -> {
|
||||
try {
|
||||
GameExchangeStep gameExchangeStep = GameExchangeStep.getByCode(step);
|
||||
if (stepStatus == GameExchangeStepStatus.SUCCESS.getCode()){
|
||||
gameExchangeStep = stepProcessorFactory.getStepProcessor(GameExchangeStep.getByCode(step)).nextStepProcessor();
|
||||
}
|
||||
|
||||
stepProcessorFactory.getStepProcessor(gameExchangeStep).process(gameExchangeDTO);
|
||||
} catch (Exception e) {
|
||||
log.error("GameTask [updateGameExchangeMoney] 余额转移失败 gameExchangeMoneyId {}", gameExchangeDTO.getId(),e);
|
||||
stepProcessorFactory.getStepProcessor(GameExchangeStep.getByCode(exchangeMoney.getStep())).rollBack(gameExchangeDTO);
|
||||
}
|
||||
|
||||
}
|
||||
);
|
||||
ExchangeTransferStatusRequestDTO exchangeTransferStatusRequestDTO = new ExchangeTransferStatusRequestDTO();
|
||||
exchangeTransferStatusRequestDTO.setAccount(member.getGameAccount());
|
||||
exchangeTransferStatusRequestDTO.setCurrency(targetCurrency);
|
||||
exchangeTransferStatusRequestDTO.setOrderId(exchangeMoney.getTransactionId());
|
||||
exchangeTransferStatusRequestDTO.setAgentId(keyInfo.getCode());
|
||||
exchangeTransferStatusRequestDTO.setAgentKey(keyInfo.getKey());
|
||||
exchangeTransferStatusRequestDTO.setGameExchangeMoneyId(exchangeMoney.getId());
|
||||
exchangeTransferStatusRequestDTO.setVendor(platform);
|
||||
exchangeTransferStatusRequestDTO.setKeyInfo(keyInfo);
|
||||
exchangeTransferStatusRequestDTO.setSystemCurrency(exchangeMoney.getCurrencyCode());
|
||||
gamesService.get(exchangeMoney.getPlatformCode() + Constants.SERVICE).exchangeTransferStatus(exchangeTransferStatusRequestDTO);
|
||||
} catch (Exception e) {
|
||||
log.error("查询 更新交易记录失败,错误信息 {}", e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.address;
|
||||
package com.ff.sports.db.address;
|
||||
|
||||
import com.dtflys.forest.callback.AddressSource;
|
||||
import com.dtflys.forest.http.ForestAddress;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package com.ff.game.api.db.client;
|
||||
package com.ff.sports.db.client;
|
||||
|
||||
import com.dtflys.forest.annotation.*;
|
||||
import com.ff.game.api.db.address.DBSportsAddress;
|
||||
import com.ff.game.api.db.dto.*;
|
||||
import com.ff.sports.db.address.DBSportsAddress;
|
||||
import com.ff.sports.db.dto.*;
|
||||
|
||||
/**
|
||||
* @author cengy
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
/**
|
||||
* @author cengy
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.dto;
|
||||
package com.ff.sports.db.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.db.impl;
|
||||
package com.ff.sports.db.impl;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.ff.base.constant.CacheConstants;
|
||||
|
|
@ -12,7 +12,6 @@ import com.ff.base.utils.StringUtils;
|
|||
import com.ff.base.utils.sign.Md5Utils;
|
||||
import com.ff.base.utils.uuid.IdUtils;
|
||||
import com.ff.game.api.IGamesService;
|
||||
import com.ff.game.api.db.dto.*;
|
||||
import com.ff.game.api.request.*;
|
||||
import com.ff.game.domain.*;
|
||||
import com.ff.game.service.IGameBettingDetailsService;
|
||||
|
|
@ -20,10 +19,12 @@ import com.ff.game.service.IGameExchangeMoneyService;
|
|||
import com.ff.game.service.IGameService;
|
||||
import com.ff.member.domain.Member;
|
||||
import com.ff.member.service.IMemberService;
|
||||
import com.ff.game.api.db.client.DBSportsClient;
|
||||
import com.ff.sports.db.client.DBSportsClient;
|
||||
import com.ff.sports.db.dto.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
|
||||
|
|
@ -119,13 +120,37 @@ public class DBSportsServiceImpl implements IGamesService {
|
|||
@Transactional
|
||||
public Long exchangeTransferByAgentId(ExchangeTransferMoneyRequestDTO requestDTO) {
|
||||
|
||||
GameExchangeMoney exchangeMoney = gameExchangeMoneyService.selectGameExchangeMoneyById(requestDTO.getGameExchangeId());
|
||||
Member member = memberService.selectMemberByGameAccount(requestDTO.getAccount());
|
||||
String transactionId = GamePlatforms.DBSports.getCode() + IdUtils.simpleUUID();
|
||||
List<GameExchangeMoney> gameExchangeMonies = gameExchangeMoneyService.selectGameExchangeMoneyList(
|
||||
GameExchangeMoney.builder()
|
||||
.tenantKey(requestDTO.getTenantKey())
|
||||
.orderId(requestDTO.getOrderId())
|
||||
.build()
|
||||
);
|
||||
Assert.isTrue(CollectionUtils.isEmpty(gameExchangeMonies), "订单号重复");
|
||||
//获取下一个自增id
|
||||
GameExchangeMoney exchangeMoney = GameExchangeMoney
|
||||
.builder()
|
||||
.orderId(requestDTO.getOrderId())
|
||||
.tenantKey(requestDTO.getTenantKey())
|
||||
.quota(requestDTO.getQuota())
|
||||
.balance(requestDTO.getAmount())
|
||||
.exchangeType(requestDTO.getTransferType())
|
||||
.currencyCode(requestDTO.getSystemCurrency())
|
||||
.memberId(member.getId())
|
||||
.transactionId(transactionId)
|
||||
.platformCode(GamePlatforms.DBSports.getCode())
|
||||
.build();
|
||||
exchangeMoney.setCreateBy(Constants.SYSTEM);
|
||||
//接口限制限制50字符
|
||||
exchangeMoney.setTransactionId(transactionId);
|
||||
// 转入
|
||||
if (requestDTO.getTransferType().equals(TransferType.GAMES.getCode())) {
|
||||
TransferRequest request = new TransferRequest();
|
||||
request.setUserName(requestDTO.getAccount());
|
||||
request.setTransferType(1);
|
||||
request.setTransferId(requestDTO.getTransactionId());
|
||||
request.setTransferId(requestDTO.getOrderId());
|
||||
request.setMerchantCode(requestDTO.getAgentId());
|
||||
request.setAmount(requestDTO.getAmount().toString());
|
||||
request.buildSignature(requestDTO.getAgentKey());
|
||||
|
|
@ -154,19 +179,15 @@ public class DBSportsServiceImpl implements IGamesService {
|
|||
} catch (Exception e) {
|
||||
log.error("查询会员失败, errorCode:{}, errorMessage:{}", response.getCode(), response.getMsg(), e);
|
||||
}
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
exchangeMoney.setStatus(StatusType.SUCCESS.getValue()); // SUCCESS
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
} else {
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
throw new ApiException(ErrorCode.Transfer_In_Failure.getCode());
|
||||
}
|
||||
} else {
|
||||
// 获取第三方钱包余额
|
||||
MemberInfoRequestDTO memberInfoRequestDTO = MemberInfoRequestDTO.builder()
|
||||
.accounts(requestDTO.getAccount())
|
||||
.accounts(member.getGameAccount())
|
||||
.agentId(requestDTO.getAgentId())
|
||||
.agentKey(requestDTO.getAgentKey())
|
||||
.build();
|
||||
|
|
@ -178,7 +199,7 @@ public class DBSportsServiceImpl implements IGamesService {
|
|||
TransferRequest request = new TransferRequest();
|
||||
request.setUserName(requestDTO.getAccount());
|
||||
request.setTransferType(2); // 转出
|
||||
request.setTransferId(requestDTO.getTransactionId());
|
||||
request.setTransferId(requestDTO.getOrderId());
|
||||
request.setMerchantCode(requestDTO.getAgentId());
|
||||
request.setAmount(/*requestDTO.getAmount().toString()*/ balance.toString());
|
||||
request.buildSignature(requestDTO.getAgentKey());
|
||||
|
|
@ -200,30 +221,15 @@ public class DBSportsServiceImpl implements IGamesService {
|
|||
exchangeMoney.setCoinAfter(afterAmount);
|
||||
exchangeMoney.setCurrencyBefore(beforeAmount);
|
||||
exchangeMoney.setCurrencyAfter(afterAmount);
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.SUCCESS.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
exchangeMoney.setStatus(StatusType.SUCCESS.getValue()); // SUCCESS
|
||||
gameExchangeMoneyService.insertGameExchangeMoney(exchangeMoney);
|
||||
} else {
|
||||
exchangeMoney.setStep(GameExchangeStep.PLATFORM_TRANSACTION.getCode());
|
||||
exchangeMoney.setStepStatus(GameExchangeStepStatus.FAILURE.getCode());
|
||||
gameExchangeMoneyService.updateGameExchangeMoney(exchangeMoney);
|
||||
throw new ApiException(ErrorCode.Transfer_Out_Failure.getCode());
|
||||
}
|
||||
}
|
||||
return exchangeMoney.getId();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取交易id
|
||||
*
|
||||
* @param transactionIdRequestDTO 事务id请求dto
|
||||
* @return {@link String }
|
||||
*/
|
||||
@Override
|
||||
public String getTransactionId(TransactionIdRequestDTO transactionIdRequestDTO) {
|
||||
return gameExchangeMoneyService.getTransactionId(GamePlatforms.DBSports.getInfo(), 11);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会员信息
|
||||
*
|
||||
|
|
@ -389,8 +395,8 @@ public class DBSportsServiceImpl implements IGamesService {
|
|||
void getRealtimeRecord(BetRecordByTimeDTO requestDTO, int pageNum) {
|
||||
|
||||
GetBetListRequest request = new GetBetListRequest();
|
||||
request.setStartTime(String.valueOf(requestDTO.getStartTime()));
|
||||
request.setEndTime(String.valueOf(requestDTO.getEndTime()));
|
||||
request.setStartTime(/*String.valueOf(requestDTO.getStartTime())*/ "1744333220000");
|
||||
request.setEndTime(/*String.valueOf(requestDTO.getEndTime())*/ "1744335020000");
|
||||
request.setMerchantCode(requestDTO.getAgentId());
|
||||
request.setPageNum(pageNum);
|
||||
request.setPageSize(1000);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.address;
|
||||
package com.ff.sports.fb.address;
|
||||
|
||||
import com.dtflys.forest.callback.AddressSource;
|
||||
import com.dtflys.forest.http.ForestAddress;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package com.ff.game.api.fb.client;
|
||||
package com.ff.sports.fb.client;
|
||||
|
||||
import com.dtflys.forest.annotation.*;
|
||||
import com.ff.game.api.fb.address.FBSportsAddress;
|
||||
import com.ff.game.api.fb.dto.*;
|
||||
import com.ff.sports.fb.address.FBSportsAddress;
|
||||
import com.ff.sports.fb.dto.*;
|
||||
|
||||
/**
|
||||
* <a href="https://doc.newsportspro.com/apidoc_data.html">数据接口文档</a><br/>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
/**
|
||||
* @author cengy
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ff.game.api.fb.dto;
|
||||
package com.ff.sports.fb.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue