修改61活动学员排课次数

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityCourseDetailDto.java

@@ -19,7 +19,7 @@ public class ActivityCourseDetailDto {
     @ApiModelProperty(value = "乐理课", required = false)
     private Integer musicTheory = 0;
 
-    private BigDecimal musicTheoryPrice = BigDecimal.ZERO;
+    private BigDecimal musicTheoryPrice;
 
     public void setMusicTheoryPrice(BigDecimal musicTheoryPrice) {
         this.musicTheoryPrice = musicTheoryPrice;

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

@@ -931,7 +931,19 @@ public class StudentManageServiceImpl implements StudentManageService {
                         throw new BizException("学员所在分部未配置考级价格");
                     }
                     activityCourseDetailDto.setMusicTheoryPrice(degreeCourseFee.getTheory());
+                }else {
+                    activityCourseDetailDto.setMusicTheoryPrice(detailDto.getMusicTheoryPrice());
                 }
+            }else {
+                SysUser sysUser = sysUserFeignService.queryUserById(student.getUserId());
+                if(sysUser == null){
+                    throw new BizException("请登录");
+                }
+                OrganizationDegreeCourseFee degreeCourseFee = organizationDegreeCourseFeeDao.getByOrganId(sysUser.getOrganId());
+                if(degreeCourseFee == null){
+                    throw new BizException("学员所在分部未配置考级价格");
+                }
+                activityCourseDetailDto.setMusicTheoryPrice(degreeCourseFee.getTheory());
             }
         }else {
             activityCourseDetailDto.setMusicTheoryPrice(BigDecimal.ZERO);