From 7d54ba5e3e7545f2530c822f6ae69e7f9bec1209 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 08 Oct 2020 14:03:26 +0800
Subject: [PATCH] ROC提币

---
 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html          |    4 
 src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java      |    1 
 src/main/resources/templates/febs/views/modules/member/member.html                |    2 
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |    7 ++
 src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html      |  126 +++++++++++++++++++++---------------------
 5 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index b75878d..42e3164 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -171,7 +171,6 @@
      * 提币审核管理---个人详情
      */
     @GetMapping("memberInfoDetail/{id}")
-    @RequiresPermissions("memberInfoDetail:update")
     public String memberInfoDetail(@PathVariable long id, Model model) {
     	MemberInfoDetailVo data = memberService.selectMemberInfoDetailById(id);
     	model.addAttribute("member", data);
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 97b5e76..940b8ca 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
@@ -30,6 +30,7 @@
 import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
 import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
 import com.xcong.excoin.modules.member.service.IMemberService;
+import com.xcong.excoin.modules.member.service.RocService;
 import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
 import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
 import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
@@ -458,6 +459,7 @@
 		String symbol = selectById.getSymbol();
 		String address = selectById.getAddress();
 		int status = selectById.getStatus();
+		BigDecimal amount = selectById.getAmount();
 		if(status != 1) {
 			return new FebsResponse().fail().message("只有等待审核的状态才能确认!");
 		}
@@ -526,6 +528,11 @@
 		if(StrUtil.isNotBlank(phone)) {
 			Sms106Send.sendWithdrawalCoinMsg(phone, time);
 		}
+		if("ROC".equals(symbol)){
+			// 如果是ROC  则自动转
+			String transfer = RocService.transfer(amount, address, "ROC");
+		}
+
 		/**
 		//短信提醒
 		 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index 91930a0..705d83c 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -176,7 +176,7 @@
                             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 if(d.certifyStatus === 2){
+                            }else {
                             	return '<a lay-event="see" shiro:hasPermission="user:update">'
                             	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'
                             }
diff --git a/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html b/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html
index f4bd0c5..3449c3a 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html
@@ -26,41 +26,41 @@
                        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>
-            <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>
-            </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>-->
+            <!--<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>-->
+            <!--</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>
             <div class="layui-input-block">
@@ -75,34 +75,34 @@
                        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>
+        <!--<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>
 
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index 1f5adcf..795fd2f 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -188,9 +188,9 @@
                             	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" shiro:hasPermission="user:delete">查看</a>'
+                            	+'<a lay-event="examine" >查看</a>'
                             }else {
-                                return '<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'
+                                return '<a lay-event="examine" >查看</a>'
                             }
                         },minWidth: 200,align:'center'}
                 ]]

--
Gitblit v1.9.1