|
@@ -624,7 +624,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
//用户课程得详细信息
|
|
|
for (GoodsUserVo goodsUserVo : goodsUserVos) {
|
|
|
//获得当前所在班级
|
|
|
- ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId(),goodsUserVo.getGradeId());
|
|
|
+ ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId(),goodsUserVo.getGradeId(),goodsUserVo.getOrderGoodsId());
|
|
|
if(Validator.isEmpty(classGradeVo)){
|
|
|
continue;
|
|
|
}
|
|
@@ -634,6 +634,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
subjectStudyRecordQueryBo.setGoodsId(goodsUserVo.getGoodsId());
|
|
|
subjectStudyRecordQueryBo.setUserId(bo.getUserId());
|
|
|
subjectStudyRecordQueryBo.setGradeId(goodsUserVo.getGradeId());
|
|
|
+ subjectStudyRecordQueryBo.setOrderGoodsId(goodsUserVo.getOrderGoodsId());
|
|
|
List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
|
|
|
for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
|
|
|
secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
|