经营报表相关改动

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

@@ -667,11 +667,16 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             //记录用户实际课费
             studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,courseFee);
         }
+        List<OrderDetailTypeEnum> detailTypeEnums = allDetails.stream().map(StudentPaymentOrderDetail::getType).collect(Collectors.toList());
+        //学生云教练处理
+        if (detailTypeEnums.contains(CLOUD_TEACHER) && studentPaymentOrder.getType() == OrderTypeEnum.APPLY) {
+            studentRegistration.setHasCloudTeacher(1);
+        }
+        studentRegistrationDao.update(studentRegistration);
 
         //缴费项目详情
         MusicGroupPaymentCalenderDetail paymentCalenderDetail = musicGroupPaymentCalenderDetailService.addCalenderDetail(studentPaymentOrder);
 
-        List<OrderDetailTypeEnum> detailTypeEnums = allDetails.stream().map(StudentPaymentOrderDetail::getType).collect(Collectors.toList());
         //销售订单详情
         if (allDetails.size() > 0 && (detailTypeEnums.contains(MUSICAL) || detailTypeEnums.contains(ACCESSORIES) || detailTypeEnums.contains(TEACHING))) {
             BigDecimal couponRemitFee = studentPaymentOrder.getCouponRemitFee();
@@ -728,13 +733,13 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 if(calenderMember.getActualAmount().compareTo(courseIncome) > 0){
                     BigDecimal subtract = calenderMember.getActualAmount().subtract(courseIncome);
                     //累加充值金额
-                    studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(subtract));
+                    studentRegistrationDao.updateCourseFee(studentRegistration.getId(),subtract);
                     //添加日志
                     StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
                     studentCourseFeeDetail.setTenantId(tenantId);
                     studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
                     studentCourseFeeDetail.setAmount(subtract);
-                    studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
+                    studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(subtract));
                     studentCourseFeeDetail.setMemo("会员团,购买云教练赠送课费");
                     studentCourseFeeDetail.setOperator(userId);
                     studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
@@ -745,7 +750,6 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee);
         }
-        studentRegistrationDao.update(studentRegistration);
     }
 
     @Override