|
|
@@ -2627,6 +2627,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
studentPaymentOrder.setUpdateTime(date);
|
|
|
studentPaymentOrder.setVersion(0);
|
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
|
+ calenderDetail.setPaymentStatus(PaymentStatus.PROCESSING);
|
|
|
calenderDetail.setPaymentOrderId(studentPaymentOrder.getId());
|
|
|
musicGroupPaymentCalenderDetailDao.update(calenderDetail);
|
|
|
|
|
|
@@ -3249,7 +3250,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
}
|
|
|
//课程团和amr可以互相修改，但不可以改为会员团
|
|
|
if(group.getCourseViewType() != musicGroup.getCourseViewType()){
|
|
|
- if(group.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
|
|
|
+ if(group.getStatus() == MusicGroupStatusEnum.PROGRESS && group.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
|
|
|
throw new BizException("会员收费乐团不可更改收费模式");
|
|
|
}
|
|
|
if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
|
yonge