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

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

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

@@ -2,6 +2,15 @@
<!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.ContractHoldOrderDao">

   <select id="selectHoldOrderListByMemberIdAndSymbolTest" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
        select * from contract_hold_order where member_id=#{memberId}
        <if test="type!=null and type!=0">
            and contract_type=#{type}
        </if>
        and is_can_closing=1
        order by create_time desc
    </select>

    <update id="updateContractHoldOrderCanNotClosingByIds" parameterType="map">
        UPDATE contract_hold_order set is_can_closing = 0,batch_no=#{batchNo}
        where is_can_closing=1
@@ -68,13 +77,12 @@
        order by create_time desc
    </select>

    <select id="selectAllWholeOrderMemberIdAndSymbol" resultType="java.util.HashMap">
    <select id="selectAllWholeOrderMemberId" resultType="java.lang.Long">
        select
            member_id,
            symbol
            member_id
        from contract_hold_order
        where position_type=2
        group by member_id, symbol
        where position_type=2 and is_can_closing=1
        group by member_id
    </select>

    <select id="selectWholeHoldOrderSymbolsByMemberId" resultType="java.lang.String">