|
@@ -816,28 +816,30 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
&& classGradeVo.getPeriodStatus() == 1
|
|
|
&& (DateUtils.getNowTime() >= goodsUserVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsUserVo.getServiceEndTime())){
|
|
|
UserSubscribe userSubscribe = baseMapper.getUserSub(bo.getUserId(),goodsUserVo.getGoodsId());
|
|
|
- Long examTime = 0L;
|
|
|
- if (ObjectUtils.isNotNull(userSubscribe.getApplySiteEndTime())){
|
|
|
- Long examTime1 = userSubscribe.getApplySiteExamTime();
|
|
|
- String applySiteEndTime = userSubscribe.getApplySiteEndTime();
|
|
|
- String s = DateUtils.timestampToDateFormat(examTime1, "yyyy-MM-dd");
|
|
|
- String format = String.format("%s %s", s, applySiteEndTime);
|
|
|
- examTime = DateUtils.dateTimeSec("yyyy-MM-dd HH:mm", format);
|
|
|
- }
|
|
|
- if (examTime > 0 && DateUtils.getNowTime() > examTime && ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
|
|
|
- goodsUserVo.setSubscribeSign(1);
|
|
|
- }else {
|
|
|
- if (ObjectUtils.isNull(userSubscribe)){
|
|
|
+ if(Validator.isNotEmpty(userSubscribe)){
|
|
|
+ Long examTime = 0L;
|
|
|
+ if (ObjectUtils.isNotNull(userSubscribe.getApplySiteEndTime())){
|
|
|
+ Long examTime1 = userSubscribe.getApplySiteExamTime();
|
|
|
+ String applySiteEndTime = userSubscribe.getApplySiteEndTime();
|
|
|
+ String s = DateUtils.timestampToDateFormat(examTime1, "yyyy-MM-dd");
|
|
|
+ String format = String.format("%s %s", s, applySiteEndTime);
|
|
|
+ examTime = DateUtils.dateTimeSec("yyyy-MM-dd HH:mm", format);
|
|
|
+ }
|
|
|
+ if (examTime > 0 && DateUtils.getNowTime() > examTime && ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
|
|
|
goodsUserVo.setSubscribeSign(1);
|
|
|
- }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
|
|
|
- && userSubscribe.getExamStatus() == 1
|
|
|
- && ObjectUtils.isNull(userSubscribe.getResult())){
|
|
|
- goodsUserVo.setSubscribeSign(2);
|
|
|
- }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
|
|
|
- && userSubscribe.getExamStatus() == 0){
|
|
|
- goodsUserVo.setSubscribeSign(4);
|
|
|
- }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
|
|
|
- goodsUserVo.setSubscribeSign(3);
|
|
|
+ }else {
|
|
|
+ if (ObjectUtils.isNull(userSubscribe)){
|
|
|
+ goodsUserVo.setSubscribeSign(1);
|
|
|
+ }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
|
|
|
+ && userSubscribe.getExamStatus() == 1
|
|
|
+ && ObjectUtils.isNull(userSubscribe.getResult())){
|
|
|
+ goodsUserVo.setSubscribeSign(2);
|
|
|
+ }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
|
|
|
+ && userSubscribe.getExamStatus() == 0){
|
|
|
+ goodsUserVo.setSubscribeSign(4);
|
|
|
+ }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
|
|
|
+ goodsUserVo.setSubscribeSign(3);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|