|
@@ -657,7 +657,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
}
|
|
}
|
|
orderAmount = orderAmount.add(orderDetail.getPrice());
|
|
orderAmount = orderAmount.add(orderDetail.getPrice());
|
|
}
|
|
}
|
|
- } else if (studentRegistration.getTemporaryCourseFee() == null && !registerPayDto.getGoodsGroupIds().equals("")) {
|
|
|
|
|
|
+ } else if (StringUtils.isNoneBlank(registerPayDto.getGoodsGroupIds())) {
|
|
goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(registerPayDto.getGoodsGroupIds());
|
|
goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(registerPayDto.getGoodsGroupIds());
|
|
for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
|
|
for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
|
|
if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
|
|
if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
|