he2802 2 tahun lalu
induk
melakukan
2a21d9cd4e

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

@@ -175,18 +175,11 @@ public class GoodsController extends BaseController {
         Long doNum = iUserExamRecordService.selectDoNum(userExamRecordQueryBo);
         numMap.put("doNum",doNum);
 
-       
+
         OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>()
                 .eq(OrderGoods::getOrderGoodsId, orderGoodsId));
         if(Validator.isNotEmpty(orderGoods)){
-            OrderGoodsFree goodsFree =  iOrderGoodsFreeService.getOne(new LambdaQueryWrapper<OrderGoodsFree>()
-                    .eq(OrderGoodsFree::getOrderGoodsId, orderGoodsId));
-            Long goodsId = null;
-            if(Validator.isNotEmpty(goodsFree)){
-                goodsId = goodsFree.getFreeGoodsId(); //存在免费赠送题库商品
-            }else{
-                goodsId = orderGoods.getGoodsId();
-            }
+            Long goodsId = orderGoods.getGoodsId();
             Long totalNum = iGoodsService.getQuestionNum(goodsId);
             numMap.put("totalNum",totalNum);
         }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamTempEditBo.java

@@ -45,4 +45,8 @@ public class ExamTempEditBo {
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
 
+    /** 题目数 */
+    @ApiModelProperty("题目数")
+    private Integer number;
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamTemp.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private Long userId;
     /** 订单商品ID */
     private Long orderGoodsId;
+    /** 题目数 */
+    private Integer number;
 }

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

@@ -127,7 +127,7 @@ public class ExamTempServiceImpl extends ServiceImpl<ExamTempMapper, ExamTemp> i
         }
         ExamTempVo examTempVo = BeanUtil.toBean(add, ExamTempVo.class);
         examTempVo.setQuestionList(questionlist);
-        examTempVo.setType(2);
+        examTempVo.setDoMode(2);
         return examTempVo;
     }
 

+ 5 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/ExamTempVo.java

@@ -48,8 +48,12 @@ public class ExamTempVo {
 	/** 做题模式 1章卷 2随机练习 */
 	@Excel(name = "做题模式 1章卷 2随机练习")
 	@ApiModelProperty("做题模式 1章卷 2随机练习")
-	private Integer type;
+	private Integer doMode;
 
+	/** 生成题目数量 */
+	@Excel(name = "生成题目数量")
+	@ApiModelProperty("生成题目数量")
+	private Integer number;
 	@ApiModelProperty("题目列表")
 	private List<QuestionVo> questionList;
 }

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/bank/ExamTempMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="userId" column="user_id"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="number" column="number"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.bank.vo.QuestionVo" id="QuestionResultVo">