update

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

@@ -565,7 +565,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
 
          vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("totalPrice", ZERO));
-         vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("originalTotalPrice", ZERO));
+         vipGroupApplyBaseInfoDto.setOriginalTotalPrice(costInfo.getOrDefault("originalTotalPrice", ZERO));
         if (CollectionUtils.isEmpty(vscps)) {
             vscps = new ArrayList<>();
             for (Integer canBuyStudentId : canBuyStudentIds) {
@@ -3835,7 +3835,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         Integer studentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());
         if (studentNum > 0) {
-            throw new BizException("无法停止课程，需要全部学员退学后，才能停止，请先操作学员退学。");
+            throw new BizException("无法关闭课程，需要全部学员退学后，才能关闭，请先操作学员退学。");
         }
 
         List<Map<Integer, BigDecimal>> maps = vipGroupDao.countSurplusCourseFee(vipGroupId);
@@ -3866,7 +3866,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupId, userId,
                     DealStatusEnum.SUCCESS.getCode(),orderType);
             if (null == studentPaymentOrder) {
-                throw new BizException("无法停止课程，需要全部学员退学后，才能停止，请先操作学员退学。");
+                throw new BizException("无法关闭课程，需要全部学员退学后，才能关闭，请先操作学员退学。");
             }
 //			sysUserCashAccountService.updateBalance(userId.intValue(),studentSurplusClassFees.get(userId));
 //			SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(userId.intValue());

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

@@ -2311,7 +2311,7 @@
         AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0
         GROUP BY cs.class_group_id_
     </select>
-    <select id="countCurrentNumByClassId" resultType="java.util.Map">
+    <select id="countCurrentNumByClassId" resultType="java.lang.Integer">
         SELECT COUNT(cs.id_) FROM course_schedule cs
         WHERE cs.class_group_id_ = #{classGroupId}
         <if test="teacherId != null">