Merge remote-tracking branch 'origin/whole_new' into whole_new

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

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

@@ -2,6 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao">



    <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 '%收款%' 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>

	
    <select id="selectWalletCoinRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

      select * from member_account_money_change where type = 1 and member_id = #{memberId} order by id desc

   </select>

@@ -52,7 +60,8 @@
    </select>

    

   <select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

      select * from member_account_money_change <if test="record != null">

      select * from member_account_money_change 
      <if test="record != null">

            <where>

               type = 3

               and content like '%佣金到账%'