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

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -393,7 +393,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                                     UserStudyRecordPhoto photo = photoList.get(0);
                                     if((DateUtils.getNowTime().longValue()-photo.getCreateTime().longValue())<(videoTime.longValue()-20)){
                                         log.info("视频学习时长不达标"+JSON.toJSONString(bo));
-                                        throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-20-(DateUtils.getNowTime().longValue()-photo.getCreateTime().longValue())),558);
+                                    //    throw new CustomException("视频学习时长不达标,"+(videoTime.longValue()-20-(DateUtils.getNowTime().longValue()-photo.getCreateTime().longValue())),558);
                                     }
                                 }
                                 if(photoList.size()<num){
@@ -559,6 +559,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             gradeUserQueryBo.setGoodsId(bo.getGoodsId());
             gradeUserQueryBo.setUserId(bo.getUserId());
             gradeUserQueryBo.setGradeId(bo.getGradeId());
+            gradeUserQueryBo.setOrderGoodsId(bo.getOrderGoodsId());
             ClassPeriodStudentVo classPeriodStudentVo = iClassGradeUserService.getUserPeriodStatus(gradeUserQueryBo);
             Integer gradePeriodStatus = classPeriodStudentVo.getGradePeriodStatus();
            /* Long secLong = 0L;