|
@@ -348,15 +348,17 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
//差价小于0退到余额
|
|
//差价小于0退到余额
|
|
if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
|
|
if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
|
|
// sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
|
|
// sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
|
|
- SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
|
|
|
|
- sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
|
|
|
|
- sysUserCashAccountLog.setGroupType(SUBJECT_CHANGE);
|
|
|
|
- sysUserCashAccountLog.setOrganId(subjectChange.getOrganId());
|
|
|
|
- sysUserCashAccountLog.setGroupId(subjectChange.getId().toString());
|
|
|
|
- sysUserCashAccountLog.setAmount(amountMargin.negate());
|
|
|
|
- sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
|
|
|
|
- sysUserCashAccountLog.setComment("声部更换退还");
|
|
|
|
- sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
|
|
|
|
|
|
+ if(amountMargin.compareTo(BigDecimal.ZERO) < 0){
|
|
|
|
+ SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
|
|
|
|
+ sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
|
|
|
|
+ sysUserCashAccountLog.setGroupType(SUBJECT_CHANGE);
|
|
|
|
+ sysUserCashAccountLog.setOrganId(subjectChange.getOrganId());
|
|
|
|
+ sysUserCashAccountLog.setGroupId(subjectChange.getId().toString());
|
|
|
|
+ sysUserCashAccountLog.setAmount(amountMargin.negate());
|
|
|
|
+ sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
|
|
|
|
+ sysUserCashAccountLog.setComment("声部更换退还");
|
|
|
|
+ sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
|
|
|
|
+ }
|
|
studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
|
|
studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
|
|
}
|
|
}
|
|
|
|
|