From df4e814dfe99159acd4efeb3bdaa079dde9178cb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 07 九月 2024 11:20:43 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
index 1453827..bcdbc55 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
@@ -3,10 +3,13 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TGoods;
+import com.ruoyi.system.domain.TGoodsType;
import com.ruoyi.system.query.TGoodsQuery;
import com.ruoyi.system.service.TGoodsService;
+import com.ruoyi.system.service.TGoodsTypeService;
import com.ruoyi.system.vo.TGoodsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +17,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -29,11 +33,13 @@
public class TGoodsController {
private final TGoodsService goodsService;
+ private final TGoodsTypeService goodsTypeService;
private final TokenService tokenService;
@Autowired
- public TGoodsController(TGoodsService goodsService, TokenService tokenService) {
+ public TGoodsController(TGoodsService goodsService, TGoodsTypeService goodsTypeService, TokenService tokenService) {
this.goodsService = goodsService;
+ this.goodsTypeService = goodsTypeService;
this.tokenService = tokenService;
}
@@ -74,8 +80,15 @@
*/
@ApiOperation( value = "查看商品管理详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TGoods> getDetailById(@RequestParam("id") Long id) {
- return AjaxResult.success(goodsService.getById(id));
+ public AjaxResult<TGoodsVO> getDetailById(@RequestParam("id") Long id) {
+ TGoods goods = goodsService.getById(id);
+ TGoodsVO tGoodsVO = new TGoodsVO();
+ BeanUtils.copyProperties(goods, tGoodsVO);
+ TGoodsType goodsType = goodsTypeService.getById(goods.getTypeId());
+ if(Objects.nonNull(goodsType)){
+ tGoodsVO.setTypeName(goodsType.getTypeName());
+ }
+ return AjaxResult.success(tGoodsVO);
}
/**
--
Gitblit v1.7.1