From 855921d253a4854d4fb78b83bfcf7c6e93b3f68d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 29 五月 2024 19:43:50 +0800
Subject: [PATCH] 1.提交【管理后台】团购、拍卖商品立即结束退款处理 2.提交【管理后台】拍卖场管理部分接口
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 84 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
index a01faf1..6dd6f01 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
@@ -1,37 +1,20 @@
package com.ruoyi.auction.controller.forepart;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.auction.controller.forepart.DTO.AuctionSalesroomGoodsDTO;
-import com.ruoyi.auction.controller.forepart.DTO.orderDTO;
-import com.ruoyi.auction.controller.forepart.VO.AuctionSalesroomVO;
-import com.ruoyi.auction.controller.forepart.VO.ForepartAuctionSalesroomGoodsVO;
-import com.ruoyi.auction.domain.pojo.AuctionBidRecord;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
-import com.ruoyi.auction.service.IAuctionBidRecordService;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
+import com.ruoyi.auction.controller.forepart.vo.*;
+import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
-import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
-import com.ruoyi.common.core.enums.BidStatusEnum;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.RequestBody;
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.lang.reflect.Array;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
/**
* <p>
@@ -56,13 +39,9 @@
@RequestMapping("/getAuctionSalesroomGoods")
@ResponseBody
@ApiOperation(value = "拍卖大屏的商品介绍")
- public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(Integer SalesroomId) {
-
- return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(SalesroomId));
+ public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
}
-
-
-
/**
* 拍卖师端拍卖场信息
@@ -71,14 +50,9 @@
@RequestMapping("/getAuctionSalesroominfo")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场信息")
- public R<AuctionSalesroomVO> getAuctionSalesroominfo(Integer SalesroomId) {
- return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(SalesroomId));
+ public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
}
-
-
-
-
-
/**
* 拍卖师端拍卖场立即开始
@@ -87,8 +61,8 @@
@RequestMapping("/auctionSalesroomStart")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场立即开始")
- public R<T> auctionSalesroomStart(Integer SalesroomId) {
- iAuctionSalesroomGoodsService.auctionSalesroomStart(SalesroomId);
+ public R<T> auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
return R.ok();
}
@@ -100,8 +74,8 @@
@RequestMapping("/auctionSalesroomEnd")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场立即结束")
- public R<T> auctionSalesroomEnd(Integer SalesroomId) {
- iAuctionSalesroomGoodsService.auctionSalesroomEnd(SalesroomId);
+ public R<T> auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
return R.ok();
}
@@ -113,9 +87,8 @@
@RequestMapping("/isAuctionSalesroom")
@ResponseBody
@ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
- public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(Integer SalesroomId) {
-
- return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(SalesroomId));
+ public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
}
@@ -126,7 +99,7 @@
@RequestMapping("/auctionSalesroomGoodsStart")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场下一个立即开始")
- public R<T> auctionSalesroomGoodsStart(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ public R<T> auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
}
@@ -139,9 +112,26 @@
*/
@RequestMapping("/auctionSalesroomGoodsEnd")
@ResponseBody
- @ApiOperation(value = "拍卖师端拍卖商品立即结束")
- public R<T> auctionSalesroomGoodsEnd(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ @ApiOperation(value = "拍卖师端拍卖场下一个立即结束")
+ public R<T> auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
return R.ok();
}
+
+
+ @RequestMapping("/getAuctionSalesroomGoodsInfo")
+ @ResponseBody
+ @ApiOperation(value = "用户端拍卖场商品详情")
+ public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
+ }
+
+ @RequestMapping("/getAuctionBidRecord")
+ @ResponseBody
+ @ApiOperation(value = "用户端商品详情里面的出价记录")
+ public R<List<AuctionBidRecordVO>> getAuctionBidRecord(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionBidRecord(auctionSalesroomGoodsInfoDTO));
+ }
+
+
}
--
Gitblit v1.7.1