Merge remote-tracking branch 'origin/saas' into saas

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

@@ -97,7 +97,9 @@
 		SELECT mgp.* FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
 		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
+        <if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
+		</if>
 		<if test="organIds != null and organIds != ''">
 			AND FIND_IN_SET(mg.organ_id_,#{organIds})
 		</if>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -314,6 +314,14 @@ public class StudentOrderController extends BaseController {
             if (StringUtils.isNotBlank(orderNo) && !orderNo.equals(payingOrder.getOrderNo())) {
                 continue;
             }
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(payingOrder.getMusicGroupId()) && Objects.nonNull(payingOrder.getUserId())) {
+                StudentRegistration studentRegister = studentRegistrationDao.getStudentRegister(payingOrder.getMusicGroupId(), payingOrder.getUserId());
+                if (Objects.nonNull(studentRegister) && studentRegister.getPayingStatus() == 2) {
+                    //跳过审核中的
+                    continue;
+                }
+            }
+
             Map<String, String> rpMap = new HashMap<>();
             rpMap.put("tradeState", "1");
             rpMap.put("remarks", "模拟支付成功");