|
@@ -45,6 +45,7 @@ import com.zhongzheng.modules.goods.service.IGoodsQuestionRelService;
|
|
import com.zhongzheng.modules.goods.service.IGoodsService;
|
|
import com.zhongzheng.modules.goods.service.IGoodsService;
|
|
import com.zhongzheng.modules.goods.service.IQuestionMerchantService;
|
|
import com.zhongzheng.modules.goods.service.IQuestionMerchantService;
|
|
import com.zhongzheng.modules.goods.vo.GoodsSectionListVo;
|
|
import com.zhongzheng.modules.goods.vo.GoodsSectionListVo;
|
|
|
|
+import com.zhongzheng.modules.goods.vo.GoodsSectionNumVo;
|
|
import com.zhongzheng.modules.goods.vo.GoodsVo;
|
|
import com.zhongzheng.modules.goods.vo.GoodsVo;
|
|
import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
|
|
import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
|
|
import com.zhongzheng.modules.grade.domain.ClassGradeUser;
|
|
import com.zhongzheng.modules.grade.domain.ClassGradeUser;
|
|
@@ -586,11 +587,17 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
|
|
subjectStudyRecordQueryBo.setUserId(bo.getUserId());
|
|
subjectStudyRecordQueryBo.setUserId(bo.getUserId());
|
|
subjectStudyRecordQueryBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
subjectStudyRecordQueryBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
|
|
subjectStudyRecordQueryBo.setGradeId(goodsVo.getGradeId());
|
|
subjectStudyRecordQueryBo.setGradeId(goodsVo.getGradeId());
|
|
- List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
|
|
|
|
- for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
|
|
|
|
- secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
|
|
|
|
- studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
|
|
|
|
- studyStatus = studyStatus + subjectStudyRecordVo.getStudyStatus();
|
|
|
|
|
|
+// List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
|
|
|
|
+// for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
|
|
|
|
+// secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
|
|
|
|
+// studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
|
|
|
|
+// studyStatus = studyStatus + subjectStudyRecordVo.getStudyStatus();
|
|
|
|
+// }
|
|
|
|
+ GoodsSectionNumVo vo = iUserStudyRecordService.getGoodsSectionNum(subjectStudyRecordQueryBo);
|
|
|
|
+ if (ObjectUtils.isNotNull(vo)){
|
|
|
|
+ secLong = vo.getSectionNum();
|
|
|
|
+ studyLong = vo.getRecordNum();
|
|
|
|
+ studyStatus = studyStatus + vo.getStudyStatus().intValue();
|
|
}
|
|
}
|
|
goodsVo.setSecAllNum(secLong);
|
|
goodsVo.setSecAllNum(secLong);
|
|
goodsVo.setStuAllNum(studyLong);
|
|
goodsVo.setStuAllNum(studyLong);
|