From 14f8be1a86a3d852b92665fcf4c767478c3e12d2 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 17 五月 2024 16:52:17 +0800 Subject: [PATCH] Merge branch 'master' into dev-mitao --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java index e270774..e3c9da2 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java @@ -1,9 +1,21 @@ package com.ruoyi.auction.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.auction.VO.AuctionSalesroomGoodsVO; +import com.ruoyi.auction.domain.pojo.AuctionSalesroom; +import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods; +import com.ruoyi.auction.service.IAuctionSalesroomService; +import com.ruoyi.system.api.feignClient.GoodsSkuClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; /** * <p> @@ -17,4 +29,29 @@ @RequestMapping("/auction-salesroom-goods") public class AuctionSalesroomGoodsController { + + + @Autowired + private GoodsSkuClient goodsSkuClient; + + @Resource + private IAuctionSalesroomService iAuctionSalesroomService; + + + /** + * 拍卖大屏的商品介绍 + * + */ + @RequestMapping("/getAuctionSalesroomGoods") + @ResponseBody + public AuctionSalesroomGoodsVO getAuctionSalesroomGoods(String SalesroomId) { + AuctionSalesroomGoodsVO auctionSalesroomGoodsVO=new AuctionSalesroomGoodsVO(); + AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId); + auctionSalesroomGoodsVO.setAuctionSalesroomId(auctionSalesroom.getId()); + auctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName()); + + + return auctionSalesroomGoodsVO; + } + } -- Gitblit v1.7.1