20200721 代码提交

xiaoyong931011

2020-07-21 cca760c2ac6ac19ddd1428f43e867affc9f8cab4

20200721  代码提交

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

@@ -11,6 +11,7 @@
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
@@ -769,6 +770,22 @@
            QueryRequest request) {
        Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findmemberApplyCoinAloneInPage(page, memberCoinChargeEntity);
        List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
        if(records != null && records.size() > 0) {
            for(MemberCoinChargeVo memberCoinChargeVo : records) {
                Long memberId = memberCoinChargeVo.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;
                    memberCoinChargeVo.setRealName(realName);
                }
            }
        }
        return findmemberQuickBuySaleListInPage;
    }


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

@@ -64,5 +64,9 @@
     * 邀请码

     */

    private String inviteId;

    /**

     * 真实姓名

     */

    private String realName;



}


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

@@ -30,6 +30,7 @@
            member_coin_withdraw s left join member m on m.id = s.member_id

         <where>

             s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids))

             and m.account_type = 1

            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">

                     and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})


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

@@ -90,6 +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: '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,11 +111,12 @@
                cols: [[

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

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

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

                    {field: 'realAmount', title: '到账数量', minWidth: 120,align:'center' ,totalRow: true},

                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},

                    {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},

                    {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},

                    {field: 'isInside', title: '内部转账',

                        templet: function (d) {