|
@@ -90,6 +90,10 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
@Override
|
|
|
public Map payChange(Integer id, BigDecimal viewAmount, Boolean isUseBalancePayment) throws Exception {
|
|
|
SubjectChange subjectChange = subjectChangeDao.get(id);
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(subjectChange.getMusicGroupId());
|
|
|
+ if (musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY) && musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
|
|
|
+ throw new BizException("乐团当前状态不能缴费");
|
|
|
+ }
|
|
|
BigDecimal amount = subjectChange.getGoodsMargin().add(subjectChange.getCourseMargin());
|
|
|
|
|
|
Date date = new Date();
|
|
@@ -191,9 +195,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
subjectChange.setGoodsMargin(goodsMargin);
|
|
|
String goodsIds = "";
|
|
|
if (subjectChange.getChangeMusical() != null) {
|
|
|
- goodsIds += subjectChange.getMusicGroupId() + "";
|
|
|
+ goodsIds += subjectChange.getChangeMusical() + "";
|
|
|
}
|
|
|
- if (subjectChange.getChangeMusical() != null) {
|
|
|
+ if (subjectChange.getChangeAccessories() != null) {
|
|
|
goodsIds += StringUtils.isNotBlank(goodsIds) ? "," + subjectChange.getChangeAccessories() : subjectChange.getChangeAccessories();
|
|
|
}
|
|
|
BigDecimal goodsPrice = BigDecimal.ZERO;
|
|
@@ -213,7 +217,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
//差价小于0退到余额
|
|
|
if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
|
|
|
- studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(),subjectChange.getMusicGroupId(),subjectChange.getOriginalSubjectId(),subjectChange.getChangeSubjectId());
|
|
|
+ studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
|
|
|
}
|
|
|
subjectChange.setCreateTime(nowDate);
|
|
|
subjectChange.setUpdateTime(nowDate);
|
|
@@ -325,7 +329,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
Integer userId = studentPaymentOrder.getUserId();
|
|
|
|
|
|
//更新声部信息报名数量
|
|
|
- studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(),subjectChange.getMusicGroupId(),subjectChange.getOriginalSubjectId(),subjectChange.getChangeSubjectId());
|
|
|
+ studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
|
|
|
|
|
|
Map<Integer, String> map = new HashMap<>();
|
|
|
map.put(userId, userId.toString());
|