merge

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

@@ -49,7 +49,7 @@ public interface CourseMapper extends BaseMapper<Course> {
     Long rebuildNext(ClassGradeUserQueryBo bo);
 
     //不传班级可能出现用户重复购买情况
-    ClassGradeVo gradeIdSelect(@Param("userId") Long userId, @Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId);
+    ClassGradeVo gradeIdSelect(@Param("userId") Long userId, @Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId, @Param("orderGoodsId") Long orderGoodsId);
 
     @InterceptorIgnore(tenantLine = "true")
     ClassGradeVo gradeIdSelectTenant(@Param("userId") Long userId, @Param("goodsId") Long goodsId, @Param("gradeId") Long gradeId,@Param("tenantId") Long tenantId);

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

@@ -468,7 +468,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         //用户课程得详细信息
         for (GoodsUserVo goodsUserVo : goodsUserVos) {
             //获得当前所在班级
-            ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId(),goodsUserVo.getGradeId());
+            ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId(),goodsUserVo.getGradeId(),goodsUserVo.getOrderGoodsId());
             if(Validator.isEmpty(classGradeVo)){
                 continue;
             }
@@ -517,6 +517,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             subjectStudyRecordQueryBo.setGoodsId(goodsUserVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(bo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(goodsUserVo.getGradeId());
+            subjectStudyRecordQueryBo.setOrderGoodsId(goodsUserVo.getOrderGoodsId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
@@ -692,7 +693,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         //用户课程得详细信息
         for (GoodsUserVo goodsUserVo : goodsUserVos) {
             //获得当前所在班级
-            ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId(),goodsUserVo.getGradeId());
+            ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId(),goodsUserVo.getGradeId(),goodsUserVo.getOrderGoodsId());
             if(Validator.isEmpty(classGradeVo)){
                 continue;
             }
@@ -702,6 +703,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             subjectStudyRecordQueryBo.setGoodsId(goodsUserVo.getGoodsId());
             subjectStudyRecordQueryBo.setUserId(bo.getUserId());
             subjectStudyRecordQueryBo.setGradeId(goodsUserVo.getGradeId());
+            subjectStudyRecordQueryBo.setOrderGoodsId(goodsUserVo.getOrderGoodsId());
             List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();

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

@@ -948,7 +948,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public GoodsVo selectUserDetail(CourseQueryBo bo) {
         GoodsVo goodsVo = baseMapper.selectUserDetail(bo);
         //获得当前所在班级
-        ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(bo.getUserId(), bo.getGoodsId(), null);
+        ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(bo.getUserId(), bo.getGoodsId(), null,null);
         if (Validator.isNotEmpty(classGradeVo)) {
             goodsVo.setGradeId(classGradeVo.getGradeId());
         }

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

@@ -601,7 +601,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             if(goodsVo.getGoodsType()==1){
                 //视频商品
                 //获得当前所在班级
-                ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(goodsVo.getUserId(),goodsVo.getGoodsId(),goodsVo.getGradeId());
+                ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(goodsVo.getUserId(),goodsVo.getGoodsId(),goodsVo.getGradeId(),goodsVo.getOrderGoodsId());
                 if(Validator.isEmpty(classGradeVo)){
                     continue;
                 }

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

@@ -1010,7 +1010,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             Long goodsId = null;
             for (Long item : goodsIds) {
                 //获得当前所在班级
-                ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(userId,item,null);
+                ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(userId,item,null,null);
                 if(Validator.isEmpty(classGradeVo)||classGradeVo.getPeriodStatus()!=1){
                     continue;
                 }
@@ -1033,7 +1033,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
             userSubscribeAddBo.setGoodsId(goodsId);
             //获得当前所在班级
-            ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(userId,goodsId,null);
+            ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(userId,goodsId,null,null);
             if(Validator.isEmpty(classGradeVo)||classGradeVo.getPeriodStatus()!=1){
                 userSubscribeImport.setCause("该学员学时审核未通过");
                 userSubscribeImports.add(userSubscribeImport);
@@ -1271,7 +1271,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSubscribeAddBo.setApplyId(applyId);
 
             //获得当前所在班级
-            ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(userId,goodsId,null);
+            ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(userId,goodsId,null,null);
             if(Validator.isEmpty(classGradeVo)||classGradeVo.getPeriodStatus()!=1){
                 userSubscribeImport.setCause("该学员学时审核未通过");
                 userSubscribeImports.add(userSubscribeImport);

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

@@ -801,6 +801,9 @@
             1=1
         <if test="gradeId != null and gradeId != ''">
             and cg.grade_id = #{gradeId}
+        </if>
+        <if test="orderGoodsId != null and orderGoodsId != ''">
+            and cgu.order_goods_id = #{orderGoodsId}
         </if>
           and cg.`status` =1 and cgg.goods_id = #{goodsId} and cgu.change_grade = 0 and cgu.user_id=#{userId}
         order by cg.create_time desc LIMIT 1