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

Helius

2020-07-01 77f844f85e90ee6ae98c5f9c3d24f31d541db2f9

 src/main/resources/mapper/contract/ContractOrderDao.xml

@@ -4,8 +4,22 @@


    <select id="selectContractOrderInPage" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
        select * from contract_order where member_id=#{memberId}
        select * from contract_order
        <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>

    <select id="selectOrderDetailByIdAndMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
        select * from contract_order where id=#{id} and member_id=#{memberId}
    </select>

</mapper>