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

zainali5120

2021-03-31 55a4f22db43ec34bc7f59103f4a94005bd613850

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

@@ -2,6 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.excoin.modules.contract.dao.ContractOrderDao">

    <select id="selectOrderNoByOrderIds" resultType="java.lang.String">
        SELECT
            order_no
        FROM
            contract_order
        WHERE
              id = #{orderId}
    </select>

    <select id="selectFollowOrderListByMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
        SELECT
            *
        FROM
            contract_order
        WHERE
            member_id = #{tradeMemberId}
          AND contract_type = 2
          AND closing_price IS NOT NULL;
    </select>

    <select id="selectContractOrderInPage" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
        select