From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 144 ++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 71 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 6dbcef6..f32ebae 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,23 +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.VO.AuctionSalesroomGoodsVO;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroom;
-import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
+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.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.feignClient.GoodsSkuClient;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
+import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
+import java.util.List;
import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -29,15 +26,9 @@
*/
@RestController
@RequestMapping("/forepart/auction-salesroom-goods")
+@Api(value = "拍卖场商品相关接口", tags = "拍卖场商品相关接口", description = "拍卖场商品相关接口")
public class ForepartAuctionSalesroomGoodsController {
-
-
- @Resource
- private GoodsSkuClient goodsSkuClient;
-
- @Resource
- private IAuctionSalesroomService iAuctionSalesroomService;
@Resource
private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
@@ -46,57 +37,68 @@
* 拍卖大屏的商品介绍
*
*/
- @RequestMapping("/getAuctionSalesroomGoods")
- @ResponseBody @ApiOperation(value = "拍卖大屏的商品介绍")
-
- public R<AuctionSalesroomGoodsVO> getAuctionSalesroomGoods(String SalesroomId) {
- AuctionSalesroomGoodsVO auctionSalesroomGoodsVO=new AuctionSalesroomGoodsVO();
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
- auctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId());
- auctionSalesroomGoodsVO.setSalesroomName(auctionSalesroom.getSalesroomName());
- auctionSalesroomGoodsVO.setSalesroomType(auctionSalesroom.getType().getCode());
- LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionSalesroomGoods::getStatus,1);
- 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.orderByDesc(AuctionSalesroomGoods::getSortNum);
- wrapper.last("limit 1");
- auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
- if (auctionSalesroomGoods==null){
- LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
- wrapper2.eq(AuctionSalesroomGoods::getStatus,1);
- wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
- wrapper2.last("limit 1");
- auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
- }
- }
-
- auctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
- auctionSalesroomGoodsVO.setGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
- auctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
- auctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
- auctionSalesroomGoodsVO.setItemQuantity(auctionSalesroomGoods.getItemQuantity());
- auctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
- auctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
- R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId());
- GoodsSku goodsSku=goodsSkuOne.getData();
- auctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
- auctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
- auctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
- if (auctionSalesroomGoods.getStatus().getCode()==0){
- auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
- }if (auctionSalesroomGoods.getStatus().getCode()==2){
- AuctionSalesroomGoods auctionSalesroomGoodsOne= iAuctionSalesroomGoodsService.getById(auctionSalesroomGoods.getGoodsSkuId()+1);
- if (auctionSalesroomGoodsOne!=null){
- auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
- }
- }
- return R.ok(auctionSalesroomGoodsVO);
+ @PostMapping("/getAuctionSalesroomGoods")
+ @ApiOperation(value = "拍卖大屏-商品介绍")
+ public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
}
+ /**
+ * 拍卖师端拍卖场信息
+ *
+ */
+ @PostMapping("/getAuctionSalesroominfo")
+ @ApiOperation(value = "拍卖师端-拍卖场详情信息")
+ public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
+ }
+
+
+
+
+ /**
+ * 判断拍卖师端是否还有未拍卖商品
+ *
+ */
+ @PostMapping("/isAuctionSalesroom")
+ @ApiOperation(value = "拍卖师端-判断拍卖师端是否还有未拍卖商品")
+ public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
+ }
+
+
+ /**
+ * 拍卖师端拍卖场下一个立即开始
+ *
+ */
+ @PostMapping("/auctionSalesroomGoodsStart")
+ @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即开始")
+ public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
+ return R.ok();
+ }
+
+
+
+ /**
+ * 拍卖师端拍卖场下一个立即结束
+ *
+ */
+ @PostMapping("/auctionSalesroomGoodsEnd")
+ @ApiOperation(value = "拍卖师端-拍卖场商品立即结束")
+ public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomGoodsEnd(auctionSalesroomGoodsDTO);
+ return R.ok();
+ }
+
+
+ @PostMapping("/getAuctionSalesroomGoodsInfo")
+ @ApiOperation(value = "用户端-拍卖场商品详情")
+ public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
+ }
+
+
+
+
}
--
Gitblit v1.7.1