Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

@@ -3368,9 +3368,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             Date date = new Date();
             dataList.forEach(e->{
                 if (studentCloudTeacherMap.containsKey(e.getUserId())) {
-                    CloudTeacherOrder cloudTeacherOrder = studentCloudTeacherMap.get(e.getUserId()).get(0);
-                    if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(date) > 0) {
-                        e.setCloudTeacherAmount(cloudTeacherOrder.getAmount());
+                    List<CloudTeacherOrder> cloudTeacherOrders = studentCloudTeacherMap.get(e.getUserId());
+                    if(cloudTeacherOrders != null && cloudTeacherOrders.size() > 0){
+                        BigDecimal cloudAmount = BigDecimal.ZERO;
+                        for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
+                            if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(date) > 0) {
+                                cloudAmount = cloudAmount.add(cloudTeacherOrder.getAmount());
+                            }
+                        }
+                        e.setCloudTeacherAmount(cloudAmount);
                     }
                 }
             });

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

@@ -526,9 +526,15 @@ public class StudentManageServiceImpl implements StudentManageService {
                     e.setHasMaintenance(true);
                 }
                 if (studentCloudTeacherMap.containsKey(e.getUserId())) {
-                    CloudTeacherOrder cloudTeacherOrder = studentCloudTeacherMap.get(e.getUserId()).get(0);
-                    if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
-                        e.setCloudTeacherAmount(cloudTeacherOrder.getAmount());
+                    List<CloudTeacherOrder> cloudTeacherOrders = studentCloudTeacherMap.get(e.getUserId());
+                    if(cloudTeacherOrders != null && cloudTeacherOrders.size() > 0){
+                        BigDecimal cloudAmount = BigDecimal.ZERO;
+                        for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
+                            if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
+                                cloudAmount = cloudAmount.add(cloudTeacherOrder.getAmount());
+                            }
+                        }
+                        e.setCloudTeacherAmount(cloudAmount);
                     }
                 }
             });

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

@@ -189,9 +189,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     e.setHasMaintenance(true);
                 }
                 if (studentCloudTeacherMap.containsKey(e.getStudentId())) {
-                    CloudTeacherOrder cloudTeacherOrder = studentCloudTeacherMap.get(e.getStudentId()).get(0);
-                    if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
-                        e.setCloudTeacherAmount(cloudTeacherOrder.getAmount());
+                    List<CloudTeacherOrder> cloudTeacherOrders = studentCloudTeacherMap.get(e.getStudentId());
+                    if(cloudTeacherOrders != null && cloudTeacherOrders.size() > 0){
+                        BigDecimal cloudAmount = BigDecimal.ZERO;
+                        for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
+                            if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
+                                cloudAmount = cloudAmount.add(cloudTeacherOrder.getAmount());
+                            }
+                        }
+                        e.setCloudTeacherAmount(cloudAmount);
                     }
                 }
             });