submit

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

@@ -473,7 +473,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             goodsVoList.forEach(item -> {
                 List<ClassGradeGoods> gradeGoods = iClassGradeGoodsService
                         .list(new LambdaQueryWrapper<ClassGradeGoods>()
-                        .eq(ClassGradeGoods::getGoodsId, item.getGoodsId()));
+                        .eq(ClassGradeGoods::getGoodsId, item.getGoodsId())
+                        .orderByDesc(ClassGradeGoods::getCreateTime)
+                        );
                 if (CollectionUtils.isNotEmpty(gradeGoods)){
                     item.setGradeNum(Long.valueOf(gradeGoods.size()));
                     gradeGoods.forEach(gradeGoodsItem -> {
@@ -484,6 +486,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                         if (ObjectUtils.isNotNull(grade.getClassStartTime()) && grade.getClassEndTime() < DateUtils.getNowTime()){
                             return;
                         }
+                        if (ObjectUtils.isNotNull(item.getGradeId()) && ObjectUtils.isNotNull(item.getGradeName())){
+                            return;
+                        }
                         if (ObjectUtils.isNotNull(grade.getSevenCode())){
                             //七大员继教班级,计算班级人数
                             Integer classGradeNum = iOrderService.getClassGradeNum(grade.getSevenCode());