From 6fc1cceb61be8e8f6378c0ab7f9e5bf12f9393d1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 七月 2024 18:32:44 +0800
Subject: [PATCH] 注册bug修改

---
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java    |    8 +++-----
 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml                  |    4 ++++
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TGoodsMapper.java            |    1 +
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java         |    1 +
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java |    5 +++++
 5 files changed, 14 insertions(+), 5 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 a86bcaa..c87a3ae 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
@@ -306,7 +306,7 @@
         }
         List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUserStudy().getUserid());
         for (ExchangeRecordVO record : exchangeRecord) {
-            TGoods goods = goodsService.getById(record.getGoodsId());
+            TGoods goods = goodsService.getById1(record.getGoodsId());
             List<String> typeList;
             if (null != goods) {
                 List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.stream(goods.getTypeIds().split(",")).collect(Collectors.toList()))
@@ -331,7 +331,7 @@
         }
         List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUser1().getUserid());
         for (ExchangeRecordVO record : exchangeRecord) {
-            TGoods goods = goodsService.getById(record.getGoodsId());
+            TGoods goods = goodsService.getById1(record.getGoodsId());
             List<String> typeList;
             if (null != goods) {
                 List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.stream(goods.getTypeIds().split(",")).collect(Collectors.toList()))
@@ -932,7 +932,7 @@
     @ApiOperationSupport(order = 11)
     public R<TOrderVO> getOrderInfo(@PathVariable("id") String id) {
         TOrder byId = orderService.getById(id);
-        TGoods byId2 = goodsService.getById(byId.getGoodsId());
+        TGoods byId2 = goodsService.getById1(byId.getGoodsId());
         TOrderVO tGoodsVO = new TOrderVO();
         BeanUtils.copyProperties(byId, tGoodsVO);
         tGoodsVO.setName(byId2.getName());
@@ -1000,8 +1000,6 @@
                     list1.add(tOrderVO);
                 }
             }
-
-
         }
         PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
         res.setRecords(list1);
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TGoodsMapper.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TGoodsMapper.java
index 490351a..3ca2fe2 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TGoodsMapper.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TGoodsMapper.java
@@ -28,4 +28,5 @@
 
     void updateOne(@Param("req") TGoods dto);
 
+    TGoods getById1(@Param("id") Integer goodsId);
 }
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java
index 7937d84..eb12891 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java
@@ -28,6 +28,7 @@
      * @return 推荐商品
      */
     List<TGoodsVO> goodRecommend(Integer userId);
+    TGoods getById1(Integer goodsId);
 
     /**
      * 立即兑换
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
index d55fd7e..d4fab4c 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
@@ -56,6 +56,11 @@
     }
 
     @Override
+    public TGoods getById1(Integer goodsId) {
+        return this.baseMapper.getById1(goodsId);
+    }
+
+    @Override
     public GoodDetailVO redeemNow(String goodId, Recipient recipient) {
         // 商品详情
         TGoods goods = lambdaQuery().eq(TGoods::getId, goodId).one();
diff --git a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
index c4fbaad..656f682 100644
--- a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
+++ b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
@@ -54,4 +54,8 @@
         ORDER BY g.integral desc
 
     </select>
+    <select id="getById1" resultType="com.ruoyi.goods.domain.TGoods">
+        select * from t_goods
+        where id = #{id}
+    </select>
 </mapper>

--
Gitblit v1.7.1