Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -5286,17 +5286,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("课程信息错误");
         }
 
-        Date date=new Date();
+        Date date = new Date();
 
         PracticeGroup practiceGroup = practiceGroupDao.get(practiceGroupBuyParams.getPracticeGroupId());
 
-        if(classGroup.getStudentNum() > 0){
-            int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(practiceGroupBuyParams.getPracticeGroupId().toString(),GroupType.PRACTICE);
-            if(i <= 0){
-                throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
-            }
-        }
-
         VipGroupActivity vipGroupActivity = null;
         if(Objects.nonNull(practiceGroup.getVipGroupActivityId())){
             vipGroupActivity = vipGroupActivityDao.get(practiceGroup.getVipGroupActivityId().intValue());

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

@@ -1314,7 +1314,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		applyBaseInfo.setCourseStartDate(firstCourseSchedule.getStartClassTime());
 		//课程结束时间为排课的最后一节课的结束时间
 		applyBaseInfo.setCoursesExpireDate(latestCourseSchedule.getEndClassTime());
-
+		applyBaseInfo.setStudentNum(studentIdList.size());
 		applyBaseInfo.setPaymentExpireDate(DateUtil.getLastSecondWithDay(applyBaseInfo.getPaymentExpireDate()));
 
 		vipGroupDao.insert(applyBaseInfo);
@@ -1377,7 +1377,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			applyBaseInfo.setOfflineTeacherSalary(costInfo.get("offlineTeacherSalary"));
 		}
 		applyBaseInfo.setTotalPrice(costInfo.get("totalPrice"));
-		vipGroupDao.update(applyBaseInfo);
 
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
@@ -4216,10 +4215,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			BigDecimal discount = null;
 			if(Objects.nonNull(vipGroupActivity)){
 				discount = vipGroupActivity.getDiscount().divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
-				surplusCoursesPrice = surplusCoursesPrice.multiply(discount).setScale(CommonConstants.DECIMAL_FINAL_PLACE,BigDecimal.ROUND_HALF_UP);
+				surplusCoursesPrice = surplusCoursesPrice.multiply(discount).setScale(0,BigDecimal.ROUND_CEILING);
 			}
 
-			sysUserCashAccountService.subtractFromCourseBalanceAndBalance(studentId,surplusCoursesPrice,PlatformCashAccountDetailTypeEnum.PAY_FEE, "后台添加学员金额扣减");
+			sysUserCashAccountService.subtractFromCourseBalanceAndBalance(studentId,surplusCoursesPrice.setScale(0,BigDecimal.ROUND_CEILING),PlatformCashAccountDetailTypeEnum.PAY_FEE, "后台添加学员金额扣减");
 
 			List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
 

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

@@ -807,13 +807,9 @@
     <select id="countGroupOrderWithoutFailed" resultType="int">
         SELECT COUNT(*)
         FROM student_payment_order spo
-                 LEFT JOIN class_group_student_mapper cgsm
-                           ON spo.music_group_id_ = cgsm.music_group_id_ AND spo.user_id_ = cgsm.user_id_
         WHERE spo.music_group_id_ = #{groupId}
           AND spo.status_ != 'FAILED'
-          AND cgsm.status_ != 'QUIT'
           AND spo.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
-          AND cgsm.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
     </select>
     <select id="countSporadicOrder" resultType="java.lang.Integer">
         SELECT COUNT(id_)

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -98,8 +98,8 @@ public class VipGroupManageController extends BaseController {
             if(VipGroupStatusEnum.PROGRESS.equals(vipGroup.getStatus())&&!VipGroupStatusEnum.FINISHED.equals(oldVipGroup.getStatus())&&oldVipGroup.getStatus().getCode()>VipGroupStatusEnum.PROGRESS.getCode()){
                 throw new BizException("此课程组状态暂不支持修改");
             }
-            if(classGroup.getStudentNum()<3){
-                throw new BizException("班级人数未达到3人");
+            if(classGroup.getStudentNum()<1){
+                throw new BizException("班级人数未达到1人");
             }
         }
         Date now = new Date();
@@ -299,8 +299,7 @@ public class VipGroupManageController extends BaseController {
     @PostMapping("/applyRefundForStudent")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/applyRefundForStudent')")
     public Object applyRefundForStudent(ReturnFeeDto returnFeeDto){
-        vipGroupService.applyRefundForStudent(returnFeeDto);
-        return succeed();
+        return vipGroupService.applyRefundForStudent(returnFeeDto);
     }
 
     @ApiOperation(value = "退课申请审核")