Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -205,6 +205,9 @@ public class YqPayController extends BaseController {
 
         //课程组价格
         List<MecCourse> courses = applyInfoService.queryUserCourse(renewals.getUserId());//获取续费课程
+        if(courses == null){
+            return failed("您没有要学费的课程");
+        }
         MecCourse mecCourse4json = JSON.parseObject(renewals.getCourses(), MecCourse.class);
         if (mecCourse4json == null) {
             return failed("请选择续费课程");

src/main/resources/config/mybatis/RenewalsMapper.xml

@@ -69,6 +69,6 @@
 
 	<!-- 根据order_id获取小课信息 -->
 	<select id="getRenewalsByOrderId" resultMap="Renewals">
-		SELECT * FROM `order` WHERE order_id = #{orderId}
+		SELECT * FROM `renewals` WHERE order_id = #{orderId}
 	</select>
 </mapper>