fix 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -811,8 +811,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
 
             }
-            //BigDecimal divide = new BigDecimal(studyLong.toString()).divide(new BigDecimal(secLong.toString()),2,BigDecimal.ROUND_HALF_UP);
-            //classGradeStudentVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
             //总节数
             classPeriodStudentVo.setSecAllNum(secLong);
             //学习节数

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -146,6 +146,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             UserStudyRecordQueryBo userStudyRecordQueryBo = new UserStudyRecordQueryBo();
             userStudyRecordQueryBo.setGoodsId(goods.getGoodsId());
             userStudyRecordQueryBo.setUserId(order.getUserId());
+            userStudyRecordQueryBo.setGradeId(orderGoods.getGradeId());
             Long userSeeTime = iUserStudyRecordService.getUserSeeTime(userStudyRecordQueryBo);
             if(userSeeTime.longValue()>=(30*60)){ //超30分钟不满足退款
                 throw new CustomException("不满足退款");
@@ -231,7 +232,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             lqw.eq( ClassGradeUser::getUserId, userId);
             iClassGradeUserService.remove(lqw);
             //清除课程所有历史
-            iUserStudyRecordService.delUserCourseHistory(userId,goodsId);
+            iUserStudyRecordService.delUserCourseHistory(userId,goodsId,gradeId,orderGoodsId);
         }
         if(goodsType==2){
             //删除题库历史

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

@@ -27,7 +27,7 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	UserStudyRecordVo queryLast(UserStudyRecordQueryBo bo);
 
-	Boolean delUserCourseHistory(Long userId,Long goodsId);
+	Boolean delUserCourseHistory(Long userId,Long goodsId, Long gradeId,Long orderGoodsId);
 
 	/**
 	 * 查询列表

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

@@ -158,28 +158,33 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     }
 
     @Override
-    public Boolean delUserCourseHistory(Long userId, Long goodsId) {
+    public Boolean delUserCourseHistory(Long userId, Long goodsId, Long gradeId,Long orderGoodsId) {
         //删除看视频历史历史
         LambdaQueryWrapper<UserStudyRecord> lqw = Wrappers.lambdaQuery();
         lqw.eq(UserStudyRecord::getGoodsId, goodsId);
         lqw.eq( UserStudyRecord::getUserId, userId);
+        lqw.eq( UserStudyRecord::getGradeId, gradeId);
         remove(lqw);
         //清除拍照历史
         LambdaQueryWrapper<CoursePhotoLog> lqw1 = Wrappers.lambdaQuery();
         lqw1.eq(CoursePhotoLog::getGoodsId, goodsId);
         lqw1.eq( CoursePhotoLog::getUserId, userId);
+        lqw1.eq( CoursePhotoLog::getGradeId, gradeId);
         iCoursePhotoLogService.remove(lqw1);
         //清除章卷历史
         LambdaQueryWrapper<UserBankRecord> lqw2 = Wrappers.lambdaQuery();
         lqw2.eq(UserBankRecord::getGoodsId, goodsId);
         lqw2.eq( UserBankRecord::getUserId, userId);
+        lqw2.eq( UserBankRecord::getGradeId, gradeId);
         iUserBankRecordService.remove(lqw2);
         //清除学时历史
         LambdaQueryWrapper<UserPeriod> lqw3 = Wrappers.lambdaQuery();
         lqw3.eq(UserPeriod::getGoodsId, goodsId);
         lqw3.eq( UserPeriod::getUserId, userId);
+        lqw3.eq( UserPeriod::getGradeId, gradeId);
         iUserPeriodService.remove(lqw3);
         //清除报考数据
+        //产品确定报考数据不考虑复购
         LambdaQueryWrapper<UserSubscribe> lqw4 = Wrappers.lambdaQuery();
         lqw4.eq(UserSubscribe::getGoodsId, goodsId);
         lqw4.eq( UserSubscribe::getUserId, userId);
@@ -188,6 +193,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         LambdaQueryWrapper<UserExamGoods> lqw5 = Wrappers.lambdaQuery();
         lqw5.eq(UserExamGoods::getGoodsId, goodsId);
         lqw5.eq( UserExamGoods::getUserId, userId);
+        lqw5.eq( UserExamGoods::getOrderGoodsId, orderGoodsId);
         iUserExamGoodsService.remove(lqw5);
         return null;
     }

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

@@ -1019,6 +1019,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHERE
                     usr.user_id = #{userId}
                   AND usr.goods_id = #{goodsId}
+                  AND usr.grade_id = #{gradeId}
                 GROUP BY
                     usr.section_id
             )a