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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicMemberDto.java

@@ -20,6 +20,16 @@ public class MusicMemberDto {
 
 	private Integer memberDay;
 
+	private BigDecimal cloudTeacherAmount;
+
+	public BigDecimal getCloudTeacherAmount() {
+		return cloudTeacherAmount;
+	}
+
+	public void setCloudTeacherAmount(BigDecimal cloudTeacherAmount) {
+		this.cloudTeacherAmount = cloudTeacherAmount;
+	}
+
 	public Integer getUserId() {
 		return userId;
 	}

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

@@ -109,7 +109,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 //				throw new BizException("修改失败：存在未开启缴费的学员");
 //			}
 //		}
-		if(expectAmount.doubleValue() > 0){
+		if(calender.getPaymentAmount().doubleValue() > 0d){
 			BigDecimal totalAmount = calender.getPaymentAmount();
 			BigDecimal subExpectAmount = expectAmount;
 			if(calender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.SPAN_GROUP_CLASS_ADJUST){

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

@@ -3350,6 +3350,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = musicGroupDao.queryMusicMemberList(params);
+            List<Integer> collect = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+            String musicGroupId = dataList.get(0).getMusicGroupId();
+            //查询云教练订单
+            List<CloudTeacherOrder> studentCloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrders(collect,musicGroupId);
+            Map<Integer, List<CloudTeacherOrder>> studentCloudTeacherMap = studentCloudTeacherOrders.stream().collect(Collectors.groupingBy(CloudTeacherOrder::getStudentId));
+            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());
+                    }
+                }
+            });
         }
         if (count == 0) {
             dataList = new ArrayList<>();