From 0c5a2097a86a82c60c40da98a0fdaf386ab5d0e6 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 15:17:27 +0800
Subject: [PATCH] fix: 商品兑换bug
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 325b9b5..48c5d95 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -602,7 +602,11 @@
@ApiOperation(value = "可兑换商品推荐", tags = {"学习端-商城"})
@ApiOperationSupport(order = 38)
public R<List<TGoodsVO>> goodRecommend() {
- return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
}
/**
@@ -669,7 +673,11 @@
// 商品分类详情
List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
// 已兑换人数
- int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
+ int number = 0;
+ if (null != goods.getBasicCount()) {
+ number += goods.getBasicCount();
+ }
+ number += orderService.getGoodBuyNumber(goods.getId());
return R.ok(new GoodDetailVO(goods, goodsTypes, number));
}
--
Gitblit v1.7.1