Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -3744,6 +3744,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         paymentCalenderDto.setPaymentType(SPAN_GROUP_CLASS_ADJUST);
         //生成缴费项目
         paymentCalenderDto.setMasterTotalPrice(masterTotalPrice);
+        paymentCalenderDto.setIsGiveMusicNetwork(false);
         paymentCalenderDto.setStudentIds(StringUtils.join(studentIds,","));
         musicGroupPaymentCalenderService.create(paymentCalenderDto);
         //记录申请信息

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

@@ -3509,6 +3509,6 @@
         WHERE cs.class_group_id_ = #{classGroupId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()
     </select>
     <select id="getUnderwayCourseNum" resultType="int">
-        SELECT * FROM course_schedule WHERE music_group_id_ = #{musicGroupId} AND group_type_ = #{groupType} AND status_=#{status}
+        SELECT COUNT(*) FROM course_schedule WHERE music_group_id_ = #{musicGroupId} AND group_type_ = #{groupType} AND status_=#{status}
     </select>
 </mapper>

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

@@ -325,9 +325,9 @@ public class StudentOrderController extends BaseController {
     //    @Scheduled(cron = "0/30 * * * * ?")
     @GetMapping("/setSuccessStatus")
     public HttpResponseResult setSuccessStatus() throws Exception {
-        if (!profiles.equals("dev")) {
-            return failed("非法操作");
-        }
+//        if (!profiles.equals("dev")) {
+//            return failed("非法操作");
+//        }
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "ADAPAY");
 
         String[] statusArr = {"0", "1", "7"};