Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

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

@@ -124,4 +124,18 @@
   ORDER BY uc.usc_state_activate, uc.`usc_create_time`
  </select>
  
  <select id="getCounponNowInvalid" resultMap="BaseResultMap">
     SELECT * FROM `yeshi_ec_user_system_coupon` cp
   WHERE cp.`usc_uid` = #{uid} AND cp.`usc_state` = 1
      AND DATE_FORMAT(CURDATE(),'%Y%m%d') <![CDATA[ > ]]>DATE_FORMAT(cp.`usc_end_time`,'%Y%m%d');
  </select>
  
  <select id="getCouponByState" resultMap="BaseResultMap">
     SELECT * FROM `yeshi_ec_user_system_coupon` cp
   WHERE cp.`usc_uid` = #{uid}
      <if test="state != null">
          AND cp.`usc_state` = #{state}
      </if>
  </select>
  
</mapper>