Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-19 4c31405418bdd063605f1e5821d99f85be02f23c

 fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinOriginMapper.xml

@@ -105,9 +105,14 @@
  <select id="getOverdueTaoLiJin" resultMap="BaseResultMap" >
    SELECT * FROM yeshi_ec_user_taolijin_origin t
   WHERE t.`uto_uid` = #{uid} AND t.`uto_create_time`<![CDATA[<=]]> #{date}
        AND t.`uto_money_surplus`<![CDATA[>]]> 0
        AND t.`uto_money_surplus`<![CDATA[>]]> 0 AND t.`uto_origin`<![CDATA[<>]]>'rankWin'

  </select>
  
  <select id="getOverdueTaoLiJinByRank" resultMap="BaseResultMap" >

    SELECT * FROM yeshi_ec_user_taolijin_origin t

   WHERE t.`uto_uid` = #{uid} AND t.`uto_create_time`<![CDATA[<=]]> #{date}

        AND t.`uto_money_surplus`<![CDATA[>]]> 0 AND t.`uto_origin`= 'rankWin'

  </select>

  
  <select id="getSurplusLiJin" resultMap="BaseResultMap" >
    SELECT * FROM yeshi_ec_user_taolijin_origin t