merge

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

@@ -400,19 +400,23 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         List<OrderUserGoodsVo> allList = new ArrayList<>();
         for(String idCard : bo.getIdCard()){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+                    .eq(User::getIdCard,idCard).last("limit 1"));
             if(Validator.isNull(user)){
-                throw new CustomException("该身份证号码用户不存在");
+                OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
+                goodsBo.setIdCard(idCard);
+                goodsBo.setGoodsList(new ArrayList<>());
+                allList.add(goodsBo);
+            }else{
+                GoodsQueryBo queryBo = new GoodsQueryBo();
+                queryBo.setSubjectId(bo.getSubjectId());
+                queryBo.setBusinessId(bo.getBusinessId());
+                queryBo.setUserId(user.getUserId());
+                List<OrderGoodsVo> list = this.baseMapper.listUserSubjectGoods(queryBo);
+                OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
+                goodsBo.setIdCard(idCard);
+                goodsBo.setGoodsList(list);
+                allList.add(goodsBo);
             }
-            GoodsQueryBo queryBo = new GoodsQueryBo();
-            queryBo.setSubjectId(bo.getSubjectId());
-            queryBo.setBusinessId(bo.getBusinessId());
-            queryBo.setUserId(user.getUserId());
-            List<OrderGoodsVo> list = this.baseMapper.listUserSubjectGoods(queryBo);
-            OrderUserGoodsVo goodsBo = new OrderUserGoodsVo();
-            goodsBo.setIdCard(idCard);
-            goodsBo.setGoodsList(list);
-            allList.add(goodsBo);
         }
         return allList;
     }

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

@@ -136,11 +136,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             course_menu m
                 LEFT JOIN course_module cm ON m.menu_id = cm.module_id
-                AND m.type = 1
+                AND m.type = 1 AND cm.`status` !=-1
                 LEFT JOIN course_chapter cc ON m.menu_id = cc.chapter_id
-                AND m.type = 2
+                AND m.type = 2 AND cc.`status` !=-1
                 LEFT JOIN course_section cs ON m.menu_id = cs.section_id
-                AND m.type = 3
+                AND m.type = 3 AND cs.`status` !=-1
         WHERE
             m.course_id = #{courseId}
         <if test="type != null and type != ''">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsCourseMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.category_name,
         cs.subject_name,
                gc.sort as g_sort,
-        gc.course_show
+        c.course_show
         FROM
         goods_course gc
         LEFT JOIN course c ON gc.course_id = c.course_id