|
@@ -2463,6 +2463,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
if (studentLastChange != null && minPaymentOrderId <= studentLastChange.getOriginalOrderId()) {
|
|
if (studentLastChange != null && minPaymentOrderId <= studentLastChange.getOriginalOrderId()) {
|
|
if (isRefundInstrumentFee) {
|
|
if (isRefundInstrumentFee) {
|
|
amount = amount.add(studentLastChange.getChangeMusicalPrice());
|
|
amount = amount.add(studentLastChange.getChangeMusicalPrice());
|
|
|
|
+
|
|
|
|
+ StudentInstrument studentMaintenance = studentInstrumentDao.getByOrderId(studentLastChange.getOrderId().longValue());
|
|
|
|
+ if (studentMaintenance != null) {
|
|
|
|
+ studentMaintenance.setDelFlag(1);
|
|
|
|
+ studentInstrumentDao.update(studentMaintenance);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (isRefundTeachingAssistantsFee) {
|
|
if (isRefundTeachingAssistantsFee) {
|
|
@@ -2474,6 +2480,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
// 退乐器费用
|
|
// 退乐器费用
|
|
if (isRefundInstrumentFee && detail.getType() == OrderDetailTypeEnum.MUSICAL) {
|
|
if (isRefundInstrumentFee && detail.getType() == OrderDetailTypeEnum.MUSICAL) {
|
|
amount = amount.add(detail.getPrice()).subtract(detail.getRemitFee());
|
|
amount = amount.add(detail.getPrice()).subtract(detail.getRemitFee());
|
|
|
|
+
|
|
|
|
+ StudentInstrument studentMaintenance = studentInstrumentDao.getStudentMaintenance(userId, musicGroupId);
|
|
|
|
+ if (studentMaintenance != null) {
|
|
|
|
+ studentMaintenance.setDelFlag(1);
|
|
|
|
+ studentInstrumentDao.update(studentMaintenance);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
// 退教辅费用
|
|
// 退教辅费用
|
|
@@ -2496,7 +2508,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
}
|
|
}
|
|
amount = amount.add(maintenanceFee);
|
|
amount = amount.add(maintenanceFee);
|
|
if (maintenanceFee.compareTo(BigDecimal.ZERO) > 0 && studentMaintenance != null) {
|
|
if (maintenanceFee.compareTo(BigDecimal.ZERO) > 0 && studentMaintenance != null) {
|
|
- studentMaintenance.setDelFlag(1);
|
|
|
|
|
|
+ studentMaintenance.setStatus(0);
|
|
studentInstrumentDao.update(studentMaintenance);
|
|
studentInstrumentDao.update(studentMaintenance);
|
|
}
|
|
}
|
|
}
|
|
}
|