缴费修改

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -3092,11 +3092,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             musicGroupPaymentCalenderDetailService.addCalenderDetail(studentPaymentOrder, studentRegistration);
 
             List<StudentPaymentOrderDetail> allDetails = studentPaymentOrderDetailService.getOrderGoodsDetail(studentPaymentOrder.getId());
-            BigDecimal courseFee = allDetails.stream().filter(o -> !(o.getType()==MUSICAL))
-                    .filter(o -> !(o.getType() == ACCESSORIES))
-                    .filter(o -> !(o.getType() == MAINTENANCE))
-                    .filter(o -> !(o.getType() == CLOUD_TEACHER))
-                    .filter(o -> !(o.getType() == CLOUD_TEACHER_PLUS))
+            BigDecimal courseFee = allDetails.stream().filter(o -> !(o.getType() == MUSICAL)
+                    && !(o.getType() == VIP)
+                    && !(o.getType() == PRACTICE)
+                    && !(o.getType() == MAINTENANCE)
+                    && !(o.getType() == CLOUD_TEACHER)
+                    && !(o.getType() == CLOUD_TEACHER)
+                    && !(o.getType() == ACCESSORIES))
                     .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

@@ -312,6 +312,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         studentInstrument.setStatus(1);
         studentInstrument.setOrderId(order.getId());
         studentInstrument.setChangeOrderId(order.getId());
+        studentInstrument.setTenantId(order.getTenantId());
         return addStudentInstrument(studentInstrument).getId();
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1116,11 +1116,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             List<Long> orderIdList = new ArrayList<>();
             orderIdList.add(studentPaymentOrder.getId());
             List<StudentPaymentOrderDetail> allDetails = studentPaymentOrderDetailDao.getOrderDetailByOrderId(orderIdList);
-            BigDecimal courseFee = allDetails.stream().filter(o -> !(o.getType()==MUSICAL))
-                    .filter(o -> !(o.getType() == ACCESSORIES))
-                    .filter(o -> !(o.getType() == MAINTENANCE))
-                    .filter(o -> !(o.getType() == CLOUD_TEACHER))
-                    .filter(o -> !(o.getType() == CLOUD_TEACHER_PLUS))
+            BigDecimal courseFee = allDetails.stream().filter(o -> !(o.getType() == MUSICAL)
+                    && !(o.getType() == VIP)
+                    && !(o.getType() == PRACTICE)
+                    && !(o.getType() == MAINTENANCE)
+                    && !(o.getType() == CLOUD_TEACHER)
+                    && !(o.getType() == CLOUD_TEACHER)
+                    && !(o.getType() == ACCESSORIES))
                     .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);