Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml

@@ -338,4 +338,11 @@
      WHERE (state=1 OR state= 2) <![CDATA[AND  FROM_UNIXTIME(extractTime/1000) >=CURDATE() ]]>

   </select>



   <select id="countTodayMoney" resultType="java.lang.Double">

      SELECT IFNULL(SUM(t.`money`),0) FROM  yeshi_ec_extract t 
      WHERE t.`uid` = #{uid} AND t.state = 1

         AND <![CDATA[TO_DAYS( FROM_UNIXTIME(t.extractTime/1000)) = TO_DAYS(NOW())]]>



   </select>

	
</mapper>