From a31721c6deee97f54ecb1dcf6d7324433c1f9dbc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 04 Jun 2021 11:31:07 +0800
Subject: [PATCH] 20210604

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |    4 ++--
 src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html   |   54 +++++++++++++++++++++++++++---------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 8032a52..a64a272 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -2260,7 +2260,7 @@
 		String rewardratioByMid = memberMapper.selectRewardratioForAllDataInfo(memberEntity);
 		
 		//持仓人数
-		String notNullNumber = memberMapper.selectSFCCForAllDataInfo(memberEntity);
+//		String notNullNumber = memberMapper.selectSFCCForAllDataInfo(memberEntity);
 		//币币账户不为空的人数
 		String walletNumber = memberMapper.selectBBZHForAllDataInfo(memberEntity);
 		//合约账户不为空的人数
@@ -2294,7 +2294,7 @@
 			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == "0" ? "0" : df.format(Double.parseDouble(sellClosingpriceByMid)));
 			memberDataInfoVo.setFee(returnMoneyByMid == "0" ? "0" : df.format(Double.parseDouble(returnMoneyByMid)));
 			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : df.format(Double.parseDouble(rewardratioByMid)));
-			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+//			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
 			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
 			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
 			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0.00 ? "0" : df.format(platformProfitAndLoss));
diff --git a/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html b/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html
index 0e346de..ed5c6b9 100644
--- a/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html
@@ -5,33 +5,33 @@
                 <div class="layui-card-body febs-table-full">
                     <form class="layui-form layui-table-form" lay-filter="user-table-form">
                         <div class="layui-row">
-                            <div class="layui-col-md10">
-                                <div class="layui-form-item">
-                                    <div class="layui-inline">
-                                        <div class="layui-input-inline">
-                                            <input type="text" placeholder="手机号/邮箱/邀请码" name="account" 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">
-                                            <select name="isTest">
-                                                <option value=""></option>
-                                                <option value="1">正常账号</option>
-                                                <option value="2">测试账号</option>
-                                            </select>
-                                        </div>
-                                    </div>-->
-                                </div>
-                            </div>
-                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
-                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
-                                    <i class="layui-icon">&#xe848;</i>
-                                </div>
-                                <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>
+<!--                            <div class="layui-col-md10">-->
+<!--                                <div class="layui-form-item">-->
+<!--&lt;!&ndash;                                    <div class="layui-inline">&ndash;&gt;-->
+<!--&lt;!&ndash;                                        <div class="layui-input-inline">&ndash;&gt;-->
+<!--&lt;!&ndash;                                            <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">&ndash;&gt;-->
+<!--&lt;!&ndash;                                        </div>&ndash;&gt;-->
+<!--&lt;!&ndash;                                    </div>&ndash;&gt;-->
+<!--                                    &lt;!&ndash;<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>&ndash;&gt;-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">-->
+<!--                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">-->
+<!--                                    <i class="layui-icon">&#xe848;</i>-->
+<!--                                </div>-->
+<!--                                <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>-->
                         </div>
                     </form>
                     <table lay-filter="allDataInfo" lay-data="{id: 'allDataInfo'}"></table>

--
Gitblit v1.9.1