管乐迷需求合集

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

@@ -1306,9 +1306,14 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         studentMemberUpdateLog.setOldStartTime(student.getMembershipStartTime());
         studentMemberUpdateLog.setOldEndTime(student.getMembershipEndTime());
         studentMemberUpdateLog.setMemo(memo);
-        if (endTime == null || endTime.compareTo(new Date()) < 0){
+        Date now = new Date();
+        if (endTime == null || endTime.compareTo(now) < 0){
             studentDao.cleanMember(userId);
         }else {
+            if(student.getMembershipStartTime() == null){
+                student.setMembershipStartTime(now);
+            }
+            student.setMemberRankSettingId(1);
             student.setMembershipEndTime(endTime);
             studentDao.updateStudentMember(student);
             studentMemberUpdateLog.setNewStartTime(student.getMembershipStartTime());