|
@@ -237,6 +237,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
subjectChange.setOriginalKitGroupPurchaseType(
|
|
subjectChange.setOriginalKitGroupPurchaseType(
|
|
|
studentOriginal.getOriginalKitGroupPurchaseType() == null ? KitGroupPurchaseTypeEnum.OWNED : studentOriginal.getOriginalKitGroupPurchaseType());
|
|
studentOriginal.getOriginalKitGroupPurchaseType() == null ? KitGroupPurchaseTypeEnum.OWNED : studentOriginal.getOriginalKitGroupPurchaseType());
|
|
|
String goodsIds = "";
|
|
String goodsIds = "";
|
|
|
|
|
+ if(subjectChange.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.OWNED)){
|
|
|
|
|
+ subjectChange.setChangeMusical(null);
|
|
|
|
|
+ }
|
|
|
if (subjectChange.getChangeMusical() != null) {
|
|
if (subjectChange.getChangeMusical() != null) {
|
|
|
goodsIds += subjectChange.getChangeMusical() + "";
|
|
goodsIds += subjectChange.getChangeMusical() + "";
|
|
|
}
|
|
}
|