ff-base/src/main/java/com/ff/base/utils/RandomGeneratorUtils.java

@@ -1,32 +0,0 @@
-package com.ff.base.utils;
-
-import java.security.SecureRandom;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * 随机发生器
- *
- * @author shi
- * @date 2025/03/14
- */
-public class RandomGeneratorUtils {
-    private static final String CHARACTERS = "abcdefghijklmnopqrstuvwxyz0123456789";
-    private static final SecureRandom RANDOM = new SecureRandom();
-
-
-    /**
-     *  生成 5-8 之间的随机长度
-     *
-     * @return {@link String }
-     */
-    public static String generateRandomAccount() {
-        int length = 5 + RANDOM.nextInt(4);
-        StringBuilder sb = new StringBuilder(length);
-        for (int i = 0; i < length; i++) {
-            sb.append(CHARACTERS.charAt(RANDOM.nextInt(CHARACTERS.length())));
-        }
-        return sb.toString();
-    }
-
-}

ff-game/src/main/java/com/ff/api/controller/ApiGameController.java

@@ -159,7 +159,7 @@ public class ApiGameController extends BaseController {
         ApiException.notNull(gameSecretKeyLangDTO, ErrorCode.LANG_NOT_EXIST.getCode());
 
 
-        Member member = memberService.selectMemberByAccount(memberCreateApiRequest.getAccount(), memberCreateApiRequest.getCurrencyCode(), gamePlatform.getPlatformCode());
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(memberCreateApiRequest.getAccount(), memberCreateApiRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
         ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
 
         GamesLogin gamesLogin = GamesLogin.builder()
@@ -214,8 +214,7 @@ public class ApiGameController extends BaseController {
                 .build());
 
         // 获取用户信息
-        Member member = memberService.selectMemberByAccount(gameExchangeBalanceRequest.getAccount(), gameExchangeBalanceRequest.getCurrencyCode(), gameExchangeBalanceRequest.getPlatformCode());
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(gameExchangeBalanceRequest.getAccount(), gameExchangeBalanceRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
-        ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
 
 
         //操作第三方额度接口
@@ -281,11 +280,8 @@ public class ApiGameController extends BaseController {
                 .systemCurrency(gameCreateFreeSpinRequest.getCurrencyCode()).build());
         ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode());
 
-
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(gameCreateFreeSpinRequest.getAccount(), gameCreateFreeSpinRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
-        Member member = memberService.selectMemberByAccount(gameCreateFreeSpinRequest.getAccount(), gameCreateFreeSpinRequest.getCurrencyCode(), gameCreateFreeSpinRequest.getPlatformCode());
         ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
-
-
         CreateFreeSpinRequestDTO createFreeSpinRequestDTO = CreateFreeSpinRequestDTO.builder()
                 .account(member.getGameAccount())
                 .currency(gameCreateFreeSpinRequest.getCurrencyCode())
@@ -394,12 +390,10 @@ public class ApiGameController extends BaseController {
                 .systemCurrency(gameKickMemeberRequest.getCurrencyCode()).build());
         ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode());
 
-
+        TenantSecretKey tenantSecretKey = keyConfig.get();
-
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(gameKickMemeberRequest.getAccount(), gameKickMemeberRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
-        Member member = memberService.selectMemberByAccount(gameKickMemeberRequest.getAccount(), gameKickMemeberRequest.getCurrencyCode(), gameKickMemeberRequest.getPlatformCode());
         ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
 
-
         IGamesService iGamesService = gamesService.get(gameKickMemeberRequest.getPlatformCode() + Constants.SERVICE);
         ApiException.notNull(iGamesService, ErrorCode.PLATFORM_NOT_EXIST.getCode());
 
@@ -504,9 +498,8 @@ public class ApiGameController extends BaseController {
     public AjaxResult exchangeBalanceAll(@Validated @RequestBody GameExchangeBalanceAllRequest gameExchangeBalanceAllRequest) {
 
         TenantSecretKey tenantSecretKey = keyConfig.get();
-
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(gameExchangeBalanceAllRequest.getAccount(), gameExchangeBalanceAllRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
-
+        ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
-
 
 
         List<GameSecretKeyCurrencyDTO> gameSecretKeys = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTOList(GameSecretKeyCurrencyDTO.builder()
@@ -526,10 +519,6 @@ public class ApiGameController extends BaseController {
                 try {
 
                     IGamesService iGamesService = gamesService.get(gameSecretKeyCurrencyDTO.getPlatformCode() + Constants.SERVICE);
-
-                    Member member = memberService.selectMemberByAccount(gameExchangeBalanceAllRequest.getAccount(), gameExchangeBalanceAllRequest.getCurrencyCode(), gameSecretKeyCurrencyDTO.getPlatformCode());
-                    ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
-
                     //操作第三方钱包
                     ExchangeTransferMoneyRequestDTO exchangeTransferMoneyRequestDTO = ExchangeTransferMoneyRequestDTO.builder()
                             .agentId(gameSecretKeyCurrencyDTO.getCode())
@@ -564,7 +553,6 @@ public class ApiGameController extends BaseController {
                 if (ObjectUtils.isEmpty(gameExchangeMoney)) {
                     continue;
                 }
-                Member member = memberService.selectMemberById(gameExchangeMoney.getMemberId());
                 balanceMap.put(gameExchangeMoney.getPlatformCode(), gameExchangeMoney.getBalance());
                 BigDecimal balance = gameExchangeMoney.getBalance();
                 balanceAll = NumberUtil.add(balanceAll, balance);

ff-game/src/main/java/com/ff/api/controller/ApiMemberController.java

@@ -33,7 +33,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -92,7 +91,7 @@ public class ApiMemberController extends BaseController {
      */
     @PostMapping("/create")
     @Transactional
-    public synchronized AjaxResult createMember(@Validated @RequestBody MemberCreateApiRequest memberCreateApiRequest) {
+    public AjaxResult createMember(@Validated @RequestBody MemberCreateApiRequest memberCreateApiRequest) {
 
         IGamesService iGamesService = gamesService.get(memberCreateApiRequest.getPlatformCode() + Constants.SERVICE);
         ApiException.notNull(iGamesService, ErrorCode.PLATFORM_NOT_EXIST.getCode());
@@ -104,18 +103,12 @@ public class ApiMemberController extends BaseController {
 
         ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode());
 
-        String gameAccount = StringUtils.addSuffix(memberService.getMemberGameAccount(), tenantSecretKey.getTenantSn());
+        String gameAccount = StringUtils.addSuffix(memberCreateApiRequest.getAccount(), memberCreateApiRequest.getCurrencyCode() + tenantSecretKey.getTenantSn());
-
-
-        // 获取用户信息
-        Member gameMember = memberService.selectMemberByAccount(memberCreateApiRequest.getAccount(), memberCreateApiRequest.getCurrencyCode(), memberCreateApiRequest.getPlatformCode());
-        if (!ObjectUtils.isEmpty(gameMember)){
-            throw new ApiException(ErrorCode.GAME_ACCOUNT_CREATION_FAILED.getCode());
-        }
-
-
 
 
+        List<Member> members = memberService.selectMemberList(Member.builder()
+                .tenantKey(tenantSecretKey.getTenantKey()).gameAccount(gameAccount).build());
+        if (CollectionUtils.isEmpty(members)) {
             //注册本地账号
             Member member = Member.builder()
                     .tenantKey(tenantSecretKey.getTenantKey())
@@ -126,7 +119,7 @@ public class ApiMemberController extends BaseController {
                     .build();
             int insertMember = memberService.insertMember(member);
             Assert.isTrue(insertMember > 0, "建立游戏账号失败");
-
+        }
         //向第三方注册账号
         CreateMemberRequestDTO gamesBaseRequestDTO = CreateMemberRequestDTO.builder()
                 .account(gameAccount)
@@ -160,13 +153,9 @@ public class ApiMemberController extends BaseController {
 
         ApiException.notNull(gameSecretKey, ErrorCode.CURRENCY_NOT_EXIST.getCode());
 
-
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(memberInfoApiRequest.getAccount(), memberInfoApiRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
-        // 获取用户信息
-        Member member = memberService.selectMemberByAccount(memberInfoApiRequest.getAccount(), memberInfoApiRequest.getCurrencyCode(), memberInfoApiRequest.getPlatformCode());
         ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
 
-
-
         //向第三方查询账号
         MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
                 .accounts(member.getGameAccount())
@@ -190,8 +179,9 @@ public class ApiMemberController extends BaseController {
     @PostMapping("/info/all")
     public AjaxResult infoAll(@Validated @RequestBody MemberInfoAllApiRequest memberInfoAllApiRequest) {
 
-
+        TenantSecretKey tenantSecretKey = keyConfig.get();
-
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(memberInfoAllApiRequest.getAccount(), memberInfoAllApiRequest.getCurrencyCode() + tenantSecretKey.getTenantSn()));
+        ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
 
 
         List<GameSecretKeyCurrencyDTO> gameSecretKeys = gameSecretKeyCurrencyService.findByGameSecretKeyCurrencyDTOList(GameSecretKeyCurrencyDTO.builder()
@@ -209,12 +199,6 @@ public class ApiMemberController extends BaseController {
             futures.add(threadPoolTaskExecutor.submit(() -> {
                 try {
                     IGamesService iGamesService = gamesService.get(gameSecretKey.getPlatformCode() + Constants.SERVICE);
-
-                    // 获取用户信息
-                    Member member = memberService.selectMemberByAccount(memberInfoAllApiRequest.getAccount(), memberInfoAllApiRequest.getCurrencyCode(), gameSecretKey.getPlatformCode());
-                    ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
-
-
                     MemberInfoRequestDTO gamesBaseRequestDTO = MemberInfoRequestDTO.builder()
                             .accounts(member.getGameAccount())
                             .agentId(gameSecretKey.getCode())

ff-game/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java

@@ -313,14 +313,8 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService {
         ApiException.notNull(tenantPlatform, ErrorCode.PLATFORM_NOT_EXIST.getCode());
 
 
-
         // 获取用户信息
-        Member member = memberService.selectMemberByAccount(gameBalanceExchange.getAccount(), gameBalanceExchange.getCurrencyCode(), gameBalanceExchange.getPlatformCode());
+        Member member = memberService.selectMemberByGameAccount(StringUtils.addSuffix(gameBalanceExchange.getAccount(), gameBalanceExchange.getCurrencyCode() + tenantSecretKey.getTenantSn()));
-        ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
-
-
-
-
         // 检查用户是否存在，否则抛出异常
         ApiException.notNull(member, ErrorCode.ACCOUNT_NOT_EXIST.getCode());
 

ff-game/src/main/java/com/ff/member/mapper/MemberMapper.java

@@ -2,7 +2,6 @@ package com.ff.member.mapper;
 
 import java.util.List;
 import com.ff.member.domain.Member;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * 会员Mapper接口
@@ -70,15 +69,4 @@ public interface MemberMapper
      * @return {@link Member }
      */
     Member selectMemberByGameAccount(String gameAccount);
-
-
-    /**
-     * 按帐户选择成员
-     *
-     * @param account      账户
-     * @param currencyCode 货币代码
-     * @param platformCode 平台代码
-     * @return {@link Member }
-     */
-    Member selectMemberByAccount(@Param("account") String account,@Param("currencyCode") String currencyCode,@Param("platformCode") String platformCode);
 }

ff-game/src/main/java/com/ff/member/service/IMemberService.java

@@ -27,13 +27,6 @@ public interface IMemberService
      */
      List<Member> selectMemberList(Member member);
 
-    /**
-     * 生成会员游戏账号
-     *
-     * @return {@link String }
-     */
-    String getMemberGameAccount();
-
     /**
      * 新增会员
      * 
@@ -74,14 +67,4 @@ public interface IMemberService
      * @return {@link Member }
      */
     Member selectMemberByGameAccount(String gameAccount);
-
-    /**
-     * 按帐户选择成员
-     *
-     * @param account      账户
-     * @param currencyCode 货币代码
-     * @param platformCode 平台代码
-     * @return {@link Member }
-     */
-    Member selectMemberByAccount(String account,String currencyCode,String platformCode);
 }

ff-game/src/main/java/com/ff/member/service/impl/MemberServiceImpl.java

@@ -4,13 +4,11 @@ import java.util.List;
 
 import cn.hutool.core.util.IdUtil;
 import com.ff.base.utils.DateUtils;
-import com.ff.base.utils.RandomGeneratorUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ff.member.mapper.MemberMapper;
 import com.ff.member.domain.Member;
 import com.ff.member.service.IMemberService;
-import org.springframework.util.ObjectUtils;
 
 /**
  * 会员Service业务层处理
@@ -48,21 +46,6 @@ public class MemberServiceImpl implements IMemberService
         return memberMapper.selectMemberList(member);
     }
 
-    /**
-     * 获取会员游戏账号
-     *
-     * @return {@link String }
-     */
-    @Override
-    public synchronized String getMemberGameAccount() {
-
-        String gameAccount = RandomGeneratorUtils.generateRandomAccount();
-        while (!ObjectUtils.isEmpty(memberMapper.selectMemberByGameAccount(gameAccount))){
-            gameAccount = RandomGeneratorUtils.generateRandomAccount();
-        }
-        return gameAccount;
-    }
-
     /**
      * 新增会员
      *
@@ -126,17 +109,4 @@ public class MemberServiceImpl implements IMemberService
     public Member selectMemberByGameAccount(String gameAccount) {
         return memberMapper.selectMemberByGameAccount(gameAccount.toLowerCase());
     }
-
-    /**
-     * 按帐户选择成员
-     *
-     * @param account      账户
-     * @param currencyCode 货币代码
-     * @param platformCode 平台代码
-     * @return {@link Member }
-     */
-    @Override
-    public Member selectMemberByAccount(String account, String currencyCode, String platformCode) {
-        return memberMapper.selectMemberByAccount(account,currencyCode,platformCode);
-    }
 }

ff-game/src/main/resources/mapper/member/MemberMapper.xml

@@ -96,10 +96,4 @@
         <include refid="selectMemberVo"/>
         where game_account = #{gameAccount}
     </select>
-
-    <select id="selectMemberByAccount" parameterType="String" resultMap="MemberResult">
-        <include refid="selectMemberVo"/>
-        where member_account = #{account} and platform_code = #{platformCode} and currency_code = #{currencyCode}
-        limit 1
-    </select>
 </mapper>