Merge branch '2021-07-19_children' of http://git.dayaedu.com/yonge/mec

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

@@ -1,12 +1,10 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
 public class ActivityCourseDetailDto {
-    @JSONField(serialize=false)
     private Integer userId;
 
     @ApiModelProperty(value = "vip1", required = false)

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
@@ -923,15 +924,38 @@ public class StudentManageServiceImpl implements StudentManageService {
         if(!activityCourseDetailDto.getMusicTheory().equals(0) && !activityCourseDetailDto.getMusicTheory().equals(1)){
             throw new BizException("修改失败：排课次数异常");
         }
-        SysUser sysUser = sysUserFeignService.queryUserById(student.getUserId());
-        if(sysUser == null){
-            throw new BizException("请登录");
-        }
-        OrganizationDegreeCourseFee degreeCourseFee = organizationDegreeCourseFeeDao.getByOrganId(sysUser.getOrganId());
-        if(degreeCourseFee == null){
-            throw new BizException("学员所在分部未配置考级价格");
+        if(activityCourseDetailDto.getMusicTheory().equals(1)){
+            String activityCourseDetail = student.getActivityCourseDetail();
+            if(StringUtils.isNotEmpty(activityCourseDetail)){
+                ActivityCourseDetailDto detailDto = JSON.parseObject(activityCourseDetail, ActivityCourseDetailDto.class);
+                if(detailDto.getMusicTheory() == null || detailDto.getMusicTheory().equals(0)){
+                    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(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);
         }
-        activityCourseDetailDto.setMusicTheoryPrice(degreeCourseFee.getTheory());
+        activityCourseDetailDto.setUserId(null);
         student.setActivityCourseDetail(JSON.toJSONString(activityCourseDetailDto));
         studentDao.update(student);
     }