|
@@ -1155,8 +1155,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
//成功报名状态变更
|
|
|
StudentRegistration studentRegistration = studentRegistrationDao.lockWithUserAndMusic(studentPaymentOrder.getUserId(), studentPaymentOrder.getMusicGroupId());
|
|
|
|
|
|
-// MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
|
|
|
-
|
|
|
if (studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)) {
|
|
|
MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
|
|
|
//支付成功后处理课程、云教练、活动等数据
|
|
@@ -1241,26 +1239,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
studentRegistrationDao.update(studentRegistration);
|
|
|
//减去缴费人数(器乐收费,0元时不减缴费人数)
|
|
|
studentPaymentOrderService.cutSubjectPlan(studentPaymentOrder);
|
|
|
-
|
|
|
- //减去缴费人数(器乐收费,0元时不减缴费人数)
|
|
|
-// if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) || musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE)) {
|
|
|
-// if (studentPaymentOrder.getPaymentAccountNo() != null && studentPaymentOrder.getPaymentAccountNo().equals("200")) {
|
|
|
-// musicOneSubjectClassPlan.setPaidZeroNum(musicOneSubjectClassPlan.getPaidZeroNum() - 1);
|
|
|
-// musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
|
|
|
-// } else if (studentPaymentOrder.getPaymentAccountNo() == null) {
|
|
|
-// musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
|
|
|
-// }
|
|
|
-// updateCount = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
|
|
|
-// if (updateCount <= 0) {
|
|
|
-// throw new BizException("减去缴费人数失败");
|
|
|
-// }
|
|
|
-// studentPaymentOrderService.quitCouponAndBalance(studentPaymentOrder);
|
|
|
+ //余额
|
|
|
if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "报名缴费失败");
|
|
|
}
|
|
|
+ //优惠券
|
|
|
sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
|
|
|
//三方乐团不发送缴费通知
|
|
|
if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
|