fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuMapper.java

@@ -21,19 +21,19 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
 
     List<CourseUserMenuVo> menuList(CourseMenuQueryBo bo);
 
-    Integer rebuildCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
+    Integer rebuildCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
-    Integer rebuildSectionCheck(@Param("sectionId") Long id,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
+    Integer rebuildSectionCheck(@Param("sectionId") Long id,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
-    Integer rebuildChapterCheck(@Param("chapterId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("courseId")Long courseId);
+    Integer rebuildChapterCheck(@Param("chapterId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
-    Integer rebuildModuleCheck(@Param("moduleId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("courseId")Long courseId);
+    Integer rebuildModuleCheck(@Param("moduleId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
-    Integer learningCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
+    Integer learningCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
-    Long getStudyDuration(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
+    Long getStudyDuration(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
-    Integer auditCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId);
+    Integer auditCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId,@Param("courseId")Long courseId,@Param("orderGoodsId") Long orderGoodsId);
 
     List<CourseUserMenuVo> getGoodsMenuList(CourseMenuQueryBo bo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -230,36 +230,39 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
 
     @Override
     public List<CourseUserMenuVo> menuList(CourseMenuQueryBo bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("订单商品缺失");
+        }
         List<CourseUserMenuVo> courseMenuVos = baseMapper.menuList(bo);
         if (bo.getUserId() != null) {
             for (CourseUserMenuVo courseMenuVo : courseMenuVos) {
                 //为节的时候查询重修情况，和是否已学习
                 if (courseMenuVo.getType().equals(3)) {
-                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
+                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId(),bo.getOrderGoodsId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
-                    Integer audit = baseMapper.auditCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
+                    Integer audit = baseMapper.auditCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId(),bo.getOrderGoodsId());
                     if (audit > 0) {
                         courseMenuVo.setAudit(1L);
                     }
-                    Integer learning = baseMapper.learningCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId(),bo.getOrderGoodsId());
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);
                     }
-                    Long studyDuration = baseMapper.getStudyDuration(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
+                    Long studyDuration = baseMapper.getStudyDuration(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId(),bo.getOrderGoodsId());
                     courseMenuVo.setStudyDuration(studyDuration);
                 }
                 //为章的时候查询重修情况
                 if (courseMenuVo.getType().equals(2)){
-                    Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
+                    Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId(),bo.getOrderGoodsId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
                 }
                 //为模块的时候查询重修情况
                 if (courseMenuVo.getType().equals(1)){
-                    Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId());
+                    Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),bo.getCourseId(),bo.getOrderGoodsId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
@@ -288,31 +291,31 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                 }
                 //为节的时候查询重修情况，和是否已学习
                 if (courseMenuVo.getType().equals(3)) {
-                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());
+                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId(),bo.getOrderGoodsId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
-                    Integer audit = baseMapper.auditCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());
+                    Integer audit = baseMapper.auditCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId(),bo.getOrderGoodsId());
                     if (audit > 0) {
                         courseMenuVo.setAudit(1L);
                     }
-                    Integer learning = baseMapper.learningCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId(),bo.getOrderGoodsId());
                     if (learning > 0) {
                         courseMenuVo.setLearning(1L);
                     }
-                    Long studyDuration = baseMapper.getStudyDuration(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());
+                    Long studyDuration = baseMapper.getStudyDuration(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId(),bo.getOrderGoodsId());
                     courseMenuVo.setStudyDuration(studyDuration);
                 }
                 //为章的时候查询重修情况
                 if (courseMenuVo.getType().equals(2)){
-                    Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());
+                    Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId(),bo.getOrderGoodsId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
                 }
                 //为模块的时候查询重修情况
                 if (courseMenuVo.getType().equals(1)){
-                    Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId());
+                    Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId(),courseMenuVo.getCourseId(),bo.getOrderGoodsId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsSectionListBo.java

@@ -23,4 +23,7 @@ public class GoodsSectionListBo implements Serializable {
 
     @ApiModelProperty("是否重修目录：1是 0否")
     private Integer rebuild;
+
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

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

@@ -687,6 +687,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 
     @Override
     public List<GoodsSectionListVo> getGoodsSectionList(GoodsSectionListBo bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("订单商品ID");
+        }
         List<GoodsSectionListVo> resultVos = baseMapper.getGoodsSectionList(bo.getGoodsId());
         if (CollectionUtils.isEmpty(resultVos)){
             return new ArrayList<>();
@@ -696,7 +699,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         }
         //获取需要重修的节
         resultVos.forEach(item -> {
-            Integer rebuild = courseMenuMapper.rebuildSectionCheck(item.getSectionId(),item.getModuleId(), item.getChapterId(),bo.getGradeId(), bo.getUserId(),item.getCourseId());
+            Integer rebuild = courseMenuMapper.rebuildSectionCheck(item.getSectionId(),item.getModuleId(), item.getChapterId(),bo.getGradeId(), bo.getUserId(),item.getCourseId(),bo.getOrderGoodsId());
             if (rebuild > 0) {
                 item.setRebuild(1);
             }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -250,6 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.chapter_id=#{chapterId}
           and up.course_id=#{courseId}
           and up.section_id=#{typeId}
+        and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
             <if test="examId != null and examId > 0">
                 and up.exam_id=#{examId}
                 and up.`type` = 2
@@ -271,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and usr.course_id=#{courseId}
           and usr.section_id=#{typeId}
           AND usr.current_status =1
+          and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
     </select>
 
     <select id="learningExamCheck" parameterType="map"  resultType="integer">
@@ -328,6 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.exam_id=#{examId}
           AND ups.period_status =1
           and ups.`status` = 1
+          and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
     </select>
 
     <delete id="deleteByIdAndTenant" parameterType="map" >

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuMapper.xml

@@ -275,6 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.course_id=#{courseId}
           and up.section_id=#{sectionId}
           AND ups.period_status =1
+          and (up.order_goods_id = #{orderGoodsId} or up.order_goods_id is null )
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
 
@@ -295,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.chapter_id= #{chapterId}
           and up.course_id=#{courseId}
           and up.section_id=#{sectionId}
+          and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
           AND ups.period_status =1
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
@@ -314,6 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.section_id=#{sectionId}
           AND ups.period_status =1
           and ups.`status` = 1
+          and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
     </select>
 
     <select id="rebuildChapterCheck" parameterType="map"  resultType="Integer">
@@ -344,6 +347,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND up.module_id= #{moduleId}
           AND up.course_id=#{courseId}
           AND ups.period_status =1
+          and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
     <select id="learningCheck" parameterType="map"  resultType="Integer">
@@ -360,6 +364,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and up.section_id=#{sectionId}
           and up.course_id=#{courseId}
           AND ups.period_status =1
+          and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
           and ups.record_end_time is not null
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleChapterMapper.xml

@@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             up.grade_id =#{gradeId}
           AND up.user_id = #{userId}
           AND up.module_id= #{moduleId}
+        and (up.order_goods_id=#{orderGoodsId} or up.order_goods_id is null )
         <if test="chapterId != null ">
           and up.chapter_id=#{chapterId}
         </if>