From 13aa4c21cf369a38e97941b4df6168b22b3e9387 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 23 五月 2024 18:01:12 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java | 9 ++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 9 ++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 38 +++++++++---------
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java | 3 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java | 5 +-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java | 7 ++-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 20 +++++-----
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java | 3 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java | 10 ++--
10 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
index d5c9a52..f20b462 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java
@@ -3,6 +3,7 @@
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.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
@@ -44,8 +45,8 @@
@RequestMapping("/getAuctionBidRecordList")
@ResponseBody
@ApiOperation(value = "拍卖大屏滚动出价")
- public R<List<AuctionBidRecord>> getAuctionBidRecordList(@PathVariable("goodsSkuId") Integer goodsSkuId) {
- return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(goodsSkuId));
+ public R<List<AuctionBidRecord>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ return R.ok(iAuctionBidRecordService.getAuctionBidRecordList(auctionSalesroomGoodsDTO));
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index 78144de..ce98441 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -2,6 +2,7 @@
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
@@ -36,8 +37,8 @@
@RequestMapping("getAuctionBidRecordList")
@ResponseBody
@ApiOperation(value = "拍卖大屏获取拍卖信息")
- public R<List<AuctionSalesroom>> getAuctionBidRecordList(@PathVariable("salesroomName") String salesroomName) {
- return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(salesroomName));
+ public R<List<AuctionSalesroom>> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));
}
@@ -48,9 +49,9 @@
@RequestMapping("/getBaaner")
@ResponseBody
@ApiOperation(value = " 暖场视频or封面海报")
- public R<ForepartAuctionSalesroomVO> getBaaner(@PathVariable("salesroomId") Integer SalesroomId) {
+ public R<ForepartAuctionSalesroomVO> getBaaner(AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
- return R.ok(iAuctionSalesroomService.getBaaner(SalesroomId));
+ return R.ok(iAuctionSalesroomService.getBaaner(ctionSalesroomGoodsDTO));
}
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 5f35f98..8f5830b 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
@@ -40,9 +40,9 @@
@RequestMapping("/getAuctionSalesroomGoods")
@ResponseBody
@ApiOperation(value = "拍卖大屏的商品介绍")
- public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(Integer SalesroomId) {
+ public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(SalesroomId));
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
}
@@ -55,8 +55,8 @@
@RequestMapping("/getAuctionSalesroominfo")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场信息")
- public R<AuctionSalesroomVO> getAuctionSalesroominfo(Integer SalesroomId) {
- return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(SalesroomId));
+ public R<AuctionSalesroomVO> getAuctionSalesroominfo(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
}
@@ -71,8 +71,8 @@
@RequestMapping("/auctionSalesroomStart")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场立即开始")
- public R<T> auctionSalesroomStart(Integer SalesroomId) {
- iAuctionSalesroomGoodsService.auctionSalesroomStart(SalesroomId);
+ public R<T> auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
return R.ok();
}
@@ -84,8 +84,8 @@
@RequestMapping("/auctionSalesroomEnd")
@ResponseBody
@ApiOperation(value = "拍卖师端拍卖场立即结束")
- public R<T> auctionSalesroomEnd(Integer SalesroomId) {
- iAuctionSalesroomGoodsService.auctionSalesroomEnd(SalesroomId);
+ public R<T> auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
return R.ok();
}
@@ -97,9 +97,9 @@
@RequestMapping("/isAuctionSalesroom")
@ResponseBody
@ApiOperation(value = "判断拍卖师端是否还有未拍卖商品")
- public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(Integer SalesroomId) {
+ public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
- return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(SalesroomId));
+ return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
index 9aed777..10ebcfd 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
@@ -10,4 +10,7 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
+
+ @ApiModelProperty(value = "拍卖场名称")
+ private String salesroomName;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java
index f156af9..483fb3a 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java
@@ -2,6 +2,7 @@
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.domain.pojo.AuctionBidRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
@@ -28,5 +29,5 @@
* 拍卖大屏滚动
*
*/
- public List<AuctionBidRecord> getAuctionBidRecordList(@PathVariable("goodsSkuId") Integer goodsSkuId);
+ public List<AuctionBidRecord> getAuctionBidRecordList(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java
index 747ff56..4dfec92 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java
@@ -17,32 +17,32 @@
* @since 2024-05-16
*/
public interface IAuctionSalesroomGoodsService extends IService<AuctionSalesroomGoods> {
- ForepartAuctionSalesroomGoodsVO getAuctionSalesroomGoods(Integer SalesroomId);
+ ForepartAuctionSalesroomGoodsVO getAuctionSalesroomGoods(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
/**
* 拍卖师端拍卖场信息
*
*/
- AuctionSalesroomVO getAuctionSalesroominfo(Integer SalesroomId);
+ AuctionSalesroomVO getAuctionSalesroominfo(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
/**
* 拍卖师端拍卖场立即开始
*
*/
- void auctionSalesroomStart(Integer SalesroomId);
+ void auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
/**
* 拍卖师端拍卖场立即开始
*
*/
- void auctionSalesroomEnd(Integer SalesroomId);
+ void auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
/**
* 拍卖师端拍卖场立即开始
*
*/
- List<AuctionSalesroomGoods> isAuctionSalesroom(Integer SalesroomId);
+ List<AuctionSalesroomGoods> isAuctionSalesroom(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
/**
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
index f41b1e3..80c76be 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -1,5 +1,6 @@
package com.ruoyi.auction.service;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
@@ -21,14 +22,14 @@
* 拍卖大屏获取拍卖信息
*
*/
- public List<AuctionSalesroom> getAuctionBidRecordList(String salesroomName);
+ public List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
/**
* 暖场视频or封面海报
*
*/
- public ForepartAuctionSalesroomVO getBaaner(Integer SalesroomId);
+ public ForepartAuctionSalesroomVO getBaaner(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO);
- public AuctionSalesroom getAuctionBidRecordOne(@RequestBody ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO);
+ public AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
index 1881dfa..285b1c8 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java
@@ -2,6 +2,7 @@
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.domain.pojo.AuctionBidRecord;
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
@@ -37,12 +38,12 @@
private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
@Override
- public List<AuctionBidRecord> getAuctionBidRecordList(Integer goodsSkuId) {
- AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getById(goodsSkuId);
+ public List<AuctionBidRecord> getAuctionBidRecordList(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+ AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getById(auctionSalesroomGoodsDTO.getGoodsSkuId());
List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();
if (auctionSalesroomGoods.getStatus().getCode()==1){
LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getGoodsSkuId,goodsSkuId);
+ wrapper.eq(AuctionBidRecord::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
@@ -60,7 +61,7 @@
}
}if (auctionSalesroomGoods.getStatus().getCode()==2){
LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getGoodsSkuId,goodsSkuId);
+ wrapper.eq(AuctionBidRecord::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
wrapper.eq(AuctionBidRecord::getStatus,2);
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index 81c0987..2ea8ce2 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -67,22 +67,22 @@
*
*/
@Override
- public ForepartAuctionSalesroomGoodsVO getAuctionSalesroomGoods(Integer SalesroomId) {
+ public ForepartAuctionSalesroomGoodsVO getAuctionSalesroomGoods(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
+ AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
forepartAuctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId());
forepartAuctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName());
forepartAuctionSalesroomGoodsVO.setSalesroomType(auctionSalesroom.getType().getCode());
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroomGoods::getStatus,1);
- wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper);
if (auctionSalesroomGoods==null){
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionSalesroomGoods::getStatus,2);
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper1.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper1.last("limit 1");
auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
@@ -90,7 +90,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper2.last("limit 1");
auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
@@ -130,9 +130,9 @@
*
*/
@Override
- public AuctionSalesroomVO getAuctionSalesroominfo(Integer SalesroomId) {
+ public AuctionSalesroomVO getAuctionSalesroominfo(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
+ AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
AuctionSalesroomVO auctionSalesroomVO=new AuctionSalesroomVO();
auctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
auctionSalesroomVO.setDescription(auctionSalesroom.getDescription());
@@ -146,7 +146,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroomGoods::getStatus,0);
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.orderByAsc(AuctionSalesroomGoods::getSortNum);
List<AuctionSalesroomGoods> auctionSalesroomGoods=iAuctionSalesroomGoodsService.list(wrapper);
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
@@ -162,7 +162,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroomGoods::getStatus,1);
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods= iAuctionSalesroomGoodsService.getOne(wrapper);
ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO();
@@ -191,7 +191,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus);
List<AuctionSalesroomGoods> auctionSalesroomGoods2=iAuctionSalesroomGoodsService.list(wrapper2);
@@ -220,9 +220,9 @@
*
*/
@Override
- public void auctionSalesroomStart(Integer SalesroomId) {
+ public void auctionSalesroomStart(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
+ AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
auctionSalesroom.setStatus(AuctionStartStatusEnum.IN_AUCTION);
auctionSalesroom.setStartTime(LocalDateTime.now());
iAuctionSalesroomService.updateById(auctionSalesroom);
@@ -230,7 +230,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper2.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
@@ -245,9 +245,9 @@
*
*/
@Override
- public void auctionSalesroomEnd(Integer SalesroomId) {
+ public void auctionSalesroomEnd(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO =new ForepartAuctionSalesroomGoodsVO();
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
+ AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
auctionSalesroom.setStatus(AuctionStartStatusEnum.ENDED);
auctionSalesroom.setEndTime(LocalDateTime.now());
iAuctionSalesroomService.updateById(auctionSalesroom);
@@ -255,7 +255,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
List<AuctionSalesroomGoods> auctionSalesroomGoods=iAuctionSalesroomGoodsService.list(wrapper2);
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
salesroomGoods.setStatus(AuctionStartStatusEnum.ENDED);
@@ -265,7 +265,7 @@
LambdaQueryWrapper<AuctionBidRecord> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getAuctionSalesroomId, SalesroomId);
+ wrapper.eq(AuctionBidRecord::getAuctionSalesroomId, ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.eq(AuctionBidRecord::getDelFlag, 0);
wrapper.eq(AuctionBidRecord::getStatus,0);
List<AuctionBidRecord>auctionBidRecordList = iAuctionBidRecordService.list(wrapper);
@@ -286,11 +286,11 @@
*
*/
@Override
- public List<AuctionSalesroomGoods> isAuctionSalesroom(Integer SalesroomId) {
+ public List<AuctionSalesroomGoods> isAuctionSalesroom(AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,SalesroomId);
+ wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
List<AuctionSalesroomGoods> auctionSalesroomGoods=iAuctionSalesroomGoodsService.list(wrapper2);
return auctionSalesroomGoods;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index a8dcc67..0f36576 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -33,9 +33,9 @@
private final IOrderService orderService;
@PostMapping("/saveOrderOne")
@ResponseBody
+ @InnerAuth
public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
orderService.saveOrderOne(OrderDTO);
-
return R.ok();
}
--
Gitblit v1.7.1