|
@@ -451,7 +451,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
cloudTeacherOrderService.insert(cto);
|
|
|
//修改student 查询学生现在的会员过期没,如果过期了就按现在时间来,如果没过期就在结束时间上叠加
|
|
|
logger.info("orderCallback >>> member MembershipStartTime {} now {}", student.getMembershipStartTime(), now);
|
|
|
- if (Objects.nonNull(student.getMembershipStartTime()) && student.getMembershipEndTime().getTime() >= now.toDate().getTime()) {
|
|
|
+ if (Objects.nonNull(student.getMembershipStartTime())
|
|
|
+ && Objects.nonNull(student.getMembershipEndTime())
|
|
|
+ && student.getMembershipEndTime().getTime() >= now.toDate().getTime()) {
|
|
|
student.setMembershipEndTime(DateUtil.addMonths(student.getMembershipEndTime(), cto.getTime()));
|
|
|
} else {
|
|
|
student.setMembershipStartTime(cto.getStartTime());
|