20200716 代码提交

xiaoyong931011

2020-07-16 a3d192d43e4090011d941e412a5bb44d59a6a049

20200716   代码提交

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

@@ -63,4 +63,6 @@

    List<String> selectMemberBylowLevelInviteId(String lowLevelInviteId);
    
    String selectRewardratioForBasicRealDataBymid(Long memberId);

    
}

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

@@ -564,9 +564,13 @@
            selectById.setCertifyStatus(MemberEntity.CERTIFY_STATUS_Y);
        }else {
            selectById.setCertifyStatus(MemberEntity.CERTIFY_STATUS_N);
            Map<String, Object> columnMap = new HashMap<>();
            columnMap.put("member_id", selectById);
            memberAuthenticationMapper.deleteByMap(columnMap);
        }
        selectById.setIdcardNo(memberAuthenticationEntity.getIdcardNo());
        memberMapper.updateById(selectById);
		
        return new FebsResponse().success();
    }


 src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java

@@ -97,6 +97,10 @@
        if(records.size() > 0) {
            for(MemberAccountInfoVo memberAccountInfoVo : records) {
                Long memberId = memberAccountInfoVo.getId();
                //总盈亏

                String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymid(memberId);

                BigDecimal bd=new BigDecimal(rewardratioByMid);

                memberAccountInfoVo.setRewardratioByMid(bd);

                String inviteId = memberMapper.selectAgentForAccount(memberId);
                if("".equals(inviteId) || inviteId == null) {
                    memberAccountInfoVo.setIsSuAccount(0);

 src/main/java/com/xcong/excoin/modules/trademanage/vo/MemberAccountInfoVo.java

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

    private BigDecimal walletFrozenBalance;

    /**

     *总盈亏

     */

    private BigDecimal rewardratioByMid;

    /**

     * 是否是代理

     */

    private int isSuAccount;


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

@@ -206,6 +206,16 @@
            AND account_status = '1'

        )

    </select>

    <select id="selectRewardratioForBasicRealDataBymid" 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="selectSFCCForBasicRealData" resultType="java.lang.String">

        SELECT

            COUNT(b.id)


 src/main/resources/templates/febs/views/modules/trademanage/accountInfo.html

@@ -76,6 +76,14 @@
                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},

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

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

                    {field: 'rewardratioByMid', title: '盈亏',

                        templet: function (d) {

                            if (d.rewardratioByMid > 0) {

                                return '<span style="color:green;">'+d.rewardratioByMid+'</span>'

                            } else {

                                return '<span style="color:red;">'+d.rewardratioByMid+'</span>'

                            } 
                        }, minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletAvailableBalance', title: '币币可用', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletFrozenBalance', title: '币币冻结', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletCoinAvailableBalance', title: '合约可用', minWidth: 80,align:'center',totalRow: true},