|
@@ -91,7 +91,7 @@ public class EduRegisterController extends BaseController {
|
|
|
for (MusicGroupRegAndMoneyDto musicGroup : musicGroups) {
|
|
|
List<MusicalListDetailDto> musicalList = studentPaymentOrderDetailService.getMusicalListDetail(musicGroup.getMusicGroupId(), null);
|
|
|
if (musicalList != null && musicalList.size() > 0) {
|
|
|
- Long instrumentNum = musicalList.stream().filter(e -> e.getKitGroupPurchaseTypeEnum().equals(KitGroupPurchaseTypeEnum.GROUP)).count();
|
|
|
+ Long instrumentNum = musicalList.stream().filter(e -> KitGroupPurchaseTypeEnum.GROUP.equals(e.getKitGroupPurchaseTypeEnum())).count();
|
|
|
BigDecimal money = musicalList.stream().filter(e -> e.getOrderAmount() != null).map(MusicalListDetailDto::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
musicGroup.setBuyInstrumentNum(instrumentNum.intValue());
|
|
|
musicGroup.setMoney(money == null ? BigDecimal.ZERO : money);
|