Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponRecordMapper.xml

@@ -77,4 +77,11 @@
         separator=",">#{item}</foreach>
  </select>
  
  <select id="getCouponByUsingTimeOut" resultMap="BaseResultMap">
    SELECT * FROM `yeshi_ec_user_system_coupon` cp
   LEFT JOIN `yeshi_ec_user_system_coupon_record` rd ON rd.`ucr_user_coupon_id` = cp.`usc_id`
   WHERE cp.`usc_uid` = #{uid} AND cp.`usc_state` = 2 AND rd.`ucr_state` = 0
        AND UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(cp.`usc_use_time`) > #{seconds} ;　
  </select>
  
</mapper>