|
@@ -221,21 +221,30 @@ public class GroupClassServiceImpl implements GroupClassService {
|
|
|
if(activityUserMapper.getReturnFee()){
|
|
|
return BaseController.succeed();
|
|
|
}
|
|
|
+ VipGroupActivity activity = vipGroupActivityDao.get(activityUserMapper.getActivityId());
|
|
|
if(!confirmReturnActivityGive){
|
|
|
if(activityUserMapper.getGiveMemberFlag() != 0){
|
|
|
- return BaseController.failed(HttpStatus.PARTIAL_CONTENT,"当前课程组为活动购买,退费会退还赠送的会员,是否继续退费?");
|
|
|
+ String format = String.format("该课程组通过%s创建,含赠送会员,确认退学后将扣减学员%s%s会员使用期限", activity.getName(), activity.getGiveMemberTime(), activity.getGivePeriodEnum().getMsg());
|
|
|
+ return BaseController.failed(HttpStatus.PARTIAL_CONTENT,format);
|
|
|
}
|
|
|
- if(activityUserMapper.getGiveVipFlag() != 0){
|
|
|
- return BaseController.failed(HttpStatus.PARTIAL_CONTENT,"当前课程组为活动购买,退费会退还赠送的VIP课,是否继续退费?");
|
|
|
+ if(activityUserMapper.getGiveVipFlag() == 1 || activityUserMapper.getGivePracticeFlag() == 1){
|
|
|
+ String format = String.format("该课程组通过%s创建,学员赠课尚未排课,赠课排课资格将清除", activity.getName());
|
|
|
+ return BaseController.failed(HttpStatus.PARTIAL_CONTENT,format);
|
|
|
}
|
|
|
- if(activityUserMapper.getGivePracticeFlag() != 0){
|
|
|
- return BaseController.failed(HttpStatus.PARTIAL_CONTENT,"当前课程组为活动购买,退费会退还赠送的网管课,是否继续退费?");
|
|
|
+ if(activityUserMapper.getGiveVipFlag() == 2){
|
|
|
+ VipGroup vipGroup = vipGroupDao.get(activityUserMapper.getGiveVipGroupId());
|
|
|
+ String format = String.format("该课程组通过%s创建,含赠课课程组%s %s,确认退学(关闭)后赠课课程组也将退学", activity.getName(),vipGroup.getId(),vipGroup.getName());
|
|
|
+ return BaseController.failed(HttpStatus.PARTIAL_CONTENT,format);
|
|
|
+ }
|
|
|
+ if(activityUserMapper.getGivePracticeFlag() == 2){
|
|
|
+ PracticeGroup practiceGroup = practiceGroupDao.get(activityUserMapper.getGiveVipGroupId());
|
|
|
+ String format = String.format("该课程组通过%s创建,含赠课课程组%s %s,确认退学(关闭)后赠课课程组也将退学", activity.getName(),practiceGroup.getId(),practiceGroup.getName());
|
|
|
+ return BaseController.failed(HttpStatus.PARTIAL_CONTENT,format);
|
|
|
}
|
|
|
}
|
|
|
activityUserMapper.setReturnFee(true);
|
|
|
Date now = new Date();
|
|
|
if(activityUserMapper.getGiveMemberFlag() == 2){
|
|
|
- VipGroupActivity activity = vipGroupActivityDao.get(activityUserMapper.getActivityId());
|
|
|
//只退还赠送的时间
|
|
|
Integer giveMemberTime = activity.getGiveMemberTime();
|
|
|
PeriodEnum givePeriodEnum = activity.getGivePeriodEnum();
|