submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeGoodsMapper.java

@@ -15,4 +15,6 @@ import java.util.List;
 public interface ClassGradeGoodsMapper extends BaseMapper<ClassGradeGoods> {
 
     List<ClassGradeGoods> getGradeGoodsList(@Param("goodsId") Long goodsId);
+
+    List<ClassGradeGoods> getClassGradeByIds(@Param("goodsIds")List<Long> goodsIds);
 }

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

@@ -51,4 +51,6 @@ public interface IClassGradeGoodsService extends IService<ClassGradeGoods> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<ClassGradeGoods> getGradeGoodsList(Long goodsId);
+
+	List<ClassGradeGoods> getClassGradeByIds(List<Long> goodsIds);
 }

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

@@ -102,4 +102,9 @@ public class ClassGradeGoodsServiceImpl extends ServiceImpl<ClassGradeGoodsMappe
     public List<ClassGradeGoods> getGradeGoodsList(Long goodsId) {
         return baseMapper.getGradeGoodsList(goodsId);
     }
+
+    @Override
+    public List<ClassGradeGoods> getClassGradeByIds(List<Long> goodsIds) {
+        return baseMapper.getClassGradeByIds(goodsIds);
+    }
 }

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

@@ -1807,9 +1807,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (goodsList.size() > 1){
                 //该业务层次下有多个商品
                 List<Long> goodsIds = goodsList.stream().filter(item -> !item.getGoodsId().equals(goodsId)).map(Goods::getGoodsId).collect(Collectors.toList());
-                List<ClassGradeGoods> goodsGradeList = iClassGradeGoodsService
-                        .list(new LambdaQueryWrapper<ClassGradeGoods>()
-                        .in(ClassGradeGoods::getGoodsId, goodsIds));
+                //获取预报名班级
+                List<ClassGradeGoods> goodsGradeList = iClassGradeGoodsService.getClassGradeByIds(goodsIds);
                 if (CollectionUtils.isNotEmpty(goodsGradeList)){
                     Map<Long, List<ClassGradeGoods>> map = goodsGradeList.stream().collect(Collectors.groupingBy(ClassGradeGoods::getGoodsId));
                     List<ClassGradeSortBo> sortList = new ArrayList<>();

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeGoodsMapper.xml

@@ -15,4 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT cgg.* FROM class_grade_goods cgg INNER JOIN class_grade cg ON cgg.grade_id = cg.grade_id WHERE cgg.goods_id = #{goodsId} AND cg.`status` = 1
     </select>
 
+    <select id="getClassGradeByIds" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.grade.domain.ClassGradeGoods">
+        SELECT cgg.* FROM class_grade_goods cgg INNER JOIN class_grade cg ON cgg.grade_id = cg.grade_id
+        WHERE cg.`status` = 1 AND cg.class_status = 0
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND cgg.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>