he2802 4 anni fa
parent
commit
b300efa92f

+ 1 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionSimulateServiceImpl.java

@@ -48,8 +48,7 @@ public class QuestionSimulateServiceImpl extends ServiceImpl<QuestionSimulateMap
     @Autowired
     private QuestionMapper questionMapper;
 
-    @Autowired
-    private IQuestionBankService iQuestionBankService;
+
 
     @Override
     public QuestionSimulateVo queryById(Long simulateId){

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.order.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -21,7 +22,10 @@ import com.zhongzheng.modules.order.mapper.OrderMapper;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderVo;
+import com.zhongzheng.modules.user.domain.OrderPossessUser;
 import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.service.IOrderPossessUserService;
+import com.zhongzheng.modules.user.service.IUserBankQuestionRecordService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.zhongzheng.modules.wx.service.IWxPayService;
@@ -66,6 +70,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IExamNoteService iExamNoteService;
 
+    @Autowired
+    private IOrderPossessUserService iOrderPossessUserService;
+
+
+
     @Override
     public OrderVo queryById(Long orderId){
         Order db = this.baseMapper.selectById(orderId);
@@ -202,6 +211,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 }
                 g.setGoodsPrice(examNoteVo.getPrice());
             }
+            OrderPossessUser orderPossess =iOrderPossessUserService.queryByTypeAndId(g.getGoodsId(),g.getGoodsType());
+            if(Validator.isNotNull(orderPossess)){
+                throw new CustomException("你已购买该商品");
+            }
             if(!iOrderGoodsService.insertByAddBo(g)){
                 throw new CustomException("商品错误");
             }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IOrderPossessUserService.java

@@ -23,6 +23,8 @@ public interface IOrderPossessUserService extends IService<OrderPossessUser> {
 	 */
 	OrderPossessUserVo queryById(Long userId);
 
+	OrderPossessUser queryByTypeAndId(Long possessId,Integer typeId);
+
 	/**
 	 * 查询列表
 	 */

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/OrderPossessUserServiceImpl.java

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.bank.domain.QuestionBank;
 import com.zhongzheng.modules.bank.vo.QuestionBankVo;
 import com.zhongzheng.modules.course.domain.Course;
+import com.zhongzheng.modules.course.domain.MajorCategory;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.exam.domain.ExamNote;
 import com.zhongzheng.modules.exam.vo.ExamNoteVo;
@@ -43,6 +45,18 @@ public class OrderPossessUserServiceImpl extends ServiceImpl<OrderPossessUserMap
         return BeanUtil.toBean(db, OrderPossessUserVo.class);
     }
 
+    @Override
+    public OrderPossessUser queryByTypeAndId(Long possessId, Integer typeId) {
+        OrderPossessUser info = getOne(new LambdaQueryWrapper<OrderPossessUser>()
+                .eq(OrderPossessUser::getPossessId,possessId)
+                .eq(OrderPossessUser::getTypeId,typeId)
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            return info;
+        }
+        return null;
+    }
+
     @Override
     public OrderPossessUserVo queryList(OrderPossessUserQueryBo bo) {
         OrderPossessUserVo orderPossessUserVo = BeanUtil.toBean(bo, OrderPossessUserVo.class);

+ 0 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserBankQuestionRecordMapper.xml

@@ -19,7 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryWrongList" parameterType="com.zhongzheng.modules.user.domain.UserBankQuestionRecord"  resultType="com.zhongzheng.modules.bank.domain.Question">
         SELECT
-        ubqr.is_right,
         q.*
         FROM
         user_bank_question_record ubqr