fix 题库

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -1,5 +1,7 @@
 package com.zhongzheng.controller.goods;
 
+import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
@@ -24,8 +26,11 @@ import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo;
+import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserExamRecordService;
 import com.zhongzheng.modules.user.service.IUserExamWrongRecordService;
@@ -70,6 +75,8 @@ public class GoodsController extends BaseController {
 
     private final IUserPeriodService iUserPeriodService;
 
+    private final IOrderGoodsService iOrderGoodsService;
+
     /**
      * 获取商品详细信息
      */
@@ -87,39 +94,42 @@ public class GoodsController extends BaseController {
     /**
      * 获取商品详细信息
      */
-    @ApiOperation("获取题库商品题目数统计信息")
-    @GetMapping("/bank/questionNum/{goodsId}")
-    public AjaxResult<Map<String,Object>> questionNum(@PathVariable("goodsId" ) Long goodsId) {
+    @ApiOperation("获取题库订单商品题目数统计信息")
+    @GetMapping("/bank/questionNum/{orderGoodsId}")
+    public AjaxResult<Map<String,Object>> questionNum(@PathVariable("orderGoodsId" ) Long orderGoodsId) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
 
         Map<String,Object> numMap = new HashMap<>();
 
         UserExamWrongRecordQueryBo wBo = new UserExamWrongRecordQueryBo();
-        wBo.setGoodsId(goodsId);
+        wBo.setOrderGoodsId(orderGoodsId);
         wBo.setUserId(loginUser.getUser().getUserId());
         Long wrongNum = iUserExamWrongRecordService.recordNum(wBo);
         numMap.put("wrongNum",wrongNum);
 
         CollectQuestionQueryBo collectQuestionQueryBo = new CollectQuestionQueryBo();
-        collectQuestionQueryBo.setGoodsId(goodsId);
+        collectQuestionQueryBo.setOrderGoodsId(orderGoodsId);
         collectQuestionQueryBo.setUserId(loginUser.getUser().getUserId());
         Integer collectNum = iCollectQuestionService.collectNum(collectQuestionQueryBo);
         numMap.put("collectNum",collectNum);
 
         UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
-        userExamRecordQueryBo.setGoodsId(goodsId);
+        userExamRecordQueryBo.setOrderGoodsId(orderGoodsId);
         userExamRecordQueryBo.setUserId(loginUser.getUser().getUserId());
         Long doNum = iUserExamRecordService.selectDoNum(userExamRecordQueryBo);
         numMap.put("doNum",doNum);
 
-        userExamRecordQueryBo.setGoodsId(goodsId);
+        userExamRecordQueryBo.setOrderGoodsId(orderGoodsId);
         userExamRecordQueryBo.setUserId(loginUser.getUser().getUserId());
         Long rightNum = iUserExamRecordService.selectRightNum(userExamRecordQueryBo);
         numMap.put("rightNum",rightNum);
+        OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>()
+                .eq(OrderGoods::getOrderGoodsId, orderGoodsId));
+        if(Validator.isNotEmpty(orderGoods)){
+            Long totalNum = iGoodsService.getQuestionNum(orderGoods.getGoodsId());
+            numMap.put("totalNum",totalNum);
+        }
 
-        Long totalNum = iGoodsService.getQuestionNum(goodsId);
-
-        numMap.put("totalNum",totalNum);
 
         return AjaxResult.success(numMap);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionAddBo.java

@@ -32,4 +32,7 @@ public class CollectQuestionAddBo {
     /** 商品ID */
     @ApiModelProperty("商品ID")
     private Long goodsId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionEditBo.java

@@ -31,4 +31,7 @@ public class CollectQuestionEditBo {
     private Long userId;
     @ApiModelProperty("试卷ID")
     private Long examId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionQueryBo.java

@@ -52,4 +52,7 @@ public class CollectQuestionQueryBo extends BaseEntity {
 	private Integer paperId;
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectQuestion.java

@@ -42,5 +42,6 @@ private static final long serialVersionUID=1L;
     private Long examId;
     /** 商品ID */
     private Long goodsId;
-
+    /** 订单商品ID */
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/vo/CollectQuestionVo.java

@@ -50,5 +50,8 @@ public class CollectQuestionVo {
 
 	@ApiModelProperty("类型数量")
 	private Integer num;
-
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserQuestionVo.java

@@ -230,7 +230,6 @@ public class GoodsUserQuestionVo {
 	private Long doNum;
 
 	private Long totalNum;
-
 	/** 服务有效期开始 */
 	@Excel(name = "服务有效期开始")
 	@ApiModelProperty("服务有效期开始")
@@ -239,4 +238,8 @@ public class GoodsUserQuestionVo {
 	@Excel(name = "服务有效期结束")
 	@ApiModelProperty("服务有效期结束")
 	private Long serviceEndTime;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

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

@@ -198,6 +198,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         //发送审核不通过消息
         if (gradePeriodStatus == 0) {
             bo.setStatus(gradePeriodStatus);
+            bo.setGoodsId(userPeriodVo.getGoodsId());
             sendPeriodSMS(bo);
             sendPeriodSevenSMS(bo);
         }
@@ -397,6 +398,9 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSMS(UserPeriodEditBo bo) {
+        if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getUserId())){
+            throw new CustomException("信息参数确实");
+        }
         String key = "Period-" + bo.getGoodsId() + "-" + bo.getUserId();
         Long value = redisCache.getCacheObject(key);
         if (Validator.isNotEmpty(value)) {
@@ -480,6 +484,9 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     private void sendPeriodSevenSMS(UserPeriodEditBo bo) {
+        if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getUserId())){
+            throw new CustomException("信息参数确实");
+        }
         String key = "PeriodSeven-" + bo.getGoodsId() + "-" + bo.getUserId();
         Long value = redisCache.getCacheObject(key);
         if (Validator.isNotEmpty(value)) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordAddBo.java

@@ -45,5 +45,7 @@ public class UserExamWrongRecordAddBo {
     /** 章卷ID */
     @ApiModelProperty("章卷ID")
     private Long chapterExamId;
-
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordEditBo.java

@@ -50,5 +50,7 @@ public class UserExamWrongRecordEditBo {
     /** 章卷ID */
     @ApiModelProperty("章卷ID")
     private Long chapterExamId;
-
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordQueryBo.java

@@ -58,5 +58,7 @@ public class UserExamWrongRecordQueryBo extends BaseEntity {
 
 	@ApiModelProperty("试卷类型ID")
 	private Integer paperId;
-
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamWrongRecord.java

@@ -46,4 +46,6 @@ private static final long serialVersionUID=1L;
     private Long moduleExamId;
     /** 章卷ID */
     private Long chapterExamId;
+    /** 订单商品ID */
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamWrongRecordVo.java

@@ -124,4 +124,8 @@ public class UserExamWrongRecordVo {
 	@Excel(name = "章卷ID")
 	@ApiModelProperty("章卷ID")
 	private Long chapterExamId;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -160,6 +160,7 @@
         <result property="makeGoodsCode" column="make_goods_code"/>
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.bank.bo.QuestionQueryBo" resultMap="QuestionResultVo">
@@ -265,7 +266,8 @@
             o.user_id,
             og.create_time as order_create_time,
             og.service_start_time,
-            og.service_end_time
+            og.service_end_time,
+            og.order_goods_id
         FROM
             goods g
                 LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="examId" column="exam_id"/>
         <result property="goodsId" column="goods_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.collect.vo.CollectQuestionVo" id="CollectQuestionVoResult">
@@ -24,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="type" column="type"/>
         <result property="num" column="num"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.bank.vo.QuestionVo" id="QuestionResultVo">

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamRecordMapper.xml

@@ -110,6 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="moduleExamId != null and moduleExamId != ''">
             AND ue.module_exam_id = #{moduleExamId}
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != ''">
+            AND ue.order_goods_id = #{orderGoodsId}
+        </if>
         <if test="chapterExamId != null and chapterExamId != ''">
             AND ue.chapter_exam_id = #{chapterExamId}
         </if>
@@ -167,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     e.exam_id,
                     q.*
                 FROM
-                    ( SELECT exam_id, group_concat( do_question_ids ) AS ids FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} and `status` = 1 GROUP BY exam_id ) e
+                    ( SELECT exam_id, group_concat( do_question_ids ) AS ids FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} and `status` = 1 GROUP BY exam_id ) e
                         LEFT JOIN question q ON FIND_IN_SET( q.question_id, e.ids )) AS eq
     </select>
 
@@ -184,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM
                     user_exam_record uer
                 WHERE
-                        record_id IN ( SELECT MAX( record_id ) record_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} and `status` = 1 GROUP BY exam_id )))
+                        record_id IN ( SELECT MAX( record_id ) record_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} and `status` = 1 GROUP BY exam_id )))
 
     </select>
 
@@ -214,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               FROM
                   exam_question eq
               WHERE
-                      eq.exam_id IN ( SELECT DISTINCT exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} )
+                      eq.exam_id IN ( SELECT DISTINCT exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} )
               GROUP BY
                   eq.exam_id ) uer
                 LEFT JOIN exam e ON e.exam_id = uer.exam_id
@@ -235,7 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     user_exam_record uer
                 WHERE
                     uer.user_id = #{userId}
-                  AND uer.goods_id = #{goodsId}
+                  AND uer.order_goods_id = #{orderGoodsId}
                   AND uer.exam_id = #{examId}
                 ORDER BY
                     record_id DESC
@@ -254,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM
                     user_exam_wrong_record
                 WHERE
-                        record_id = ( SELECT record_id FROM user_exam_record uer WHERE uer.user_id = #{userId} AND uer.exam_id = #{examId} AND uer.goods_id = #{goodsId} ORDER BY record_id DESC LIMIT 1 )) uewr
+                        record_id = ( SELECT record_id FROM user_exam_record uer WHERE uer.user_id = #{userId} AND uer.exam_id = #{examId} AND uer.order_goods_id = #{orderGoodsId} ORDER BY record_id DESC LIMIT 1 )) uewr
 	LEFT JOIN question q ON q.question_id = uewr.question_id
 
     </select>
@@ -273,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     user_exam_record uer
                 WHERE
                     uer.user_id = #{userId}
-                  AND uer.goods_id = #{goodsId}
+                  AND uer.order_goods_id = #{orderGoodsId}
                   AND uer.do_question_ids IS NOT NULL
             ))
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamWrongRecordMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="moduleExamId" column="module_exam_id"/>
         <result property="chapterExamId" column="chapter_exam_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamWrongRecordVo" id="UserExamWrongRecordVoResult">
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="code" column="code"/>
         <result property="moduleExamId" column="module_exam_id"/>
         <result property="chapterExamId" column="chapter_exam_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>