From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 31 五月 2024 11:48:43 +0800 Subject: [PATCH] Merge branch 'mitao-dev' --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java index a6c1bad..9837cdf 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java @@ -1,11 +1,15 @@ package com.ruoyi.auction.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.auction.controller.management.dto.AuctionGoodsDTO; -import com.ruoyi.auction.controller.management.dto.AuctionGoodsQuery; -import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO; -import com.ruoyi.auction.domain.AuctionGoods; +import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsDTO; +import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsQuery; +import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO; import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.system.api.domain.AuctionGoods; +import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO; +import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; +import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO; +import org.springframework.web.bind.annotation.RequestBody; /** * <p> @@ -22,14 +26,14 @@ * @param query 拍卖商品查询对象 * @return PageDTO<AuctionGoodsVO> */ - PageDTO<AuctionGoodsVO> getAuctionGoodsPage(AuctionGoodsQuery query); + PageDTO<MgtAuctionGoodsVO> getAuctionGoodsPage(MgtAuctionGoodsQuery query); /** * 添加/编辑 拍卖商品 * * @param dto 拍卖商品数据传输对象 */ - void saveAuctionGoods(AuctionGoodsDTO dto); + void saveAuctionGoods(MgtAuctionGoodsDTO dto); /** * 查看拍卖商品详情 @@ -37,7 +41,13 @@ * @param id 拍卖商品id * @return AuctionGoodsVO */ - AuctionGoodsVO getAuctionGoodsById(Long id); + MgtAuctionGoodsVO getAuctionGoodsById(Long id); void stopAuctionGoods(Long id); + + PageDTO<AuctionGoodsListVO> getAuctionGoodsList(AuctionGoodsListDTO auctionGoodsListDTO); + + AuctionGoodsinfoVO getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO); + + PageDTO<AuctionGoodsListVO> getWdAuctionSalesList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO); } -- Gitblit v1.7.1