|
@@ -517,6 +517,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
if(classGradeVo==null){
|
|
if(classGradeVo==null){
|
|
throw new CustomException("班级不存在");
|
|
throw new CustomException("班级不存在");
|
|
}
|
|
}
|
|
|
|
+ if(classGradeVo.getStatus()!=1){
|
|
|
|
+ throw new CustomException("班级已失效");
|
|
|
|
+ }
|
|
ClassGradeGoods gradeGoods = iClassGradeGoodsService.getOne(new LambdaQueryWrapper<ClassGradeGoods>().eq(ClassGradeGoods::getGradeId,gradeId)
|
|
ClassGradeGoods gradeGoods = iClassGradeGoodsService.getOne(new LambdaQueryWrapper<ClassGradeGoods>().eq(ClassGradeGoods::getGradeId,gradeId)
|
|
.eq(ClassGradeGoods::getGoodsId,goodsId));
|
|
.eq(ClassGradeGoods::getGoodsId,goodsId));
|
|
if(gradeGoods==null){
|
|
if(gradeGoods==null){
|
|
@@ -541,6 +544,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
ClassGradeQueryBo bo = new ClassGradeQueryBo();
|
|
ClassGradeQueryBo bo = new ClassGradeQueryBo();
|
|
bo.setGoodsId(goodsId);
|
|
bo.setGoodsId(goodsId);
|
|
bo.setPastDue(1L);
|
|
bo.setPastDue(1L);
|
|
|
|
+ bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
|
|
List<ClassGradeVo> classGradeVoList = iClassGradeService.queryList(bo);
|
|
List<ClassGradeVo> classGradeVoList = iClassGradeService.queryList(bo);
|
|
for(int i = 0; i < classGradeVoList.size(); i++){
|
|
for(int i = 0; i < classGradeVoList.size(); i++){
|
|
ClassGradeVo classGradeVo = classGradeVoList.get(i);
|
|
ClassGradeVo classGradeVo = classGradeVoList.get(i);
|