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/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);
@@ -447,6 +447,10 @@ BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount(); BigDecimal subtract = amount.subtract(feeAmount); memberCoinWithdrawVo.setRealAmount(subtract); if("Y".equals(memberCoinWithdrawVo.getIsInside())){ // 是内部转账 查询对应的地址 } } } return findmemberQuickBuySaleListInPage; @@ -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)); 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,6 +6,7 @@ public class MemberInfoDetailVo { private double walletCoinNum;//币币余额 private double walletCoinNumRoc;//币币余额ROC private double agentNum;//代理账户余额 @@ -22,6 +23,7 @@ private double appealUsdt;//提现USDT private double chargeCoin;//充币 private double chargeCoinRoc;//充币 private double appealCoin;//提币
@@ -4,9 +4,11 @@ <select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo"> SELECT * *, (select phone from member where id = (select member_id from member_coin_address where address =s.address and symbol =s.symbol )) insidePhone FROM member_coin_withdraw s left join member m on m.id = s.member_id member_coin_withdraw s left join member m on m.id = s.member_id <where> s.member_id not in (26,187,454) <if test="record != null" > src/main/resources/mapper/modules/MemberMapper.xml
@@ -229,7 +229,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"> @@ -1257,7 +1257,7 @@ 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/modules/member/member.html
@@ -48,6 +48,7 @@ <!-- </span>--> <a lay-event="edit" shiro:hasPermission="member:update">审核认证</a> <a lay-event="see"><i class="layui-icon febs-edit-area febs-blue"></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"> 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
@@ -151,16 +151,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: '内部转账', @@ -171,6 +171,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'},
