|
@@ -344,11 +344,15 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
|
|
|
if(Validator.isNotEmpty(add.getStatus())&&add.getStatus()==1){
|
|
|
lastVo.setStatus(1);
|
|
|
}
|
|
|
- lastVo.setStudyDuration(add.getStudyDuration()+lastVo.getStudyDuration());
|
|
|
- UserStudyRecord update = BeanUtil.toBean(lastVo, UserStudyRecord.class);
|
|
|
- update.setUpdateTime(DateUtils.getNowTime());
|
|
|
- this.updateById(update);
|
|
|
- add.setRecordId(update.getRecordId());
|
|
|
+ if(add.getOrderGoodsId().equals(lastVo.getOrderGoodsId())&&(add.getSectionId().equals(lastVo.getSectionId()))&&(add.getGoodsId().equals(lastVo.getGoodsId()))){
|
|
|
+ lastVo.setStudyDuration(add.getStudyDuration()+lastVo.getStudyDuration());
|
|
|
+ UserStudyRecord update = BeanUtil.toBean(lastVo, UserStudyRecord.class);
|
|
|
+ update.setUpdateTime(DateUtils.getNowTime());
|
|
|
+ this.updateById(update);
|
|
|
+ add.setRecordId(update.getRecordId());
|
|
|
+ }else{
|
|
|
+ this.save(add);
|
|
|
+ }
|
|
|
}
|
|
|
}else{
|
|
|
this.save(add);
|