|
@@ -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);
|
|
|
}
|