From 4c902d9c20dd965d1ec832760809c622d1df9aac Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 17 Jun 2021 11:17:03 +0800 Subject: [PATCH] 20210617 开售开关 --- src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 280 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 146 insertions(+), 134 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java index 57b51b9..ea2b732 100644 --- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java @@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xcong.excoin.common.entity.FebsResponse; import com.xcong.excoin.common.entity.QueryRequest; +import com.xcong.excoin.common.utils.RedisUtils; import com.xcong.excoin.modules.Sms106Send; import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto; +import com.xcong.excoin.modules.member.dto.MemberLimitDto; import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity; import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity; import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity; @@ -29,7 +31,6 @@ import com.xcong.excoin.modules.member.mapper.MemberMapper; import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper; import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper; -import com.xcong.excoin.modules.member.service.EthService; import com.xcong.excoin.modules.member.service.IMemberService; import com.xcong.excoin.modules.member.service.RocService; import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo; @@ -85,7 +86,9 @@ private final MemberAuthenticationMapper memberAuthenticationMapper; private final AgentFriendRelationMapper agentFriendRelationMapper; - + + private final RedisUtils redisUtils; + @Override public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity, QueryRequest request) { @@ -401,23 +404,6 @@ QueryRequest request) { Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinListInPage(page, memberCoinChargeEntity); - List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords(); - if(CollUtil.isNotEmpty(records)) { - for(MemberCoinChargeVo memberCoinChargeVo : records) { - Long memberId = memberCoinChargeVo.getMemberId(); - Map<String, Object> columnMap = new HashMap<>(); - columnMap.put("member_id", memberId); - List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap ); - if(selectByMap != null && selectByMap.size() > 0) { - MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0); - String firstName = memberAuthenticationEntity.getFirstName(); - String secondName = memberAuthenticationEntity.getSecondName(); - String realName = firstName + secondName; - memberCoinChargeVo.setRealName(realName); - } - } - } - return findmemberQuickBuySaleListInPage; } @@ -432,21 +418,14 @@ for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) { Long memberId = memberCoinWithdrawVo.getMemberId(); - Map<String, Object> columnMap = new HashMap<>(); - columnMap.put("member_id", memberId); - List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap ); - if(selectByMap != null && selectByMap.size() > 0) { - MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0); - String firstName = memberAuthenticationEntity.getFirstName(); - String secondName = memberAuthenticationEntity.getSecondName(); - String realName = firstName + secondName; - memberCoinWithdrawVo.setRealName(realName); - } - BigDecimal amount = memberCoinWithdrawVo.getAmount(); BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount(); BigDecimal subtract = amount.subtract(feeAmount); memberCoinWithdrawVo.setRealAmount(subtract); + if("Y".equals(memberCoinWithdrawVo.getIsInside())){ + // 是内部转账 查询对应的地址 + + } } } return findmemberQuickBuySaleListInPage; @@ -465,7 +444,16 @@ if(status != 1) { return new FebsResponse().fail().message("只有等待审核的状态才能确认!"); } - + // 转币 需要扣除手续费 + amount = amount.subtract(selectById.getFeeAmount()); + if("ROC".equals(symbol) && !"Y".equals(selectById.getIsInside())){ + // 如果是ROC 则自动转 + String transfer = RocService.transfer(amount, address, "ROC"); + if(!"success".equals(transfer)){ + FebsResponse febsResponse = new FebsResponse(); + return febsResponse.fail().message(transfer); + } + } // 查询币币钱包 MemberWalletCoinEntity walletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId, symbol); @@ -488,8 +476,8 @@ Long aimMemberId = selectByMap.get(0).getMemberId(); MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol); - BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(selectById.getAmount()); - BigDecimal addAvailable = aimWalletCoin.getAvailableBalance().add(selectById.getAmount()); + BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(amount); + BigDecimal addAvailable = aimWalletCoin.getAvailableBalance().add(amount); aimWalletCoin.setTotalBalance(addTotal); aimWalletCoin.setAvailableBalance(addAvailable); @@ -498,7 +486,7 @@ MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity(); memberAccountMoneyChangeEntity.setContent("收款"); memberAccountMoneyChangeEntity.setMemberId(aimMemberId); - memberAccountMoneyChangeEntity.setAmount(selectById.getAmount()); + memberAccountMoneyChangeEntity.setAmount(amount); memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER); memberAccountMoneyChangeEntity.setSymbol(selectById.getSymbol()); memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN); @@ -530,26 +518,21 @@ if(StrUtil.isNotBlank(phone)) { Sms106Send.sendWithdrawalCoinMsg(phone, time); } - // 转币 需要扣除手续费 - amount = amount.subtract(selectById.getFeeAmount()); - if("ROC".equals(symbol)){ - // 如果是ROC 则自动转 - String transfer = RocService.transfer(amount, address, "ROC"); - }else if("USDT".equals(symbol) && !"Y".equals(selectById.getIsInside())){ - EthService ethService = new EthService(); - // 查询余额是否足够 - BigDecimal bigDecimal = ethService.tokenGetBalance(EthService.TOTAL_ADDRESS); - if(bigDecimal==null ||bigDecimal.compareTo(amount)<0 ){ - FebsResponse fail = new FebsResponse().fail(); - fail.message("总钱包余额不足"); - return fail; - } - amount = amount.multiply(new BigDecimal("1000000")); - String usdtStr = amount.toPlainString(); - if (usdtStr.contains(".")) { - usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf(".")); - } - String s = ethService.tokenSend(address, usdtStr, null); + if("USDT".equals(symbol) && !"Y".equals(selectById.getIsInside())){ +// EthService ethService = new EthService(); +// // 查询余额是否足够 +// BigDecimal bigDecimal = ethService.tokenGetBalance(EthService.TOTAL_ADDRESS); +// if(bigDecimal==null ||bigDecimal.compareTo(amount)<0 ){ +// FebsResponse fail = new FebsResponse().fail(); +// fail.message("总钱包余额不足"); +// return fail; +// } +// amount = amount.multiply(new BigDecimal("1000000")); +// String usdtStr = amount.toPlainString(); +// if (usdtStr.contains(".")) { +// usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf(".")); +// } +// String s = ethService.tokenSend(address, usdtStr, null); } /** @@ -732,21 +715,24 @@ Long memberId = memberEntity.getId(); String walletCode = "USDT"; BigDecimal amountUsdt = memberEntity.getCoinNumber(); - + if(amountUsdt.compareTo(BigDecimal.ZERO) <= 0){ + return new FebsResponse().fail().message("金额需要大于0"); + } + MemberEntity selectById = this.baseMapper.selectById(memberId); if(ObjectUtils.isEmpty(selectById)) { - return new FebsResponse().message("用户已不存在"); + return new FebsResponse().fail().message("用户已不存在"); } //获取币币钱包 MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId,walletCode); BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance(); BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance(); - + memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amountUsdt)); memberWalletCoinEntity.setTotalBalance(totalBalance.add(amountUsdt)); // 更新 memberWalletCoinMapper.updateById(memberWalletCoinEntity); - + //添加币币资金划转历史记录 MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity(); memberAccountMoneyChangeEntity.setContent("充值"); @@ -759,18 +745,8 @@ memberAccountMoneyChangeEntity.setCreateTime(new Date()); memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy()); memberAccountMoneyChangeEntity.setUpdateTime(new Date()); - + memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity); - /** - * todo - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - String chargeTime = format.format(memberQuickBuySaleEntity.getChargeTime()); // 将当前时间袼式化为指定的格式 - String usdt = memberQuickBuySaleEntity.getAmountUsdt()+"USDT"; - //发送短信提醒 - String smsContent = "【Excoin】尊敬的用户您好!您于"+chargeTime+"充值"+usdt+"已成功到账,请您及时查收!订单号为:"+memberChargeUsdt.getOrderCode()+"。"; - SmsUtils.hxSmsSend(member.getPhone(), smsContent); - - */ return new FebsResponse().success(); } @@ -782,47 +758,51 @@ MemberInfoDetailVo memberInfoDetailVo = new MemberInfoDetailVo(); //USDT充币总额+USDT提币总额 - String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId); + String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT"); + String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC"); memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); + memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc)); String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId); memberInfoDetailVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); //USDT充值总额+USDT提现总额 - String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); - String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); +// String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); +// String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); //总剩余 - double platformProfitAndLoss = 0 ; - platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); - platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); - platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); - platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); - memberInfoDetailVo.setTotalCoin(platformProfitAndLoss); +// double platformProfitAndLoss = 0 ; +// platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); +// platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); +// platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); +// platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); +// memberInfoDetailVo.setTotalCoin(platformProfitAndLoss); //佣金 - String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setFee(returnMoneyByMid == null ? 0 : Double.parseDouble(returnMoneyByMid)); +// String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setFee(returnMoneyByMid == null ? 0 : Double.parseDouble(returnMoneyByMid)); //开仓手续费总额 - String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setClosingPrice(closingpriceByMid == null ? 0 : Double.parseDouble(closingpriceByMid)); +// String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setClosingPrice(closingpriceByMid == null ? 0 : Double.parseDouble(closingpriceByMid)); //平仓总手续费 - String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setSellClosingPrice(sellClosingpriceByMid == null ? 0 : Double.parseDouble(sellClosingpriceByMid)); +// String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setSellClosingPrice(sellClosingpriceByMid == null ? 0 : Double.parseDouble(sellClosingpriceByMid)); - //总盈亏 - String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setPlatformProfitAndLoss(rewardratioByMid == null ? 0 : Double.parseDouble(rewardratioByMid)); +// //总盈亏 +// String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setPlatformProfitAndLoss(rewardratioByMid == null ? 0 : Double.parseDouble(rewardratioByMid)); //持仓手续费 - String doingPrice = memberMapper.selectprepriceForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice)); +// String doingPrice = memberMapper.selectprepriceForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice)); //账户金额 - String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId); + String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT"); + String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC"); memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum)); - String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum)); - String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setAgentNum(agentNum == null ? 0 : Double.parseDouble(agentNum)); + memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc)); + //String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId); + //memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum)); + //String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId); + //memberInfoDetailVo.setAgentNum(agentNum == null ? 0 : Double.parseDouble(agentNum)); return memberInfoDetailVo; } @@ -1337,54 +1317,60 @@ @Override - public MemberInfoDetailVo selectMemberInfoDetailByInviteId(String inviteId) { + public MemberInfoDetailVo selectMemberInfoDetailByInviteId(String inviteId) { String id = memberMapper.selectMemberInfoDetailByInviteId(inviteId); Long memberId = Long.parseLong(id); MemberInfoDetailVo memberInfoDetailVo = new MemberInfoDetailVo(); - + //USDT充币总额+USDT提币总额 - String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); - String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); - //USDT充值总额+USDT提现总额 - String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); - String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); - //总剩余 - double platformProfitAndLoss = 0 ; - platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); - platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); - platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); - platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); - memberInfoDetailVo.setTotalCoin(platformProfitAndLoss); + String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT"); + String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC"); + memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); + memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc)); + String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId); + memberInfoDetailVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); + //USDT充值总额+USDT提现总额 +// String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); +// String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); + //总剩余 +// double platformProfitAndLoss = 0 ; +// platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB)); +// platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ)); +// platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS)); +// platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX)); +// memberInfoDetailVo.setTotalCoin(platformProfitAndLoss); //佣金 - String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setFee(returnMoneyByMid == null ? 0 : Double.parseDouble(returnMoneyByMid)); +// String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setFee(returnMoneyByMid == null ? 0 : Double.parseDouble(returnMoneyByMid)); //开仓手续费总额 - String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setClosingPrice(closingpriceByMid == null ? 0 : Double.parseDouble(closingpriceByMid)); +// String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setClosingPrice(closingpriceByMid == null ? 0 : Double.parseDouble(closingpriceByMid)); //平仓总手续费 - String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setSellClosingPrice(sellClosingpriceByMid == null ? 0 : Double.parseDouble(sellClosingpriceByMid)); - - //总盈亏 - String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setPlatformProfitAndLoss(rewardratioByMid == null ? 0 : Double.parseDouble(rewardratioByMid)); - +// String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setSellClosingPrice(sellClosingpriceByMid == null ? 0 : Double.parseDouble(sellClosingpriceByMid)); + +// //总盈亏 +// String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setPlatformProfitAndLoss(rewardratioByMid == null ? 0 : Double.parseDouble(rewardratioByMid)); + //持仓手续费 - String doingPrice = memberMapper.selectprepriceForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice)); - +// String doingPrice = memberMapper.selectprepriceForBasicRealDataBymemberId(memberId); +// memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice)); + //账户金额 - String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId); + String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT"); + String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC"); + String bzzNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"BZZ"); memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum)); - String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum)); - String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId); - memberInfoDetailVo.setAgentNum(agentNum == null ? 0 : Double.parseDouble(agentNum)); - + memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc)); + memberInfoDetailVo.setBzzNum(bzzNum == null ? 0 : Double.parseDouble(bzzNum)); + //String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId); + //memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum)); + //String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId); + //memberInfoDetailVo.setAgentNum(agentNum == null ? 0 : Double.parseDouble(agentNum)); + return memberInfoDetailVo; } @@ -1427,4 +1413,30 @@ return selectMemberListInPage; } + @Override + public MemberLimitDto memberLimit() { + Map<String,String> map = new HashMap<>(); + // 算力系统提币限制 + String roc_limit_transfer = redisUtils.getString("ROC_LIMIT_TRANSFER"); + // 交易所交易限制 + String sell_limit_key_phone = redisUtils.getString("SELL_LIMIT_KEY_PHONE"); + String golden_limit_transfer = redisUtils.getString("GOLDEN_LIMIT_TRANSFER"); + String buy_limit_key_phone = redisUtils.getString("BUY_LIMIT_KEY_PHONE"); + MemberLimitDto limitDto = new MemberLimitDto(); + limitDto.setJysmcxz(sell_limit_key_phone); + limitDto.setJystbxz(golden_limit_transfer); + limitDto.setSlxttbxz(roc_limit_transfer); + limitDto.setJysmrxz(buy_limit_key_phone); + return limitDto; + } + + @Override + public void setLimit(MemberLimitDto memberLimitDto) { + redisUtils.set("ROC_LIMIT_TRANSFER",memberLimitDto.getSlxttbxz()); + // 交易所交易限制 + redisUtils.set("SELL_LIMIT_KEY_PHONE",memberLimitDto.getJysmcxz()); + redisUtils.set("GOLDEN_LIMIT_TRANSFER",memberLimitDto.getJystbxz()); + redisUtils.set("BUY_LIMIT_KEY_PHONE",memberLimitDto.getJysmrxz()); + } + } -- Gitblit v1.9.1