|
@@ -234,7 +234,8 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
|
|
|
BigDecimal goodsMargin = subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())
|
|
BigDecimal goodsMargin = subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())
|
|
|
.subtract(subjectChange.getOriginalMusicalPrice()).subtract(subjectChange.getOriginalAccessoriesPrice());
|
|
.subtract(subjectChange.getOriginalMusicalPrice()).subtract(subjectChange.getOriginalAccessoriesPrice());
|
|
|
subjectChange.setGoodsMargin(goodsMargin);
|
|
subjectChange.setGoodsMargin(goodsMargin);
|
|
|
- subjectChange.setOriginalKitGroupPurchaseType(studentOriginal.getOriginalKitGroupPurchaseType());
|
|
|
|
|
|
|
+ subjectChange.setOriginalKitGroupPurchaseType(
|
|
|
|
|
+ studentOriginal.getOriginalKitGroupPurchaseType() == null ? KitGroupPurchaseTypeEnum.OWNED : studentOriginal.getOriginalKitGroupPurchaseType());
|
|
|
String goodsIds = "";
|
|
String goodsIds = "";
|
|
|
if (subjectChange.getChangeMusical() != null) {
|
|
if (subjectChange.getChangeMusical() != null) {
|
|
|
goodsIds += subjectChange.getChangeMusical() + "";
|
|
goodsIds += subjectChange.getChangeMusical() + "";
|