20200717 代码提交

xiaoyong931011

2020-07-17 f975061b8a70ab47d7fde036dd1e05df69de89fa

20200717 代码提交

 src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java

@@ -6,6 +6,7 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;


import lombok.RequiredArgsConstructor;

@@ -88,6 +89,16 @@
        model.addAttribute("member", data);
        return FebsUtil.view("modules/member/memberDetail");
    }
    /**

     * 提币审核管理---个人详情

     */

    @GetMapping("memberInfoDetail/{id}")

    @RequiresPermissions("memberInfoDetail:update")

    public String memberInfoDetail(@PathVariable long id, Model model) {

        MemberInfoDetailVo data = memberService.selectMemberInfoDetailById(id);

        model.addAttribute("member", data);

        return FebsUtil.view("modules/member/memberInfoDetail");

    }


    /**
     * 会员充值USDT记录

 src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java

@@ -64,5 +64,29 @@
    List<String> selectMemberBylowLevelInviteId(String lowLevelInviteId);

    

    String selectRewardratioForBasicRealDataBymid(Long memberId);



    String selectTotalAmountUsdtBForBasicRealDataBymemberId(Long memberId);



    String selectTotalAmountUsdtSForBasicRealDataBymemberId(Long memberId);



    String selectTotalAmountUsdtCZForBasicRealDataBymemberId(Long memberId);



    String selectTotalAmountUsdtTXForBasicRealDataBymemberId(Long memberId);



    String selectReturnMoneyForBasicRealDataBymemberId(Long memberId);



    String selectClosingpriceForBasicRealDataBymemberId(Long memberId);



    String selectSellClosingpriceForBasicRealDataBymemberId(Long memberId);



    String selectRewardratioForBasicRealDataBymemberId(Long memberId);



    String selectprepriceForBasicRealDataBymemberId(Long memberId);



    String selectBBZCForBasicRealDataBymemberId(Long memberId);



    String selectHYZCForBasicRealDataBymemberId(Long memberId);



    String selectDLZCForBasicRealDataBymemberId(Long memberId);

    

}


 src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java

@@ -19,6 +19,7 @@
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;
import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;

import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;

@@ -65,4 +66,6 @@

    FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity);

    MemberInfoDetailVo selectMemberInfoDetailById(long id);



}

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

@@ -31,6 +31,7 @@
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;
import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;
import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;

@@ -709,4 +710,57 @@
        return new FebsResponse().success();
    }


    @Override
    public MemberInfoDetailVo selectMemberInfoDetailById(long id) {
        MemberCoinWithdrawEntity selectById = memberCoinWithdrawMapper.selectById(id);
        Long memberId = selectById.getMemberId();
        MemberInfoDetailVo memberInfoDetailVo = new MemberInfoDetailVo();
	
        //USDT充币总额+USDT提币总额
        String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId);
        memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
        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));
        //总剩余
        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 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 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 walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId);
        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));
			
        return memberInfoDetailVo;
    }

}

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

New file
@@ -0,0 +1,36 @@
package com.xcong.excoin.modules.member.vo;



import lombok.Data;



@Data

public class MemberInfoDetailVo {

	
    private double walletCoinNum;//币币余额

	
    private double agentNum;//代理账户余额

	
    private double fee;//佣金

	
    private double totalCoin;//总资产剩余

	
    private double avalableContract;//合约可用余额

	
    private double totalContract;//合约总余额

	
    private double chargeUsdt;//充值USDT

	
    private double appealUsdt;//提现USDT

	
    private double chargeCoin;//充币

	
    private double appealCoin;//提币

	
    private double platformProfitAndLoss;//总盈亏

	
    private double closingPrice;//开仓费

	
    private double sellClosingPrice;//平仓费

	
    private double doingPrice;//持仓费

	
}


 src/main/resources/mapper/modules/MemberMapper.xml

@@ -70,6 +70,15 @@
        select COUNT(m.id) as memberCount  from member m

    </select>

    

    <select id="selectTotalAmountUsdtBForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.amount),'0')  as amount

        FROM

            member_coin_charge a

        WHERE

            a.symbol = 'USDT'

        AND a.member_id = #{memberId}

    </select>

    <select id="selectTotalAmountUsdtBForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.amount),'0')  as amount

@@ -86,6 +95,15 @@
                account_type = '2'

            AND account_status = '1'

        )

    </select>

    <select id="selectTotalAmountUsdtSForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.amount),'0') as amount

        FROM

            member_coin_withdraw a

        WHERE

            a. STATUS = 2

        AND a.member_id = #{memberId}

    </select>

    <select id="selectTotalAmountUsdtSForBasicRealData" resultType="java.lang.String">

        SELECT

@@ -106,6 +124,16 @@
        )

    </select>

    

    <select id="selectTotalAmountUsdtCZForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(amount_usdt),'0')

        FROM

            member_quick_buy_sale

        WHERE

            order_type = 'B'

        AND order_status = 3

        AND member_id = #{memberId}

    </select>

    <select id="selectTotalAmountUsdtCZForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(amount_usdt),'0')

@@ -123,6 +151,16 @@
                account_type = '2'

            AND account_status = '1'

        )

    </select>

    <select id="selectTotalAmountUsdtTXForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(amount_usdt),'0')

        FROM

            member_quick_buy_sale

        WHERE

            order_type = 'S'

        AND order_status = 2

        AND member_id = #{memberId}

    </select>

    <select id="selectTotalAmountUsdtTXForBasicRealData" resultType="java.lang.String">

        SELECT

@@ -142,6 +180,17 @@
            AND account_status = '1'

        )

    </select>

    <select id="selectReturnMoneyForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(s.amount), '0')

        FROM

            member_account_money_change s

        WHERE

            s.type = 3

        AND s.content LIKE '%佣金到账%'

        AND s.STATUS = '1'

        AND s.member_id = #{memberId}

    </select>

    <select id="selectReturnMoneyForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(s.amount), '0')

@@ -151,6 +200,16 @@
            s.type = 3

        AND s.content LIKE '%佣金到账%'

        AND s. STATUS = '1'

    </select>

    <select id="selectClosingpriceForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.opening_fee_amount),'0')

        FROM

            contract_order a

        WHERE

        a.closing_type = '0'

        and a.order_status = '1'

        AND a.member_id = #{memberId}

    </select>

    <select id="selectClosingpriceForBasicRealData" resultType="java.lang.String">

        SELECT

@@ -170,6 +229,16 @@
            AND account_status = '1'

        )

    </select>

    <select id="selectSellClosingpriceForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.closing_fee_amount),'0')

        FROM

            contract_order a

        WHERE

            a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)

            and a.order_status = '1'

        AND a.member_id = #{memberId}

    </select>

    <select id="selectSellClosingpriceForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.closing_fee_amount),'0')

@@ -187,6 +256,16 @@
                account_type = '2'

            AND account_status = '1'

        )

    </select>

    <select id="selectRewardratioForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.reward_amount), '0')

        FROM

            contract_order a

        WHERE

            a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)

        AND a.order_status = '1'

        AND a.member_id = #{memberId}

    </select>

    <select id="selectRewardratioForBasicRealData" resultType="java.lang.String">

        SELECT

@@ -274,6 +353,14 @@
            AND account_status = '1'

        )

    </select>

    <select id="selectprepriceForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.hold_amount),'0')

        FROM

            contract_order a

        WHERE

            a.member_id = #{memberId}

    </select>

    <select id="selectprepriceForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(a.hold_amount),'0')

@@ -289,6 +376,15 @@
                    account_type = '2'

                AND account_status = '1'

            )

    </select>

    <select id="selectBBZCForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(available_balance),'0')

        FROM

            member_wallet_coin

        WHERE

            wallet_code = 'USDT'

        AND member_id = #{memberId}

    </select>

    <select id="selectBBZCForBasicRealData" resultType="java.lang.String">

        SELECT

@@ -307,6 +403,14 @@
            AND account_status = '1'

        )

    </select>

    <select id="selectHYZCForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(total_balance),'0')

        FROM

            member_wallet_contract

        WHERE

            member_id = #{memberId}

    </select>

    <select id="selectHYZCForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(total_balance),'0')

@@ -323,6 +427,14 @@
                AND account_status = '1'

            )

    </select>

    <select id="selectDLZCForBasicRealDataBymemberId" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(total_balance),'0')

        FROM

            member_wallet_agent

        WHERE

            member_id = #{memberId}

    </select>

    <select id="selectDLZCForBasicRealData" resultType="java.lang.String">

        SELECT

            IFNULL(SUM(total_balance),'0')


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

New file
@@ -0,0 +1,52 @@
<style>

    #user-update {

        padding: 20px 25px 25px 0;

    }



    #user-update .layui-treeSelect .ztree li a, .ztree li span {

        margin: 0 0 2px 3px !important;

    }

    #user-update #data-permission-tree-block {

        border: 1px solid #eee;

        border-radius: 2px;

        padding: 3px 0;

    }

    #user-add .layui-treeSelect .ztree li span.button.switch {

        top: 1px;

        left: 3px;

    }



</style>

<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>

            <div class="layui-input-block">

                <input type="text" name="totalCoin" minlength="4" maxlength="10" data-th-id="${member.totalCoin}"

                       lay-verify="range|totalCoin" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>

    </form>

</div>



<script data-th-inline="javascript">

    layui.use(['febs', 'form'], function () {

        var $ = layui.$,

            febs = layui.febs,

            layer = layui.layer,

            form = layui.form,

            member = [[${member}]],

            $view = $('#user-update'),

            validate = layui.validate,

            _deptTree;

        
        form.render();

        initUserValue();

        
        function initUserValue() {

            form.val("user-update-form", {

                "totalCoin": member.totalCoin

            });

        }

    });

</script>

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

@@ -96,9 +96,10 @@
                    cancelUsers(data.id);

                });

            }

            if (layEvent === 'see') {

                console.log(obj)

                febs.view.tab.change(ctx + "modules/member/memberDataInfoLists/" + data.id);

            if (layEvent === 'examine') {

                febs.modal.open( '个人数据详情', 'modules/member/memberInfoDetail/' + data.id, {

                     maxmin: true,

                 });

            }

        });

        

@@ -125,7 +126,6 @@
        // 刷新按钮

        $reset.on('click', function () {

            $searchForm[0].reset();

            treeSelect.revokeNode('dept');

            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

        });

@@ -178,10 +178,11 @@
                                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>'

                            }else {

                                return ''

                            }

                        },minWidth: 200,align:'center'}

                        },minWidth: 200,align:'<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'}

                ]]

            });

        }