|
@@ -261,6 +261,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null){
|
|
|
continue;
|
|
|
}
|
|
|
+ if(orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE) ){
|
|
|
+ orderDetail.setPrice(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
|
|
|
GoodsType goodsType = orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) ? GoodsType.INSTRUMENT : GoodsType.ACCESSORIES;
|
|
|
musicGroupSubjectGoodsGroup.setType(goodsType);
|
|
@@ -406,6 +409,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if (orderDetail == null || orderDetail.getPrice() == null || orderDetail.getGoodsIdList() == null){
|
|
|
continue;
|
|
|
}
|
|
|
+ if(orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE) ){
|
|
|
+ orderDetail.setPrice(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
|
|
|
GoodsType goodsType = orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) ? GoodsType.INSTRUMENT : GoodsType.ACCESSORIES;
|
|
|
musicGroupSubjectGoodsGroup.setType(goodsType);
|