fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -88,6 +88,20 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("查询商品班级列表")
+    @GetMapping("/listGoods")
+    public TableDataInfo<ClassGradeVo> listGoods(ClassGradeQueryBo bo) {
+        startPage();
+        bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
+        bo.setPastDue(1L);
+        List<ClassGradeVo> list = iClassGradeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
     /**
      * 查询班级列表
      */

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

@@ -263,6 +263,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 studyCountLog.setOldGradeId(bo.getOldGradeId());
                 iStudyCountLogService.save(studyCountLog);
             }
+            redisCache.unlockLua(redisLockEntity);
         }
         return true;
     }
@@ -300,6 +301,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         .eq(ClassGradeUser::getStatus, 1)
                         .eq(ClassGradeUser::getGradeId, oldGradeId)
                         .last("limit 1"));
+                if(Validator.isEmpty(classGradeUser)){
+                    throw new CustomException("数据错误");
+                }
                 removeById(classGradeUser.getId());
 
                 OrderGoods orderGoods = new OrderGoods();
@@ -320,6 +324,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 iStudyCountLogService.save(studyCountLog);
 
             }
+            redisCache.unlockLua(redisLockEntity);
         }
         return true;
     }