fix

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -161,8 +161,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public List<UserVo> selectList(UserQueryBo bo) {
-        System.out.println(bo);
-        System.out.println("cc");
+
         List<UserVo> list = entity2UserVo(userMapper.selectList(bo));
         System.out.println(list);
         for (UserVo userVo : list) {
@@ -635,8 +634,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(bo.getAccount())){
             throw new CustomException("账号不能为空");
         }
-        User user = getOne(new LambdaQueryWrapper<User>().eq(User::getTelphone,bo.getAccount())
-                        .or().eq(User::getIdCard, bo.getAccount()));
+        LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
+        queryWrapper.and(wq -> wq
+                .eq(User::getTelphone,bo.getAccount())
+                .or()
+                .eq(User::getIdCard,bo.getAccount()));
+        User user = getOne(queryWrapper);
         if(Validator.isEmpty(user)){
             throw new CustomException("该账号不存在");
         }

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

@@ -132,7 +132,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
         GoodsVo goodsVo = iGoodsService.selectDetail(bo.getGoodsId());
         //分新班
-        if(iOrderService.changeGrade(goodsVo.getGoodsName(),bo.getGoodsId(),bo.getOrderGoodsId(),bo.getGradeId(),bo.getUserId())){
+        Long newGradeId = iOrderService.changeGrade(goodsVo.getGoodsName(),bo.getGoodsId(),bo.getOrderGoodsId(),bo.getGradeId(),bo.getUserId());
+        if(newGradeId>0){
             //老班修改换班状态
             ClassGradeUser classGradeUser =  getOne(new LambdaQueryWrapper< ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId())
                     .eq(ClassGradeUser::getStatus,1)
@@ -146,6 +147,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             orderGoods.setOrderGoodsId(bo.getOrderGoodsId());
             orderGoods.setStudyCount(orderGoodsVo.getStudyCount()-1);
             orderGoods.setUpdateTime(DateUtils.getNowTime());
+            orderGoods.setGradeId(newGradeId);
             iOrderGoodsService.updateById(orderGoods);
         }
         return true;

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

@@ -25,7 +25,7 @@ public interface IOrderService extends IService<Order> {
 	 */
 	OrderVo queryById(Long orderId);
 
-	boolean changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId);
+	Long changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId);
 	/**
 	 * 查询列表
 	 */

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

@@ -638,7 +638,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     //选择新的班级
     @Override
-    public boolean changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId){
+    public Long changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId){
         //查询该学员有没有有效期内同商品班级 有就不允许添加
        /* Integer classNum = baseMapper.selectUserClass(goodsId,userId);
         if (classNum > 0){
@@ -670,7 +670,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //预留0空位避免超人数
             if((classGradeVo.getStudentUpper()-studentNum-locakStudentNum)>0){
                 //班级还有剩位,直接加入班级
-                return joinGrade(orderGoodsId,gradeId,userId);
+                joinGrade(orderGoodsId,gradeId,userId);
+                return gradeId;
             }
         }
         //无指定班级或者指定班级已满
@@ -691,7 +692,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 //有空位则进入班级
                 gradeId = classGradeVo.getGradeId();
                 //班级还有剩位,直接加入班级
-                return joinGrade(orderGoodsId,gradeId,userId);
+                joinGrade(orderGoodsId,gradeId,userId);
+                return gradeId;
             }
         }
 
@@ -715,7 +717,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         iClassGradeGoodsService.save(classGradeGoods);
         //加入班级
         joinGrade(orderGoodsId,classGrade.getGradeId(),userId);
-        return true;
+        return classGrade.getGradeId();
     }
 
     /**

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="coverUrl" column="cover_url"/>
         <result property="gradeName" column="class_name"/>
         <result property="studyCount" column="study_count"/>
+        <result property="class_name" column="gradeName"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -115,9 +116,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cet.education_name,
         cpt.project_name,
         cb.business_name,
+        cg.class_name,
         o.create_username as create_by
         FROM
         order_goods og
+        LEFT JOIN class_grade cg on og.grade_id = cg.grade_id
         LEFT JOIN goods g ON og.goods_id = g.goods_id
         LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id