Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live

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

@@ -3788,7 +3788,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         return classGroups;
     }
 
-    public int countClassGroupPage(Map<String, Object> params,ClassGroupQueryInfo queryInfo){
+    @Override
+    public int countClassGroupPage(Map<String, Object> params, ClassGroupQueryInfo queryInfo){
         MapUtil.populateMap(params, queryInfo);
         params.put("groupType", queryInfo.getGroupType().getCode());
         if (Objects.nonNull(queryInfo.getLessThenThreeHighOnline())) {

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

@@ -3142,7 +3142,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if (classStudentMapperByUserIdAndClassGroupId.getStatus().equals(ClassGroupStudentStatusEnum.QUIT)) {
             throw new BizException("学生 {} {} 已经是退学状态", studentId, user.getUsername());
         }
-        BigDecimal amount = returnFeeDto.getAmount();
+        //不再校验退费金额
+        /*BigDecimal amount = returnFeeDto.getAmount();
         if (!classStudentMapperByUserIdAndClassGroupId.getStatus().equals(ClassGroupStudentStatusEnum.QUIT_SCHOOL)) {
             if (Objects.isNull(amount)) {
                 throw new BizException("请确定退费金额");
@@ -3152,7 +3153,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             if (amount.compareTo(suplusCourseFee) > 0) {
                 throw new BizException("学员 {} {} 最大可退费金额为{}元", studentId, user.getUsername(), suplusCourseFee.toString());
             }
-        }
+        }*/
     }
 
     @Override