|
@@ -727,7 +727,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
classGroup.setStudentNum(classGroup.getStudentNum()+num);
|
|
|
}
|
|
|
|
|
|
- if(classGroup.getStudentNum().equals(classGroup.getExpectStudentNum())&&updateVipStatus){
|
|
|
+ Integer studentPaymentNum=studentPaymentOrderDao.countStudentPaymentNum(vipGroupId.toString());
|
|
|
+
|
|
|
+ if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
|
|
|
vipGroup.setStatus(VipGroupStatusEnum.FINISH);
|
|
|
vipGroupDao.update(vipGroup);
|
|
|
createVipGroupCourseScheInfo(vipGroupId);
|
|
@@ -758,15 +760,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
List<ClassGroupStudentMapper> classGroupStudents = classGroupStudentMapperDao.findByClassGroup(classGroup.getId());
|
|
|
|
|
|
- ImGroupMember[] imGroupMembers=new ImGroupMember[classGroupStudents.size()+1];
|
|
|
- imGroupMembers[0]=new ImGroupMember(vipGroupApplyBaseInfoDto.getUserId().toString());
|
|
|
+ List<ImGroupMember> imGroupMemberList = new ArrayList<>();
|
|
|
+ imGroupMemberList.add(new ImGroupMember(vipGroupApplyBaseInfoDto.getUserId().toString()));
|
|
|
//生成学生单课缴费信息
|
|
|
- for (int i=0;i<classGroupStudents.size();i++) {
|
|
|
- courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentForVipGroup(vipGroupId,classGroupStudents.get(i).getUserId());
|
|
|
- imGroupMembers[i+1]=new ImGroupMember(classGroupStudents.get(i).getUserId().toString());
|
|
|
+ for (ClassGroupStudentMapper classGroupStudent : classGroupStudents) {
|
|
|
+ courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentForVipGroup(vipGroupId,classGroupStudent.getUserId());
|
|
|
+ imGroupMemberList.add(new ImGroupMember(classGroupStudent.getUserId().toString()));
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
+ ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);
|
|
|
// 创建群组
|
|
|
imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
|
|
|
|
|
@@ -871,6 +874,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
Long vipGroupId=Long.parseLong(order.getMusicGroupId());
|
|
|
Integer userId = order.getUserId();
|
|
|
boolean isOk=order.getStatus().equals(DealStatusEnum.SUCCESS);
|
|
|
+
|
|
|
+ StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.get(order.getId());
|
|
|
+ if(studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
studentPaymentOrderDao.update(order);
|
|
|
|
|
|
//将学生加入到班级,更新班级报名状态及人数信息
|