Merge branch 'saas_zouxuan_07_11' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1062,7 +1062,7 @@
         LIMIT 1
     </select>
     <select id="countByActivityIds" resultType="java.lang.Integer">
-        SELECT COUNT(0) FROM student_payment_order WHERE user_id_ = #{userId} AND activity_id_ IN
+        SELECT COUNT(0) FROM student_payment_order WHERE user_id_ = #{userId} AND status_ = 'SUCCESS' AND activity_id_ IN
         <foreach collection="activityIds" item="activityId" open="(" close=")" separator=",">
             #{activityId}
         </foreach>