Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/adapay/Payment.java

@@ -182,8 +182,8 @@ public class Payment extends ConfigInit {
         paymentParams.put("appId", appId);
         paymentParams.put("amount", amount.setScale(2,BigDecimal.ROUND_HALF_UP));
         paymentParams.put("orderNo", orderNo);
-        paymentParams.put("notifyUrl", notifyUrl);
-        paymentParams.put("returnUrl", returnUrl);
+//        paymentParams.put("notifyUrl", notifyUrl);
+//        paymentParams.put("returnUrl", returnUrl);
         paymentParams.put("orderSubject", orderSubject);
         paymentParams.put("orderBody", orderBody);
         paymentParams.put("wxAppId", wxAppId);

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -281,7 +281,7 @@
 	<select id="getWithExam" resultMap="StudentExamResult">
 		SELECT ser.*,er.subject_id_ regist_subject_id_,er.level_ regist_level_ FROM student_exam_result ser
 		LEFT JOIN exam_registration er ON ser.exam_registration_id_ = er.id_
-		WHERE examination_basic_id_=#{examId}
+		WHERE ser.examination_basic_id_=#{examId}
 	</select>
     <select id="findByRoomIdAndUserId" resultMap="StudentExamResult">
 		SELECT * FROM student_exam_result WHERE exam_room_id_ = #{roomId} AND student_id_ = #{userId} LIMIT 1

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -86,8 +86,8 @@ public class ExamOrderController extends BaseController {
         signParams.put("appId", ConfigInit.appId);
         signParams.put("amount", amount.setScale(2,BigDecimal.ROUND_HALF_UP));
         signParams.put("orderNo", orderNo);
-        signParams.put("notifyUrl", notifyUrl);
-        signParams.put("returnUrl", returnUrl);
+//        signParams.put("notifyUrl", notifyUrl);
+//        signParams.put("returnUrl", returnUrl);
         signParams.put("orderSubject", orderSubject);
         signParams.put("orderBody", orderBody);
         signParams.put("wxAppId", ConfigInit.wxAppId);