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

Helius

2020-07-14 1b0e20f11a920ba8c0c38e4c8fef58e8fa1fe0d2

 src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml

@@ -28,4 +28,19 @@
      select * from coins_order_deal where order_id= #{orderId} and member_id = #{memberId}

   </select>

   

   <select id="findAllWalletCoinOrderInPage" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">

        select * from coins_order_deal

        <if test="record != null">

            <where>

                <if test="record.memberId != null" >

                    and member_id=#{record.memberId}

                </if>

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

                    and symbol = #{record.symbol}

                </if>

            </where>

        </if>

        order by create_time desc

    </select>

	
</mapper>