From abfedddb15ff90b7810a231dac964d2450372b94 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 09:01:42 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
index 08f2e93..516e1c0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
@@ -6,17 +6,21 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.TBoard;
import com.ruoyi.system.domain.TShop;
import com.ruoyi.system.dto.TShopDTO;
import com.ruoyi.system.query.TShopQuery;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TBoardService;
import com.ruoyi.system.service.TShopService;
import com.ruoyi.system.vo.TShopVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Objects;
/**
@@ -34,12 +38,14 @@
private final TShopService shopService;
private final ISysUserService userService;
+ private final TBoardService boardService;
private final TokenService tokenService;
@Autowired
- public TShopController(TShopService shopService, ISysUserService userService, TokenService tokenService) {
+ public TShopController(TShopService shopService, ISysUserService userService, TBoardService boardService, TokenService tokenService) {
this.shopService = shopService;
this.userService = userService;
+ this.boardService = boardService;
this.tokenService = tokenService;
}
@@ -80,8 +86,14 @@
*/
@ApiOperation( value = "查看店铺信息详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TShop> getDetailById(@RequestParam("id") Long id) {
- return AjaxResult.success(shopService.getById(id));
+ public AjaxResult<TShopVO> getDetailById(@RequestParam("id") Long id) {
+ TShop shop = shopService.getById(id);
+ TShopVO shopVO = new TShopVO();
+ BeanUtils.copyProperties(shop,shopVO);
+ List<TBoard> list = boardService.list(Wrappers.lambdaQuery(TBoard.class)
+ .eq(TBoard::getShopId, id));
+ shopVO.setBoards(list);
+ return AjaxResult.success(shopVO);
}
/**
--
Gitblit v1.7.1