|
@@ -381,11 +381,19 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
|
|
|
|
|
|
@Override
|
|
|
public Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange) {
|
|
|
+
|
|
|
+ StudentInstrument studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
|
|
|
+
|
|
|
if (subjectChange == null || subjectChange.getChangeMusical() == null ||
|
|
|
KitGroupPurchaseTypeEnum.OWNED.equals(subjectChange.getKitGroupPurchaseType())) {
|
|
|
+
|
|
|
+ if(studentInstrument != null){
|
|
|
+ studentInstrument.setDelFlag(1);
|
|
|
+ update(studentInstrument);
|
|
|
+ }
|
|
|
+
|
|
|
return false;
|
|
|
}
|
|
|
- StudentInstrument studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
|
|
|
|
|
|
if (studentInstrument == null) {
|
|
|
studentInstrument = new StudentInstrument();
|