20200721 代码提交

xiaoyong931011

2020-07-21 8b6dae9f0dbd93d126b97759b973e3819db74502

20200721  代码提交

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -803,6 +803,18 @@
                BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
                BigDecimal subtract = amount.subtract(feeAmount);
                memberCoinWithdrawVo.setRealAmount(subtract);
				
                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);
                }
            }
        }
        return findmemberQuickBuySaleListInPage;

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

@@ -21,6 +21,10 @@
     */

    private String phone;

    /**

     * 真实姓名

     */

    private String realName;

    /**

     * 邮箱

     */

    private String email;


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

@@ -90,7 +90,7 @@
                cols: [[

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

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

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

                    {field: 'realName', title: '姓名', minWidth: 120,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'},


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

@@ -111,7 +111,7 @@
                cols: [[

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

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

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

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

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

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

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