blame | history | patch | commit | commitdiff | ignore whitespace
zainali5120
2020-11-01 fa290cbb49fc30778af140f133ec9f590573e3fb 
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java


@@ -447,6 +447,10 @@


            BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();


            BigDecimal subtract = amount.subtract(feeAmount);


            memberCoinWithdrawVo.setRealAmount(subtract);


            if("Y".equals(memberCoinWithdrawVo.getIsInside())){


               // 是内部转账 查询对应的地址




            }


         }


      }


        return findmemberQuickBuySaleListInPage;


@@ -733,38 +737,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 +790,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;


   }


@@ -1347,7 +1355,7 @@


      MemberInfoDetailVo memberInfoDetailVo = new MemberInfoDetailVo();


   


      //USDT充币总额+USDT提币总额


       String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId);


       String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");


       memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));


       String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);


       memberInfoDetailVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));


@@ -1382,7 +1390,7 @@


      memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice));


      


      //账户金额


      String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId);


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


      memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));


      String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);


      memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum));