fix 业务层次

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -334,7 +334,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 //增加购买用户的学习次数
                 OrderGoodsQueryBo bo = new OrderGoodsQueryBo();
                 bo.setGoodsId(entity.getGoodsId());
-                List<OrderGoodsVo> goodsList = iOrderGoodsService.queryList(bo);
+                List<OrderGoodsVo> goodsList = iOrderGoodsService.selectList(bo);
                 for(OrderGoodsVo vo : goodsList){
                     //增加学习次数
                     OrderGoods orderGoods = new OrderGoods();

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

@@ -355,8 +355,8 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             if (baseMapper.selectPeriod(entity) < 1) {
                 //有学习记录时审核记录0作弊或3待重修，完整播放也添加结束时间
                 UserPeriodStatus userPeriodStatus = baseMapper.selectPeriodCount(entity);
-                if (userPeriodStatus.getStatus() == 0) {                //作弊
-                    userPeriodStatus.setPeriodStatus(0);
+                if (userPeriodStatus.getStatus() == 0) {                //作弊不再流入数据
+                    /*userPeriodStatus.setPeriodStatus(0);
                     iUserPeriodStatusService.updateById(userPeriodStatus);
                     UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
                     userPeriodStatusAddBo.setPeriodStatus(1);
@@ -370,12 +370,15 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                         userPeriodStatusAddBo.setStatus(2);
                     }
                     iUserPeriodStatusService.save(userPeriodStatusAddBo);
-                    periodId = userPeriodStatusAddBo.getId();
+                    periodId = userPeriodStatusAddBo.getId();*/
                 } else if (userPeriodStatus.getStatus() == 3) {                //待重修
                     userPeriodStatus.setPeriodStatus(1);
                     userPeriodStatus.setCreateTime(DateUtils.getNowTime());
                     userPeriodStatus.setUpdateTime(DateUtils.getNowTime());
-                    if (entity.getStatus() != null && entity.getStatus() == 1) {
+                    if(Validator.isEmpty(userPeriodStatus.getRecordStartTime())){ //待重修第一次学习进来
+                        userPeriodStatus.setRecordStartTime(entity.getStartTime());
+                    }
+                    if (entity.getStatus() != null && entity.getStatus() == 1) {  //待重修看完
                         userPeriodStatus.setRecordEndTime(entity.getEndTime());
                         userPeriodStatus.setStatus(2);
                     }

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -966,7 +966,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             (
                 SELECT
-                    MAX( usr.study_duration ) study_duration
+                    MAX( usr.video_current_time ) study_duration
                 FROM
                     user_study_record usr
                 WHERE