yonge 5 years ago
parent
commit
32bf9da55a

+ 4 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -389,8 +389,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			}
 			params.put("courseFee", musicGroupSubjectPlan.getFee().doubleValue());
 		} else {
-			params.put("courseFee", musicGroupStudentFee.getTemporaryCourseFee().doubleValue() > 0 ? musicGroupStudentFee.getTemporaryCourseFee().doubleValue()
-					: musicGroupStudentFee.getCourseFee().doubleValue());
+			params.put(
+					"courseFee",
+					(musicGroupStudentFee.getTemporaryCourseFee() != null && musicGroupStudentFee.getTemporaryCourseFee().doubleValue() > 0) ? musicGroupStudentFee
+							.getTemporaryCourseFee().doubleValue() : musicGroupStudentFee.getCourseFee().doubleValue());
 		}
 
 		// 收费形式

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -195,7 +195,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysUser.setUserType(SysUserType.STUDENT);
             sysUser.setGender(studentRegistration.getGender());
             if(studentRegistration.getOrganId() != null){
-                sysUser.setOrganId(studentRegistration.getOrganId().toString());
+                sysUser.setOrganId(studentRegistration.getOrganId());
             }
             sysUser.setRealName(studentRegistration.getParentsName());
             sysUser.setUsername(studentRegistration.getName());

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -58,7 +58,7 @@ public class MusicGroupRegisterController extends BaseController {
         }else{
             studentRegistration.setPaymentStatus(PaymentStatusEnum.NO);
         }
-        studentRegistration.setOrganId(musicGroup.getOrganId());
+        studentRegistration.setOrganId(musicGroup.getOrganId().toString());
         return succeed(studentRegistrationService.addStudent(studentRegistration));
     }