|
@@ -188,9 +188,18 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
TenantContextHolder.clearTenantId();
|
|
|
|
|
|
if(studentPreRegistration.getOrganId() == 59){
|
|
|
+
|
|
|
+ if(student.getMembershipEndTime() == null){
|
|
|
+ student.setMembershipEndTime(date);
|
|
|
+ }
|
|
|
+ if(student.getMembershipStartTime() == null){
|
|
|
+ student.setMembershipStartTime(date);
|
|
|
+ }
|
|
|
+ if(student.getMemberRankSettingId() == null){
|
|
|
+ student.setMemberRankSettingId(1);
|
|
|
+ }
|
|
|
//赠送一个月的会员
|
|
|
if(student.getMembershipEndTime().before(date)){
|
|
|
- student.setMemberRankSettingId(1);
|
|
|
student.setMembershipEndTime(DateUtil.addMonths(date, 1));
|
|
|
student.setMembershipStartTime(date);
|
|
|
}else{
|