fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CoursePhotoLogAddBo.java

@@ -66,4 +66,5 @@ public class CoursePhotoLogAddBo {
     /** 课程ID */
     @ApiModelProperty("课程ID")
     private Long courseId;
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CoursePhotoLog.java

@@ -60,4 +60,5 @@ private static final long serialVersionUID=1L;
     private String timeInterval;
     /** 课程ID */
     private Long courseId;
+    private Long orderGoodsId;
 }

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

@@ -376,8 +376,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean editRebuild(ClassGradeUserQueryBo bo) {
-        if(Validator.isEmpty(bo.getGradeId())||Validator.isEmpty(bo.getUserId())){
+        if(Validator.isEmpty(bo.getGradeId())||Validator.isEmpty(bo.getUserId())||Validator.isEmpty(bo.getOrderGoodsId())){
             throw new CustomException("参数错误");
         }
         //将该班级下的学员作弊的节改成待重修
@@ -403,6 +404,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             objectLambdaUpdateWrapper.eq(CoursePhotoLog::getGoodsId, vo.getGoodsId());
             objectLambdaUpdateWrapper.eq(CoursePhotoLog::getSectionId,vo.getSectionId());
             objectLambdaUpdateWrapper.eq(CoursePhotoLog::getGradeId,vo.getGradeId());
+            objectLambdaUpdateWrapper.eq(Validator.isNotEmpty(vo.getOrderGoodsId()),CoursePhotoLog::getOrderGoodsId,vo.getOrderGoodsId());
             objectLambdaUpdateWrapper.eq(CoursePhotoLog::getModuleId,vo.getModuleId());
             objectLambdaUpdateWrapper.eq(CoursePhotoLog::getChapterId,vo.getChapterId());
             objectLambdaUpdateWrapper.eq(CoursePhotoLog::getCourseId,vo.getCourseId());
@@ -415,6 +417,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             objectLambdaUpdateWrapper1.eq(UserStudyRecord::getGoodsId, vo.getGoodsId());
             objectLambdaUpdateWrapper1.eq(UserStudyRecord::getSectionId,vo.getSectionId());
             objectLambdaUpdateWrapper1.eq(UserStudyRecord::getGradeId,vo.getGradeId());
+            objectLambdaUpdateWrapper1.eq(Validator.isNotEmpty(vo.getOrderGoodsId()),UserStudyRecord::getOrderGoodsId,vo.getOrderGoodsId());
             objectLambdaUpdateWrapper1.eq(UserStudyRecord::getModuleId,vo.getModuleId());
             objectLambdaUpdateWrapper1.eq(UserStudyRecord::getChapterId,vo.getChapterId());
             objectLambdaUpdateWrapper1.eq(UserStudyRecord::getCourseId,vo.getCourseId());
@@ -427,6 +430,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getGoodsId, vo.getGoodsId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getExamId,vo.getExamId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getGradeId,vo.getGradeId());
+            objectLambdaUpdateWrapper2.eq(Validator.isNotEmpty(vo.getOrderGoodsId()),UserBankRecord::getOrderGoodsId,vo.getOrderGoodsId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getModuleId,vo.getModuleId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getChapterId,vo.getChapterId());
             objectLambdaUpdateWrapper2.eq(UserBankRecord::getCourseId,vo.getCourseId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserBankRecordQueryBo.java

@@ -86,5 +86,5 @@ public class UserBankRecordQueryBo extends BaseEntity {
 
 	@ApiModelProperty("周查询结束时间")
 	private Long searchWeekEndTime;
-
+	private Long orderGoodsId;
 }

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

@@ -152,8 +152,8 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long insertByAddBo(UserBankRecordAddBo bo) {
-        if(Validator.isEmpty(bo.getGradeId())){
-            throw new CustomException("参数缺失");
+        if(Validator.isEmpty(bo.getGradeId())||Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("OrderGoodsId参数缺失");
         }
         UserBankRecord add = BeanUtil.toBean(bo, UserBankRecord.class);
         validEntityBeforeSave(add);
@@ -321,6 +321,9 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
 
     @Override
     public Boolean checkBankRecord(UserBankRecordQueryBo bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("缺失OrderGoodsId");
+        }
         List<Integer> counts = baseMapper.checkBankRecord(bo);
         long count = counts.stream().filter(x -> ObjectUtils.isNotNull(x) && x > 0).count();
         return ObjectUtils.isNotNull(count) && count > 0;

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

@@ -499,6 +499,7 @@
           AND ups.`status` = 0
           AND up.exam_id = 0
           and up.grade_id = #{gradeId}
+          and (up.order_goods_id = #{orderGoodsId} or up.order_goods_id is null)
         UNION
         SELECT
             ups.id,
@@ -518,6 +519,7 @@
           AND ups.`status` = 0
           AND up.section_id = 0
           and up.grade_id = #{gradeId}
+          and (up.order_goods_id = #{orderGoodsId} or up.order_goods_id is null)
     </select>
 
     <select id="goodsRebuildStatus" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultType="Long">

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

@@ -212,6 +212,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gradeId != null and gradeId != ''">
             AND ubr.grade_id = #{gradeId}
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != ''">
+            AND ubr.order_goods_id = #{orderGoodsId}
+        </if>
         <if test="goodsId != null and goodsId != ''">
             AND ubr.goods_id = #{goodsId}
         </if>