fix 课程目录卷

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

@@ -250,6 +250,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @return
      */
     public boolean checkGrade(String goodsName,Long orderGoodsId,Long gradeId,Long userId){
+        //指定班级
         if(gradeId!=null){
             ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
             if(classGradeVo==null){
@@ -260,9 +261,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             lqw.eq(ClassGradeUser::getStatus,1);
             int studentNum = iClassGradeUserService.count(lqw);
             if(classGradeVo.getStudentUpper()>studentNum){
-                //加入班级
-                joinGrade(orderGoodsId,gradeId,userId);
+                //班级还有剩位,直接加入班级
+                return joinGrade(orderGoodsId,gradeId,userId);
             }
+        }else {
+            //无指定班级
+
         }
         //创建新班级
         ClassGrade classGrade = new ClassGrade();
@@ -279,7 +283,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     public boolean joinGrade(Long orderGoodsId,Long gradeId,Long userId){
-        //班级还有剩位,进入班级
+        //进入班级
         ClassGradeUser classGradeUser = new ClassGradeUser();
         classGradeUser.setUserId(userId);
         classGradeUser.setGradeId(gradeId);
@@ -288,6 +292,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         classGradeUser.setFromType(1);
         classGradeUser.setOrderGoodsId(orderGoodsId);
         iClassGradeUserService.save(classGradeUser);
+        //更新订单绑定班级ID
+        OrderGoods orderGoods = new OrderGoods();
+        orderGoods.setOrderGoodsId(orderGoodsId);
+        orderGoods.setGradeId(gradeId);
+        iOrderGoodsService.updateById(orderGoods);
         return true;
     }
 }

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

@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="majorId != null and majorId != ''">
             AND g.major_id = #{majorId}
         </if>
-          <if test="goodsStatus != null and goodsStatus != ''">
+          <if test="goodsStatus != null ">
             AND g.goods_status = #{goodsStatus}
         </if>
         <if test="studyStartTime != null and studyStartTime != '' and studyEndTime != null and studyEndTime != ''">