submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -11,7 +11,7 @@ import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.goods.bo.QuestionOpenBo;
+import com.zhongzheng.modules.course.bo.QuestionOpenBo;
 import com.zhongzheng.modules.goods.bo.QuestionOpenImportBo;
 import com.zhongzheng.modules.goods.vo.QuestionOpenImportVo;
 import com.zhongzheng.modules.order.bo.*;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/QuestionOpenBo.java → zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/QuestionOpenBo.java

@@ -1,4 +1,4 @@
-package com.zhongzheng.modules.goods.bo;
+package com.zhongzheng.modules.course.bo;
 
 import lombok.Data;
 
@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * @author yangdamao
- * @date 2023年09月12日 17:19
+ * @date 2023年09月13日 17:45
  */
 @Data
 public class QuestionOpenBo implements Serializable {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/questionOpenBo.java

@@ -1,26 +0,0 @@
-package com.zhongzheng.modules.order.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author yangdamao
- * @date 2023年08月09日 13:58
- */
-@ApiModel("七大员题库商品开通BO")
-@Data
-public class questionOpenBo implements Serializable {
-
-    @ApiModelProperty("商品ID")
-    private Long goodsId;
-
-    @ApiModelProperty("学员预约ID")
-    private List<Long> userSubscribeIds;
-
-    private Long createSysUserId;
-    private String createBy;
-}

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

@@ -2,7 +2,7 @@ package com.zhongzheng.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
-import com.zhongzheng.modules.goods.bo.QuestionOpenBo;
+import com.zhongzheng.modules.course.bo.QuestionOpenBo;
 import com.zhongzheng.modules.goods.bo.QuestionOpenImportBo;
 import com.zhongzheng.modules.goods.vo.QuestionOpenImportVo;
 import com.zhongzheng.modules.order.bo.*;

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

@@ -28,6 +28,7 @@ import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IProfileTpService;
 import com.zhongzheng.modules.base.service.IShoppingCartService;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
+import com.zhongzheng.modules.course.bo.QuestionOpenBo;
 import com.zhongzheng.modules.course.domain.*;
 import com.zhongzheng.modules.course.service.*;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
@@ -2285,8 +2286,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
 
             int locakStudentNum = 0;
+            Boolean sevenFlag = false;
             if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
                 locakStudentNum = baseMapper.getStudeCountByCode(classGradeVo.getSevenCode());
+                sevenFlag = true;
             }else {
                 LambdaQueryWrapper<ClassGradeUser> lqw = new LambdaQueryWrapper<>();
                 lqw.eq(ClassGradeUser::getGradeId, gradeId);
@@ -2303,7 +2306,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //预留0空位避免超人数
             if ((classGradeVo.getStudentUpper() - locakStudentNum) > 0) {
                 ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getGradeId, gradeId)
-                        .eq(ClassGradeUser::getOrderGoodsId,orderGoodsId)
+                        .eq(sevenFlag,ClassGradeUser::getOrderGoodsId,orderGoodsId)
                         .eq(ClassGradeUser::getUserId, userId));
                 //不在此班级内
                 if (Validator.isEmpty(gradeUser)) {
@@ -2324,8 +2327,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         for (int i = 0; i < classGradeVoList.size(); i++) {
             ClassGradeVo classGradeVo = classGradeVoList.get(i);
             int locakStudentNum = 0;
+            Boolean sevenFlag = false;
             if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
                 locakStudentNum = baseMapper.getStudeCountByCode(classGradeVo.getSevenCode());
+                sevenFlag = true;
             }else {
                 //临时锁定的班级学员数量
                 LambdaQueryWrapper<ClassGradeUserTemp> lqwLock = new LambdaQueryWrapper<>();
@@ -2341,7 +2346,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 gradeId = classGradeVo.getGradeId();
                 //班级还有剩位,直接锁定班级
                 ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getGradeId, gradeId)
-                        .eq(ClassGradeUser::getOrderGoodsId,orderGoodsId)
+                        .eq(sevenFlag,ClassGradeUser::getOrderGoodsId,orderGoodsId)
                         .eq(ClassGradeUser::getUserId, userId));
                 //不在此班级内
                 if (Validator.isEmpty(gradeUser)) {

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -262,7 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             INSTR( CONCAT('学校业务', cet.education_name, cb.business_name, cpt.project_name),#{businessFullName}) > 0) > 0
         </if>
         <if test="userCard != null and userCard != ''">
-            AND o.user_id = (SELECT user_id FROM `user` WHERE id_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler})
+            AND u.id_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
         </if>
         <if test="userName != null and userName != ''">
             AND u.realname LIKE CONCAT( '%', #{userName}, '%' )