Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-26 19a0ffbf9653be38d3f366fc25cda8357e534086

 src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml

@@ -1,6 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao">
	
   <select id="selectByMemberIdandIsFollow" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity">
      SELECT
         *
      FROM
         follow_follower_profit 
      WHERE 
         member_id = #{id} 
         and is_follow = #{isFollowY} 
      order by create_time desc
    </select>

   <select id="selectFollowRecords" resultType="com.xcong.excoin.modules.documentary.vo.FollowRecordsVo">
      SELECT
@@ -49,7 +60,6 @@
         member_id = #{memberId} 
         and contract_type = 2
         and order_type in (3,4)
         and closing_type not in (4,5)
      order by create_time desc
    </select>
   <select id="getMyFollowOrderNowRecords" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
@@ -71,7 +81,6 @@
      WHERE 
         member_id = #{memberId} 
         and contract_type = 2
      order by opening_time desc
    </select>
    
   <select id="selectDocumentaryOrderSetInfoBymemberIdAndTradeId" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity">