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

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(music_group_payment_calender_course_settings):
  */
@@ -33,7 +35,7 @@ public class MusicGroupPaymentCalenderCourseSettings extends BaseEntity {
 	private java.math.BigDecimal courseCurrentPrice;
 
 	@ApiModelProperty(value = "乐器、云教练溢出课程费用", required = false)
-	private java.math.BigDecimal overflowCoursePrice;
+	private java.math.BigDecimal overflowCoursePrice = BigDecimal.ZERO;
 	
 	@ApiModelProperty(value = "是否学生可选", required = false)
 	private boolean isStudentOptional = true;

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

@@ -733,9 +733,6 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     studentCourseFeeDetail.setMemo("免费团,购买乐器赠送课费");
                     studentCourseFeeDetail.setOperator(userId);
                     studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
-                    //设置缴费项目详情乐器和课费
-                    paymentCalenderDetail.setExpectAmount(chargeType.getFee());
-                    paymentCalenderDetail.setActualAmount(musicalFee);
                 }
             }
         }
@@ -745,27 +742,25 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             if(studentPaymentOrder.getType() == OrderTypeEnum.APPLY){
                 studentRegistration.setHasCloudTeacher(1);
                 //如果是报名订单，要处理云教练费用、以及溢出课费
-                if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
-                    //获取云教练溢出费用
-                    MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberDao.findByCalenderId(paymentCalenderDetail.getMusicGroupPaymentCalenderId());
-                    BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
-                            calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
-                    if(calenderMember.getActualAmount().compareTo(courseIncome) > 0){
-                        BigDecimal subtract = calenderMember.getActualAmount().subtract(courseIncome);
-                        //累加充值金额
-                        studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(subtract));
-                        //添加日志
-                        StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
-                        studentCourseFeeDetail.setTenantId(tenantId);
-                        studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
-                        studentCourseFeeDetail.setAmount(subtract);
-                        studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
-                        studentCourseFeeDetail.setMemo("会员团,购买云教练赠送课费");
-                        studentCourseFeeDetail.setOperator(userId);
-                        studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
-                        paymentCalenderDetail.setExpectMemberAmount(courseIncome);
-                        paymentCalenderDetail.setActualAmount(subtract);
-                    }
+            }
+            if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+                //获取云教练溢出费用
+                MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberDao.findByCalenderId(paymentCalenderDetail.getMusicGroupPaymentCalenderId());
+                BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
+                        calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
+                if(calenderMember.getActualAmount().compareTo(courseIncome) > 0){
+                    BigDecimal subtract = calenderMember.getActualAmount().subtract(courseIncome);
+                    //累加充值金额
+                    studentRegistration.setSurplusCourseFee(studentRegistration.getSurplusCourseFee().add(subtract));
+                    //添加日志
+                    StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();
+                    studentCourseFeeDetail.setTenantId(tenantId);
+                    studentCourseFeeDetail.setStudentRegistrationId(studentRegistration.getId());
+                    studentCourseFeeDetail.setAmount(subtract);
+                    studentCourseFeeDetail.setSurplusCourseFee(studentRegistration.getSurplusCourseFee());
+                    studentCourseFeeDetail.setMemo("会员团,购买云教练赠送课费");
+                    studentCourseFeeDetail.setOperator(userId);
+                    studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
                 }
             }
             BigDecimal cloudTeacherFee = allDetails.stream().filter(o -> o.getType() == CLOUD_TEACHER)
@@ -773,10 +768,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee);
         }
-        if(BigDecimal.ZERO.compareTo(paymentCalenderDetail.getActualAmount()) < 0){
-            musicGroupPaymentCalenderDetailService.update(paymentCalenderDetail);
-            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,paymentCalenderDetail.getActualAmount());
-        }
+//        if(BigDecimal.ZERO.compareTo(paymentCalenderDetail.getActualAmount()) < 0){
+//            musicGroupPaymentCalenderDetailService.update(paymentCalenderDetail);
+//            studentMusicCourseFeeService.addActualPrice(userId,musicGroupId,paymentCalenderDetail.getActualAmount());
+//        }
         studentRegistrationDao.update(studentRegistration);
     }