Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2021-01-29 8bba3d8f5f71029c06a36d62f47d62d1adfff2e3

Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new

 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml

@@ -5,7 +5,8 @@
    <select id="coinInList" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

        select * from member_account_money_change

                where member_id = #{record.memberId}

                and (content like '%转%' or content like '%收款%')

                and (content like '%转%' or content like '%收款%' or (content like '%提币%' and withdraw_id in 
                (select id from member_coin_withdraw w where w.member_id = #{record.memberId} and is_inside = "Y")) )

        order by create_time desc

    </select>

    


 src/main/resources/mapper/member/MemberCoinWithdrawDao.xml

@@ -4,7 +4,7 @@


    <select id="findMemberCoinWithdrawInPage" resultType="com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity">

        select * from member_coin_withdraw

                where member_id = #{record.memberId}

                where member_id = #{record.memberId} and is_inside = “N”

        order by create_time desc

    </select>