Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -292,7 +292,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         Date startTime = DateUtil.trunc(now);
         Date endTime = this.calcCloudTeacherOrderTime(cloudTeacherOrder, startTime, now);
         cloudTeacherOrder.setStartTime(startTime);
-        cloudTeacherOrder.setEndTime(endTime);
+        cloudTeacherOrder.setEndTime(DateUtil.addDays(endTime,1));
         cloudTeacherOrder.setStatus(2);
         if(Objects.isNull(cloudTeacherOrder.getId())){
             cloudTeacherOrderDao.insert(cloudTeacherOrder);

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

@@ -633,6 +633,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 TempLittleArtistTrainingCampUserRelation tempLittleArtistTrainingCamp = new TempLittleArtistTrainingCampUserRelation();
                 tempLittleArtistTrainingCamp.setUserId(studentPaymentOrder.getUserId());
                 tempLittleArtistTrainingCamp.setState("NOT_APPLY");
+                tempLittleArtistTrainingCamp.setCreateTime(nowDate);
                 tempLittleArtistTrainingCampUserRelationDao.insert(tempLittleArtistTrainingCamp);
                 //赠送优惠券
 //                Integer giveCouponId = activity.getGiveCouponId();
@@ -725,7 +726,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         cto.setTime(totalMonth.intValue());
         cto.setAmount(studentPaymentOrder.getActualAmount().add(studentPaymentOrder.getBalancePaymentAmount()));
         cto.setStartTime(now.toDate());
-        cto.setEndTime(now.plusMonths(totalMonth.intValue()).toDate());
+        cto.setEndTime(DateUtil.addDays(now.plusMonths(totalMonth.intValue()).toDate(),1));
         cto.setOrderId(studentPaymentOrder.getId());
         cto.setCreateTime(new Date());
         cloudTeacherOrderService.insert(cto);

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

@@ -492,7 +492,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if(student.getMembershipEndTime() != null && student.getMembershipEndTime().after(nowDate)){
         	nowDate = student.getMembershipEndTime();
         }
-        student.setMembershipEndTime(getMembershipEndTime(periodEnum,nowDate,times));
+        Date membershipEndTime = getMembershipEndTime(periodEnum, nowDate, times);
+        //所有购买会员的额外加一天时间
+        student.setMembershipEndTime(DateUtil.addDays(membershipEndTime, 1));
         student.setMemberRankSettingId(memberRankSettingId);
         this.update(student);
 	}