配置修改

zainali5120

2020-11-12 6d75be72309a21e7da398f885401fd032419f249

配置修改

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -88,7 +88,7 @@
        Integer accountType = memberEntity.getAccountType();

        followTraderInfoEntity.setAccountType(accountType);

        //币币账户

        String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId);

        String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");

        followTraderInfoEntity.setWalletNum(walletNum == null ? 0 : Double.parseDouble(walletNum));

        //合约账户

        String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);


 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -5,6 +5,7 @@
import com.xcong.excoin.common.entity.FebsResponse;

import com.xcong.excoin.common.entity.QueryRequest;

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.MemberCoinChargeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;

@@ -49,7 +50,18 @@
    public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {

        return memberService.addCoinConfirm(memberEntity);

    }

    


    /**

     * 限制设置

     * @return

     */

    @PostMapping("setLimit")

    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")

    public FebsResponse addCoinConfirm(@Valid MemberLimitDto memberEntity) {

         memberService.setLimit(memberEntity);

         return new FebsResponse().success();

    }



    /**

     * 代理关系---列表

     * @return


 src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java

@@ -3,6 +3,7 @@
import com.xcong.excoin.common.controller.BaseController;

import com.xcong.excoin.common.entity.FebsConstant;

import com.xcong.excoin.common.utils.FebsUtil;

import com.xcong.excoin.modules.member.dto.MemberLimitDto;

import com.xcong.excoin.modules.member.entity.MemberEntity;

import com.xcong.excoin.modules.member.service.IMemberService;

import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;

@@ -17,6 +18,8 @@
import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestMapping;



import java.util.Map;



/**

 * @author wzy

 * @date 2020-06-10

@@ -28,13 +31,13 @@
    

    private final IMemberService memberService;

    

    @GetMapping("addCoin/{id}")

    @RequiresPermissions("addCoin:update")

    public String addCoin(@PathVariable long id, Model model) {

        MemberEntity data = memberService.selectMemberByid(id);

        model.addAttribute("member", data);

        return FebsUtil.view("modules/member/addCoin");

    }

//    @GetMapping("addCoin/{id}")

//    @RequiresPermissions("addCoin:update")

//    public String addCoin(@PathVariable long id, Model model) {

//        MemberEntity data = memberService.selectMemberByid(id);

//        model.addAttribute("member", data);

//        return FebsUtil.view("modules/member/addCoin");

//    }

    

    /**

     * 代理关系

@@ -261,6 +264,14 @@
    public String memberTest() {

        return FebsUtil.view("modules/member/memberTest");

    }

    


    @GetMapping("memberLimit")

    @RequiresPermissions("member:update")

    public String memberLimit(Model model) {

        MemberLimitDto stringStringMap = memberService.memberLimit();

        model.addAttribute("member",stringStringMap);

        return FebsUtil.view("modules/member/limit");

    }



    

}


 src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinWithdrawEntity.java

@@ -63,6 +63,12 @@
     */

    @TableField(exist = false)

    private String account;



    /**

     * 查询条件：第一查询条件

     */

    @TableField(exist = false)

    private String insidePhone;

    /**

     * 查询条件：是否为测试账号

     */


 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java

@@ -179,4 +179,8 @@
     */

    @TableField(exist = false)

    private String isTest;

    @TableField(exist = false)

    private String usdtBalance;

    @TableField(exist = false)

    private String rocBalance;

}


 src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java

@@ -65,7 +65,7 @@
    

    String selectRewardratioForBasicRealDataBymid(Long memberId);



    String selectTotalAmountUsdtBForBasicRealDataBymemberId(Long memberId);

    String selectTotalAmountUsdtBForBasicRealDataBymemberId(@Param("memberId")Long memberId,@Param("symbol")String symbol);



    String selectTotalAmountUsdtSForBasicRealDataBymemberId(Long memberId);



@@ -83,7 +83,7 @@


    String selectprepriceForBasicRealDataBymemberId(Long memberId);



    String selectBBZCForBasicRealDataBymemberId(Long memberId);

    String selectBBZCForBasicRealDataBymemberId(@Param("memberId")Long memberId,@Param("symbol") String symbol);



    String selectHYZCForBasicRealDataBymemberId(Long memberId);




 src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java

@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.member.service;



import java.util.List;

import java.util.Map;

import java.util.concurrent.ExecutionException;



import javax.validation.Valid;

@@ -11,6 +12,7 @@
import com.xcong.excoin.common.entity.FebsResponse;

import com.xcong.excoin.common.entity.QueryRequest;

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.MemberCoinChargeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;

@@ -98,4 +100,8 @@


    IPage<MemberEntity> memberDataInfoListSearchs(MemberEntity member, QueryRequest request);



    MemberLimitDto memberLimit();



    void setLimit(MemberLimitDto memberLimitDto);



}


 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;
@@ -85,7 +87,9 @@
    private final MemberAuthenticationMapper memberAuthenticationMapper;
    
    private final AgentFriendRelationMapper agentFriendRelationMapper;
	

    private final RedisUtils redisUtils;

    @Override
    public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity,
            QueryRequest request) {
@@ -401,23 +405,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 +419,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;
@@ -733,38 +713,38 @@
    @Override
    public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
        
        Long memberId = memberEntity.getId();
        String walletCode = "USDT";
        BigDecimal amountUsdt = memberEntity.getCoinNumber();
		
        MemberEntity selectById = this.baseMapper.selectById(memberId);
        if(ObjectUtils.isEmpty(selectById)) {
            return new FebsResponse().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("充值");
        memberAccountMoneyChangeEntity.setMemberId(memberId);
        memberAccountMoneyChangeEntity.setAmount(amountUsdt);
        memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
        memberAccountMoneyChangeEntity.setSymbol("USDT");
        memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
        memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
        memberAccountMoneyChangeEntity.setCreateTime(new Date());
        memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
        memberAccountMoneyChangeEntity.setUpdateTime(new Date());
        
        memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
//        Long memberId = memberEntity.getId();
//        String walletCode = "USDT";
//        BigDecimal amountUsdt = memberEntity.getCoinNumber();
//
//        MemberEntity selectById = this.baseMapper.selectById(memberId);
//        if(ObjectUtils.isEmpty(selectById)) {
//            return new FebsResponse().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("充值");
//        memberAccountMoneyChangeEntity.setMemberId(memberId);
//        memberAccountMoneyChangeEntity.setAmount(amountUsdt);
//        memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
//        memberAccountMoneyChangeEntity.setSymbol("USDT");
//        memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
//        memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
//        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");
@@ -786,47 +766,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;
    }
@@ -1341,54 +1325,58 @@


    @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");
        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;
    }

@@ -1431,4 +1419,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());
    }

}

 src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java

@@ -67,5 +67,6 @@
    private String inviteId;



    private int accountType;

	
    private String insidePhone;



}


 src/main/java/com/xcong/excoin/modules/member/vo/MemberInfoDetailVo.java

@@ -6,7 +6,8 @@
public class MemberInfoDetailVo {

    

    private double walletCoinNum;//币币余额

	
    private double walletCoinNumRoc;//币币余额ROC



    private double agentNum;//代理账户余额

    

    private double fee;//佣金

@@ -22,7 +23,8 @@
    private double appealUsdt;//提现USDT

    

    private double chargeCoin;//充币

	
    private double chargeCoinRoc;//充币



    private double appealCoin;//提币

    

    private double platformProfitAndLoss;//总盈亏


 src/main/java/com/xcong/excoin/modules/systemSetting/controller/SystemSettingController.java

@@ -36,40 +36,40 @@
    /**

     * 交易设置---列表

     */

    @GetMapping("platformTradeSetting")

    public FebsResponse platformTradeSetting(PlatformTradeSettingEntity platformTradeSettingEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(systemSettingService.findPlatformTradeSettingInPage(platformTradeSettingEntity, request));

        return new FebsResponse().success().data(data);

    }

//    @GetMapping("platformTradeSetting")

//    public FebsResponse platformTradeSetting(PlatformTradeSettingEntity platformTradeSettingEntity, QueryRequest request) {

//        Map<String, Object> data = getDataTable(systemSettingService.findPlatformTradeSettingInPage(platformTradeSettingEntity, request));

//        return new FebsResponse().success().data(data);

//    }

    

    /**

     *交易设置---确认

     * @return

     */

    @PostMapping("platformTradeSettingConfirm")

    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")

    public FebsResponse platformTradeSettingConfirm(@Valid PlatformTradeSettingEntity platformTradeSettingEntity) {

        return systemSettingService.platformTradeSettingConfirm(platformTradeSettingEntity);

    }

//    @PostMapping("platformTradeSettingConfirm")

//    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")

//    public FebsResponse platformTradeSettingConfirm(@Valid PlatformTradeSettingEntity platformTradeSettingEntity) {

//        return systemSettingService.platformTradeSettingConfirm(platformTradeSettingEntity);

//    }

    

    /**

     * 币种规格---列表

     */

    @GetMapping("platformSymbolsSku")

    public FebsResponse platformSymbolsSku(PlatformSymbolsSkuEntity platformSymbolsSkuEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(systemSettingService.findPlatformSymbolsSkuInPage(platformSymbolsSkuEntity, request));

        return new FebsResponse().success().data(data);

    }

//    @GetMapping("platformSymbolsSku")

//    public FebsResponse platformSymbolsSku(PlatformSymbolsSkuEntity platformSymbolsSkuEntity, QueryRequest request) {

//        Map<String, Object> data = getDataTable(systemSettingService.findPlatformSymbolsSkuInPage(platformSymbolsSkuEntity, request));

//        return new FebsResponse().success().data(data);

//    }

    

    /**

     * 币种规格---确认

     * @return

     */

    @PostMapping("platformSymbolsSkuConfirm")

    @ControllerEndpoint(operation = "币种规格---确认", exceptionMessage = "设置失败")

    public FebsResponse platformSymbolsSkuConfirm(@Valid PlatformSymbolsSkuEntity platformSymbolsSkuEntity) {

        return systemSettingService.platformSymbolsSkuConfirm(platformSymbolsSkuEntity);

    }

//    @PostMapping("platformSymbolsSkuConfirm")

//    @ControllerEndpoint(operation = "币种规格---确认", exceptionMessage = "设置失败")

//    public FebsResponse platformSymbolsSkuConfirm(@Valid PlatformSymbolsSkuEntity platformSymbolsSkuEntity) {

//        return systemSettingService.platformSymbolsSkuConfirm(platformSymbolsSkuEntity);

//    }

    

    /**

     * 轮播图---列表


 src/main/java/com/xcong/excoin/monitor/controller/LogController.java

@@ -39,20 +39,20 @@
        return new FebsResponse().success().data(dataTable);
    }

    @GetMapping("delete/{ids}")
    @RequiresPermissions("log:delete")
    @ControllerEndpoint(exceptionMessage = "删除日志失败")
    public FebsResponse deleteLogs(@NotBlank(message = "{required}") @PathVariable String ids) {
        String[] logIds = ids.split(StringPool.COMMA);
        this.logService.deleteLogs(logIds);
        return new FebsResponse().success();
    }
//    @GetMapping("delete/{ids}")
//    @RequiresPermissions("log:delete")
//    @ControllerEndpoint(exceptionMessage = "删除日志失败")
//    public FebsResponse deleteLogs(@NotBlank(message = "{required}") @PathVariable String ids) {
//        String[] logIds = ids.split(StringPool.COMMA);
//        this.logService.deleteLogs(logIds);
//        return new FebsResponse().success();
//    }

    @GetMapping("excel")
    @RequiresPermissions("log:export")
    @ControllerEndpoint(exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, SystemLog lg, HttpServletResponse response) {
        List<SystemLog> logs = this.logService.findLogs(lg, request).getRecords();
        ExcelKit.$Export(SystemLog.class, response).downXlsx(logs, false);
    }
//    @GetMapping("excel")
//    @RequiresPermissions("log:export")
//    @ControllerEndpoint(exceptionMessage = "导出Excel失败")
//    public void export(QueryRequest request, SystemLog lg, HttpServletResponse response) {
//        List<SystemLog> logs = this.logService.findLogs(lg, request).getRecords();
//        ExcelKit.$Export(SystemLog.class, response).downXlsx(logs, false);
//    }
}

 src/main/java/com/xcong/excoin/monitor/controller/LoginLogController.java

@@ -39,20 +39,20 @@
        return new FebsResponse().success().data(dataTable);
    }

    @GetMapping("delete/{ids}")
    @RequiresPermissions("loginlog:delete")
    @ControllerEndpoint(exceptionMessage = "删除日志失败")
    public FebsResponse deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
        String[] loginLogIds = ids.split(StringPool.COMMA);
        this.loginLogService.deleteLoginLogs(loginLogIds);
        return new FebsResponse().success();
    }
//    @GetMapping("delete/{ids}")
//    @RequiresPermissions("loginlog:delete")
//    @ControllerEndpoint(exceptionMessage = "删除日志失败")
//    public FebsResponse deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
//        String[] loginLogIds = ids.split(StringPool.COMMA);
//        this.loginLogService.deleteLoginLogs(loginLogIds);
//        return new FebsResponse().success();
//    }

    @GetMapping("excel")
    @RequiresPermissions("loginlog:export")
    @ControllerEndpoint(exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, LoginLog loginLog, HttpServletResponse response) {
        List<LoginLog> loginLogs = this.loginLogService.findLoginLogs(loginLog, request).getRecords();
        ExcelKit.$Export(LoginLog.class, response).downXlsx(loginLogs, false);
    }
//    @GetMapping("excel")
//    @RequiresPermissions("loginlog:export")
//    @ControllerEndpoint(exceptionMessage = "导出Excel失败")
//    public void export(QueryRequest request, LoginLog loginLog, HttpServletResponse response) {
//        List<LoginLog> loginLogs = this.loginLogService.findLoginLogs(loginLog, request).getRecords();
//        ExcelKit.$Export(LoginLog.class, response).downXlsx(loginLogs, false);
//    }
}

 src/main/java/com/xcong/excoin/monitor/controller/ViewController.java

@@ -51,38 +51,38 @@
        return FebsUtil.view("monitor/httpTrace");
    }

    @GetMapping("jvm")
    @RequiresPermissions("jvm:view")
    public String jvmInfo(Model model) {
        List<FebsMetricResponse> jvm = actuatorHelper.getMetricResponseByType("jvm");
        JvmInfo jvmInfo = actuatorHelper.getJvmInfoFromMetricData(jvm);
        model.addAttribute("jvm", jvmInfo);
        return FebsUtil.view("monitor/jvmInfo");
    }

    @GetMapping("tomcat")
    @RequiresPermissions("tomcat:view")
    public String tomcatInfo(Model model) {
        List<FebsMetricResponse> tomcat = actuatorHelper.getMetricResponseByType("tomcat");
        TomcatInfo tomcatInfo = actuatorHelper.getTomcatInfoFromMetricData(tomcat);
        model.addAttribute("tomcat", tomcatInfo);
        return FebsUtil.view("monitor/tomcatInfo");
    }

    @GetMapping("server")
    @RequiresPermissions("server:view")
    public String serverInfo(Model model) {
        List<FebsMetricResponse> jdbcInfo = actuatorHelper.getMetricResponseByType("jdbc");
        List<FebsMetricResponse> systemInfo = actuatorHelper.getMetricResponseByType("system");
        List<FebsMetricResponse> processInfo = actuatorHelper.getMetricResponseByType("process");

        ServerInfo serverInfo = actuatorHelper.getServerInfoFromMetricData(jdbcInfo, systemInfo, processInfo);
        model.addAttribute("server", serverInfo);
        return FebsUtil.view("monitor/serverInfo");
    }

    @GetMapping("swagger")
    public String swagger() {
        return FebsUtil.view("monitor/swagger");
    }
//    @GetMapping("jvm")
//    @RequiresPermissions("jvm:view")
//    public String jvmInfo(Model model) {
//        List<FebsMetricResponse> jvm = actuatorHelper.getMetricResponseByType("jvm");
//        JvmInfo jvmInfo = actuatorHelper.getJvmInfoFromMetricData(jvm);
//        model.addAttribute("jvm", jvmInfo);
//        return FebsUtil.view("monitor/jvmInfo");
//    }
//
//    @GetMapping("tomcat")
//    @RequiresPermissions("tomcat:view")
//    public String tomcatInfo(Model model) {
//        List<FebsMetricResponse> tomcat = actuatorHelper.getMetricResponseByType("tomcat");
//        TomcatInfo tomcatInfo = actuatorHelper.getTomcatInfoFromMetricData(tomcat);
//        model.addAttribute("tomcat", tomcatInfo);
//        return FebsUtil.view("monitor/tomcatInfo");
//    }
//
//    @GetMapping("server")
//    @RequiresPermissions("server:view")
//    public String serverInfo(Model model) {
//        List<FebsMetricResponse> jdbcInfo = actuatorHelper.getMetricResponseByType("jdbc");
//        List<FebsMetricResponse> systemInfo = actuatorHelper.getMetricResponseByType("system");
//        List<FebsMetricResponse> processInfo = actuatorHelper.getMetricResponseByType("process");
//
//        ServerInfo serverInfo = actuatorHelper.getServerInfoFromMetricData(jdbcInfo, systemInfo, processInfo);
//        model.addAttribute("server", serverInfo);
//        return FebsUtil.view("monitor/serverInfo");
//    }
//
//    @GetMapping("swagger")
//    public String swagger() {
//        return FebsUtil.view("monitor/swagger");
//    }
}

 src/main/java/com/xcong/excoin/system/controller/LoginController.java

@@ -60,17 +60,17 @@
        return new FebsResponse().success();
    }

    @PostMapping("regist")
    public FebsResponse regist(
            @NotBlank(message = "{required}") String username,
            @NotBlank(message = "{required}") String password) throws FebsException {
        User user = userService.findByName(username);
        if (user != null) {
            throw new FebsException("该用户名已存在");
        }
        this.userService.regist(username, password);
        return new FebsResponse().success();
    }
//    @PostMapping("regist")
//    public FebsResponse regist(
//            @NotBlank(message = "{required}") String username,
//            @NotBlank(message = "{required}") String password) throws FebsException {
//        User user = userService.findByName(username);
//        if (user != null) {
//            throw new FebsException("该用户名已存在");
//        }
//        this.userService.regist(username, password);
//        return new FebsResponse().success();
//    }

    @GetMapping("index/{username}")
    public FebsResponse index(@NotBlank(message = "{required}") @PathVariable String username) {

 src/main/resources/mapper/modules/MemberCoinChargeMapper.xml

@@ -3,7 +3,24 @@
<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberCoinChargeMapper">



    <select id="findMemberApplyCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo">

        select * from member_coin_charge s left join member m on m.id = s.member_id

        SELECT

        s.address,

        s.amount,

        s.create_time,

        s.id,

        s.order_code,

        s.`status`,

        s.member_id,

        s.symbol,

        s.tag,

        m.phone,

        m.email,

        m.invite_id,

        concat(auth.first_name,auth.second_name) as realName

        FROM

        member_coin_charge s

        LEFT JOIN member m ON m.id = s.member_id

        left join member_authentication auth on auth.member_id = s.member_id

        <where>

            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">

@@ -15,6 +32,9 @@
                <if test="record.isTest!=null and record.isTest!=''">

                    and m.account_type= #{record.isTest}

                </if>

                <if test="record.symbol != null and record.symbol!=''">

                    and s.symbol = #{record.symbol}

                </if>

            </if>

        </where>

        order by s.create_time desc


 src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml

@@ -2,13 +2,27 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberCoinWithdrawMapper">



    <select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo">

        SELECT

            *

        FROM

            member_coin_withdraw s left join member m on m.id = s.member_id

    <select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo"> SELECT

        s.id,

        s.create_time,

        m.email,

        m.phone,

        s.member_id,

        m.invite_id,

        s.address,

        s.amount,

        s.fee_amount,

        s.symbol,

        s.status,

        s.is_inside,

        concat(auth.first_name,auth.second_name) as realName,

        (select phone from member where id = (select member_id from member_coin_address where address =s.address  and symbol =s.symbol and is_biyict=1)) insidePhone

        FROM

        member_coin_withdraw s

        left join member m on m.id = s.member_id

        left join member_authentication auth on auth.member_id = s.member_id

         <where>

             s.member_id not in (26,187,454)



            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">

                     and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})

@@ -22,6 +36,9 @@
                <if test="record.status!=null and record.status!=''">

                    and s.status= #{record.status}

                </if>

                <if test="record.insidePhone!=null and record.insidePhone!=''">

                    and #{record.insidePhone} in (select phone from member where id = (select member_id from member_coin_address where address =s.address  and symbol =s.symbol and is_biyict=1))

                </if>

            </if>

        </where>

        order by s.create_time desc    


 src/main/resources/mapper/modules/MemberMapper.xml

@@ -4,7 +4,9 @@


    <select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">

        SELECT

            *

            *,

        (select available_balance+frozen_balance from member_wallet_coin where wallet_code='USDT' and member_id = m.id) usdtBalance,

        (select available_balance+frozen_balance from member_wallet_coin where wallet_code='ROC' and member_id = m.id) rocBalance

        FROM

            member m

        LEFT JOIN member_authentication a ON m.id = a.member_id

@@ -229,7 +231,7 @@
        FROM

            member_coin_charge a

        WHERE

            a.symbol = 'USDT'

            a.symbol = #{symbol}

        AND a.member_id = #{memberId}

    </select>

    <select id="selectTotalAmountUsdtBForBasicRealData" resultType="java.lang.String">

@@ -308,6 +310,7 @@
        WHERE

            a. STATUS = 2

        AND a.member_id = #{memberId}

        and a.symbol='USDT'

    </select>

    <select id="selectTotalAmountUsdtSForBasicRealData" resultType="java.lang.String">

        SELECT

@@ -1253,11 +1256,11 @@
    </select>

    <select id="selectBBZCForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(available_balance),'0')

            IFNULL(SUM(available_balance+frozen_balance),'0')

        FROM

            member_wallet_coin

        WHERE

            wallet_code = 'USDT'

            wallet_code = #{symbol}

        AND member_id = #{memberId}

    </select>

    <select id="selectBBZCForBasicRealData" resultType="java.lang.String">


 src/main/resources/templates/febs/views/login.html

@@ -62,47 +62,7 @@
                                    </button>
                                </div>
                            </div>
<!--                            <div class="layui-form-item febs-tr">-->
<!--                                <a id="regist-href">注册账号</a>-->
<!--                            </div>-->
                        </div>
                    </div>
                </div>

                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-hide" id="regist-div">
                    <div class="layui-form" lay-filter="regist-form">
                        <div class="layui-anim layui-anim-upbit">
                            <ul class="login-type-tab">
                                <li class="active">账号注册</li>
                            </ul>
                            <div class="normal-login-form">
                                <div class="layui-form-item">
                                    <label class="layui-icon label-icon layui-icon-username"></label>
                                    <input type="text" name="username" minlength="2" maxlength="10" lay-verify="range"
                                           placeholder="用户名" autocomplete="off" class="layui-input">
                                </div>
                                <div class="layui-form-item password-block">
                                    <label class="layui-icon label-icon layui-icon-password"></label>
                                    <input type="password" name="password" minlength="6" lay-verify="range"
                                           placeholder="密码" autocomplete="off" class="layui-input">
                                </div>
                                <div class="layui-form-item password-block">
                                    <label class="layui-icon label-icon layui-icon-password"></label>
                                    <input type="password" name="passwordB" lay-verify="required"
                                           placeholder="密码确认" autocomplete="off" class="layui-input">
                                </div>
                                <div class="layui-form-item">
                                    <button class="layui-btn layui-btn-normal layui-btn-fluid" lay-submit
                                            lay-filter="regist-submit" id="regist">
                                        <i style="display: none"
                                           class="layui-icon layui-icon-loading layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
                                        立即注册
                                    </button>
                                </div>
                            </div>
                        </div>
                        <div class="layui-form-item febs-tr">
                            <a id="login-href">已有账号？马上登录</a>
                        </div>
                    </div>
                </div>

 src/main/resources/templates/febs/views/modules/member/applyCoin.html

@@ -18,12 +18,12 @@
                                        </div>

                                    </div>

                                    <div class="layui-inline">

                                        <label class="layui-form-label layui-form-label-sm">账号类型</label>

                                        <label class="layui-form-label layui-form-label-sm">币种</label>

                                        <div class="layui-input-inline">

                                            <select name="isTest">

                                            <select name="symbol">

                                                <option value=""></option>

                                                <option value="1">正常账号</option>

                                                 <option value="2">测试账号</option>

                                                <option value="USDT">USDT</option>

                                                 <option value="ROC">ROC</option>

                                            </select>

                                        </div>

                                    </div>

@@ -98,30 +98,12 @@
                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 60,align:'center'},

                    {field: 'tag', title: 'USDT类型', minWidth: 60,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},

                    {field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'},

                    {field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'},

                    {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},

                    {field: 'accountType', title: '账号类型',

                        templet: function (d) {

                            if (d.accountType === 2) {

                                return '<span style="color:red;">测试账号</span>'

                            } else {

                                return '<span style="color:green;">正常账号</span>'

                            }

                        },minWidth: 100,align:'center'},

                    {field: 'status', title: '状态',

                        templet: function (d) {

                            if (d.status === 1) {

                                return '<span style="color:green;">已到账</span>'

                            } else {

                                return ''

                            }

                        }, minWidth: 200,align:'center'},

                    {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'}

                ]]

            });

        }

@@ -131,7 +113,7 @@
            return {

                account: $searchForm.find('input[name="account"]').val().trim(),

                address: $searchForm.find('input[name="address"]').val().trim(),

                isTest: $searchForm.find("select[name='isTest']").val()

                symbol: $searchForm.find("select[name='symbol']").val()

            };

        }

        


 src/main/resources/templates/febs/views/modules/member/member.html

@@ -32,6 +32,9 @@
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">

                                    <i class="layui-icon">&#xe79b;</i>

                                </div>

                                <div shiro:hasPermission="member:update" class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="limit">

                                    <i class="layui-icon">限制</i>

                                </div>

                            </div>

                        </div>

                    </form>

@@ -43,11 +46,12 @@
</div>

<!-- 表格操作栏 start -->

<script type="text/html" id="user-option">

    <span shiro:lacksPermission="user:view,user:update,user:delete">

        <span class="layui-badge-dot febs-bg-orange"></span> 无权限

    </span>

    <a lay-event="edit" shiro:hasPermission="user:update"><i

            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>

<!--    <span shiro:lacksPermission="user:view,user:update,user:delete">-->

<!--        <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->

<!--    </span>-->

    <a lay-event="edit" shiro:hasPermission="member:update">审核认证</a>

    <a lay-event="see"><i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>

    <a lay-event="examine"><i class="layui-icon febs-edit-area febs-blue">账户详情</i></a>

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

@@ -60,6 +64,7 @@
            $view = $('#febs-user'),

            $query = $view.find('#query'),

            $reset = $view.find('#reset'),

            $limit = $view.find('#limit'),

            $searchForm = $view.find('form'),

            sortObject = {field: 'phone', type: null},

            tableIns;

@@ -90,17 +95,6 @@
                    maxmin: true,

                });

            }

            if (layEvent === 'addCoin') {

                febs.modal.open( '拨币', 'modules/member/addCoin/' + data.id, {

                   btn: ['提交', '取消'],

                   yes: function (index, layero) {

                       $('#user-update').find('#submit').trigger('click');

                   },

                   btn2: function () {

                       layer.closeAll();

                   }

               });

             }

            if (layEvent === 'examine') {

                 febs.modal.open( '个人数据详情', 'modules/member/memberDetailInfo/' + data.inviteId, {

                      maxmin: true,

@@ -121,6 +115,11 @@
            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

        });

        $limit.on('click', function () {

            febs.modal.open( '限制', 'modules/member/memberLimit', {

                maxmin: true

            });

        });



        function initTable() {

            tableIns = febs.table.init({

@@ -128,34 +127,45 @@
                id: 'userTable',

                url: ctx + 'member/getList',

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},

                    {field: 'phone', title: '手机号', minWidth: 120,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 50,align:'left'},

                    {field: 'realName', title: '姓名', minWidth: 50,align:'left'},

                    {field: 'inviteId', title: '邀请码UID',

                        templet: function (d) {

                                return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'

                            }, minWidth: 80,align:'center'},

                    {field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},

                    {field: 'accountType', title: '账号类型',

                        templet: function (d) {

                            if (d.accountType === 2) {

                                return '<span style="color:green;">测试账号</span>'

                            } else if (d.accountType === 1) {

                                return '<span style="color:red;">正常账号</span>'

                    {field: 'usdtBalance', title: 'USDT余额', minWidth: 80,align:'center'},

                    {field: 'rocBalance', title: 'ROC余额', minWidth: 80,align:'center'},

                    // {field: 'accountType', title: '账号类型',

                    //     templet: function (d) {

                    //         if (d.accountType === 2) {

                    //             return '<span style="color:green;">测试账号</span>'

                    //         } else if (d.accountType === 1) {

                    //             return '<span style="color:red;">正常账号</span>'

                    //         }else{

                    //             return ''

                    //         }

                    //     }, minWidth: 80,align:'center'},

                    // {field: 'refererId', title: '账号状态',

                    //         templet: function (d) {

                    //             if (d.accountStatus === 1) {

                    //                 return '<span style="color:green;">正常</span>'

                    //             } else if (d.accountStatus === 0) {

                    //                 return '<span style="color:red;">禁用</span>'

                    //             }else{

                    //                 return ''

                    //             }

                    //         }, minWidth: 80,align:'center'},

                    {field: 'ipo', title: '私募',

                        templet: function (d) {

                            if (d.ipo === 1) {

                                return '<span style="color:red;">是</span>'

                            } else if (d.ipo === 0) {

                                return '<span style="color:gray;">否</span>'

                            }else{

                                return ''

                                return '<span style="color:gray;">否</span>'

                            }

                        }, minWidth: 80,align:'center'},

                    {field: 'refererId', title: '账号状态',

                            templet: function (d) {

                                if (d.accountStatus === 1) {

                                    return '<span style="color:green;">正常</span>'

                                } else if (d.accountStatus === 0) {

                                    return '<span style="color:red;">禁用</span>'

                                }else{

                                    return ''

                                }

                            }, minWidth: 80,align:'center'},

                    {field: 'refererId', title: '审核状态',

                                templet: function (d) {

                                    if (d.certifyStatus === 0) {

@@ -170,17 +180,18 @@
                                        return ''

                                    }

                                }, minWidth: 80,align:'center'},

                    {field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},

                    {title: '操作', 
                        templet: function (d) {

                            if (d.certifyStatus === 1) {

                                return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'

                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'

                            }else {

                                return '<a lay-event="see" shiro:hasPermission="user:update">'

                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'

                            }

                        },minWidth: 200,align:'center'}

                    {field: 'createTime', title: '注册时间', minWidth: 150,align:'center'},

                    {title: '操作', toolbar: '#user-option'

                        // templet: function (d) {

                        //     if (d.certifyStatus === 1) {

                        //         return ''

                        //         +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'

                        //     }else {

                        //         return '<a lay-event="see" shiro:hasPermission="user:update">'

                        //         +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'

                        //     }

                        // },

                        ,minWidth: 200,align:'center'}

                ]]

            });

        }


 src/main/resources/templates/febs/views/modules/member/memberDetailInfo.html

@@ -20,89 +20,42 @@
<div class="layui-fluid" id="user-update">

    <form class="layui-form" action="" lay-filter="user-update-form">

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">币币余额：</label>

            <label class="layui-form-label febs-form-item-require">USDT余额：</label>

            <div class="layui-input-block">

                <input type="text" name="walletCoinNum" minlength="4" maxlength="10" data-th-id="${member.walletCoinNum}"

                       lay-verify="range|walletCoinNum" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">合约余额：</label>

            <label class="layui-form-label febs-form-item-require">ROC余额：</label>

            <div class="layui-input-block">

                <input type="text" name="totalContract" minlength="4" maxlength="10" data-th-id="${member.totalContract}"

                       lay-verify="range|totalContract" autocomplete="off" class="layui-input" readonly>

                <input type="text" name="walletCoinNumRoc" minlength="4" maxlength="10" data-th-id="${member.walletCoinNumRoc}"

                       lay-verify="range|walletCoinNumRoc" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>



        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">代理余额：</label>

            <div class="layui-input-block">

                <input type="text" name="agentNum" minlength="4" maxlength="10" data-th-id="${member.agentNum}"

                       lay-verify="range|agentNum" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">佣金：</label>

            <div class="layui-input-block">

                <input type="text" name="fee" minlength="4" maxlength="10" data-th-id="${member.fee}"

                       lay-verify="range|fee" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">充值：</label>

            <div class="layui-input-block">

                <input type="text" name="chargeUsdt" minlength="4" maxlength="10" data-th-id="${member.chargeUsdt}"

                       lay-verify="range|chargeUsdt" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">提现：</label>

            <div class="layui-input-block">

                <input type="text" name="appealUsdt" minlength="4" maxlength="10" data-th-id="${member.appealUsdt}"

                       lay-verify="range|appealUsdt" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">充币：</label>

            <label class="layui-form-label febs-form-item-require">充币USDT：</label>

            <div class="layui-input-block">

                <input type="text" name="chargeCoin" minlength="4" maxlength="10" data-th-id="${member.chargeCoin}"

                       lay-verify="range|chargeCoin" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">提币：</label>

            <label class="layui-form-label febs-form-item-require">充币ROC：</label>

            <div class="layui-input-block">

                <input type="text" name="chargeCoinRoc" minlength="4" maxlength="10" data-th-id="${member.chargeCoinRoc}"

                       lay-verify="range|chargeCoinRoc" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">提币USDT：</label>

            <div class="layui-input-block">

                <input type="text" name="appealCoin" minlength="4" maxlength="10" data-th-id="${member.appealCoin}"

                       lay-verify="range|appealCoin" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">总盈亏：</label>

            <div class="layui-input-block">

                <input type="text" name="platformProfitAndLoss" minlength="4" maxlength="10" data-th-id="${member.platformProfitAndLoss}"

                       lay-verify="range|platformProfitAndLoss" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">开仓手续费：</label>

            <div class="layui-input-block">

                <input type="text" name="closingPrice" minlength="4" maxlength="10" data-th-id="${member.closingPrice}"

                       lay-verify="range|closingPrice" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">平仓手续费：</label>

            <div class="layui-input-block">

                <input type="text" name="sellClosingPrice" minlength="4" maxlength="10" data-th-id="${member.sellClosingPrice}"

                       lay-verify="range|sellClosingPrice" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">持仓手续费：</label>

            <div class="layui-input-block">

                <input type="text" name="doingPrice" minlength="4" maxlength="10" data-th-id="${member.doingPrice}"

                       lay-verify="range|doingPrice" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>



    </form>

</div>



@@ -128,12 +81,14 @@
                "platformProfitAndLoss": member.platformProfitAndLoss,

                "appealCoin": member.appealCoin,

                "chargeCoin": member.chargeCoin,

                "chargeCoinRoc": member.chargeCoinRoc,

                "appealUsdt": member.appealUsdt,

                "chargeUsdt": member.chargeUsdt,

                "fee": member.fee,

                "agentNum": member.agentNum,

                "totalContract": member.totalContract,

                "walletCoinNum": member.walletCoinNum,

                "walletCoinNumRoc": member.walletCoinNumRoc,

                "totalCoin": member.totalCoin

            });

        }


 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html

@@ -12,6 +12,12 @@
                                            <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">

                                        </div>

                                    </div>



                                    <div class="layui-inline">

                                        <div class="layui-input-inline">

                                            <input type="text" placeholder="收款手机号" name="insidePhone" autocomplete="off" class="layui-input">

                                        </div>

                                    </div>

                                    <div class="layui-inline">

                                        <label class="layui-form-label layui-form-label-sm">状态</label>

                                        <div class="layui-input-inline">

@@ -20,16 +26,6 @@
                                                 <option value="1">等待审核</option>

                                                 <option value="2">同意</option>

                                                 <option value="3">拒绝</option>

                                            </select>

                                        </div>

                                    </div>

                                    <div class="layui-inline">

                                        <label class="layui-form-label layui-form-label-sm">账号类型</label>

                                        <div class="layui-input-inline">

                                            <select name="isTest">

                                                <option value=""></option>

                                                <option value="1">正常账号</option>

                                                 <option value="2">测试账号</option>

                                            </select>

                                        </div>

                                    </div>

@@ -63,12 +59,16 @@
</div>

<!-- 表格操作栏 start -->

<script type="text/html" id="user-option">

    <span shiro:lacksPermission="user:view,user:update,user:delete">

        <span class="layui-badge-dot febs-bg-orange"></span> 无权限

    </span>

    <a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>

    <i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>

    <a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>

<!--    <span shiro:lacksPermission="coin:check">-->

<!--        <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->

<!--    </span>-->

    {{# if(d.status === 1) { }}

        <a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>

        <a lay-event="cancel" shiro:hasPermission="coin:check">拒绝</a>

        <a lay-event="examine" >查看</a>

    {{# } else { }}

        <a lay-event="examine" >查看</a>

    {{# } }}

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

@@ -147,16 +147,16 @@
                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'accountType', title: '账号类型',

                        templet: function (d) {

                            if (d.accountType === 2) {

                                return '<span style="color:red;">测试账号</span>'

                            } else {

                                return '<span style="color:green;">正常账号</span>'

                            }

                        },minWidth: 100,align:'center'},

                    {field: 'realName', title: '姓名', minWidth: 50,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},

                    // {field: 'accountType', title: '账号类型',

                    //     templet: function (d) {

                    //         if (d.accountType === 2) {

                    //             return '<span style="color:red;">测试账号</span>'

                    //         } else {

                    //             return '<span style="color:green;">正常账号</span>'

                    //         }

                    //     },minWidth: 100,align:'center'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'isInside', title: '内部转账',

@@ -167,6 +167,7 @@
                                return '<span style="color:green;">否</span>'

                            }

                        },minWidth: 100,align:'center'},

                    {field: 'insidePhone', title: '内部账户', minWidth: 120,align:'center' },

                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},

                    {field: 'realAmount', title: '到账金额', minWidth: 120,align:'center' ,totalRow: true},

                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},

@@ -182,17 +183,18 @@
                                return '<span style="color:red;">拒绝</span>'

                            }

                        },minWidth: 100,align:'center'},

                    {title: '操作', 
                        templet: function (d) {

                            if (d.status === 1) {

                                return '<a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>'

                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'

                                +'<a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>'

                                +'<a lay-event="examine" >查看</a>'

                            }else {

                                return '<a lay-event="examine" >查看</a>'

                            }

                        },minWidth: 200,align:'center'}

                    {title: '操作', toolbar: '#user-option'

                        // templet: function (d) {

                        //     if (d.status === 1) {

                        //         return '<a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>'

                        //         +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'

                        //         +'<a lay-event="cancel" shiro:hasPermission="coin:check">拒绝</a>'

                        //         +'<a lay-event="examine" >查看</a>'

                        //     }else {

                        //         return '<a lay-event="examine" >查看</a>'

                        //     }

                        // }

                        ,minWidth: 200,align:'center'}

                ]]

            });

        }

@@ -201,6 +203,7 @@
        function getQueryParams() {

            return {

                account: $searchForm.find('input[name="account"]').val().trim(),

                insidePhone: $searchForm.find('input[name="insidePhone"]').val().trim(),

                status: $searchForm.find("select[name='statusOption']").val(),

                isTest: $searchForm.find("select[name='isTest']").val(),

                isInside: $searchForm.find("select[name='isInsideOption']").val()