Merge remote-tracking branch 'origin/activity_2020_12'

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

@@ -106,7 +106,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                     theoryMoney = new BigDecimal(320);
                     break;
                 case "免考":
-                    theoryMoney = new BigDecimal(0);
                     break;
                 default:
                     throw new BizException("您选择的乐理级别不存在，请核对");
@@ -119,8 +118,11 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 degreeRegistration.setUpdateTime(nowDate);
                 degreeRegistrationDao.insert(degreeRegistration);
             } else if (degree.getStatus().equals(2)) {
-                //throw new BizException("您本次已报名，请勿重复报名");
+                degreeRegistration.setMoney(BigDecimal.ZERO);
+                degreeRegistration.setTheoryMoney(BigDecimal.ZERO);
             } else {
+                degreeRegistration.setMoney(degree.getMoney());
+                degreeRegistration.setTheoryMoney(degree.getTheoryMoney());
                 degreeRegistration.setId(degree.getId());
                 degreeRegistration.setStatus(1);
                 degreeRegistration.setCreateTime(nowDate);