From a885affb3e8ccfc4d07cf42c237704f681ecaac3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 18:38:05 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java | 6 +-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 54 ++++++++++++++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java | 11 ++-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java | 78 ++++++++++++++++++++++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsInfoDTO.java | 20 ++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java | 7 +-
6 files changed, 167 insertions(+), 9 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 7cd99e0..022d9cd 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
@@ -2,10 +2,9 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO;
-import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
-import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
-import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
+import com.ruoyi.auction.controller.forepart.vo.*;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;
@@ -122,5 +121,11 @@
}
+ @RequestMapping("/getAuctionSalesroomGoodsInfo")
+ @ResponseBody
+ @ApiOperation(value = "用户端拍卖场商品详情")
+ public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
+ }
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsInfoDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsInfoDTO.java
new file mode 100644
index 0000000..e9f7684
--- /dev/null
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsInfoDTO.java
@@ -0,0 +1,20 @@
+package com.ruoyi.auction.controller.forepart.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AuctionSalesroomGoodsInfoDTO {
+
+ @ApiModelProperty(value = "拍卖会id")
+ private Long auctionSalesroomId;
+
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java
new file mode 100644
index 0000000..f1c9823
--- /dev/null
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java
@@ -0,0 +1,78 @@
+package com.ruoyi.auction.controller.forepart.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class AuctionSalesroomGoodsInfoVO {
+ @ApiModelProperty(value = "拍卖场id")
+ private Long SalesroomId;
+
+ @ApiModelProperty(value = "拍卖场名称")
+ private String salesroomName;
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsSkuName;
+
+ @ApiModelProperty(value = "起拍价格")
+ private BigDecimal startingPrice;
+
+ @ApiModelProperty(value = "拍品数量")
+ private Integer salesroomStock;
+
+ @ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")
+ private Integer SalesroomType;
+
+ @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
+ private Integer goodsSkustatus;
+
+ @ApiModelProperty(value = "拍卖时间（分钟）")
+ private Integer listingDuration;
+
+ @ApiModelProperty(value = "开始时间")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "单位")
+ private String unit;
+
+ @ApiModelProperty(value = "商品描述")
+ private String description;
+
+ @ApiModelProperty(value = "商品年份")
+ private String years;
+
+ @ApiModelProperty(value = "商品分类")
+ private String category;
+
+ @ApiModelProperty(value = "商品系列")
+ private String series;
+
+ @ApiModelProperty(value = "商品品牌")
+ private String brand;
+
+ @ApiModelProperty(value = "商品香型")
+ private String flavorType;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "详情图，不超过五张图片")
+ private String album;
+
+ @ApiModelProperty(value = "是否出价 1未出价，2出价")
+ private Integer isBond;
+
+ @ApiModelProperty(value = "是中标 1未中标，2中标")
+ private Integer isStatus;
+
+ @ApiModelProperty(value = "当前出价")
+ private BigDecimal presentBid;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java
index 7e2cb0e..226a939 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -9,14 +9,14 @@
@Data
public class ForepartAuctionSalesroomGoodsVO {
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
@ApiModelProperty(value = "拍卖场id")
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
private String salesroomName;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
private String goodsSkuName;
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 e831a78..99b2f49 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
@@ -2,10 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO;
-import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
-import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
-import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
+import com.ruoyi.auction.controller.forepart.vo.*;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.common.core.utils.page.PageDTO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -57,6 +56,8 @@
void auctionSalesroomGoodsEnd(AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO);
+ AuctionSalesroomGoodsInfoVO getAuctionSalesroomGoodsInfo(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO);
+
}
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 6c10075..a6141a7 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
@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.dto.OrderDTO;
+import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomGoodsInfoVO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
+import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionSalesroom;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
@@ -60,6 +63,11 @@
@Resource
private OrderClient orderClient;
+
+ @Resource
+ private IAuctionBidRecordService auctionBidRecordService;
+
+
/**
@@ -364,6 +372,52 @@
}
+ @Override
+ public AuctionSalesroomGoodsInfoVO getAuctionSalesroomGoodsInfo(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ AuctionSalesroom byId = iAuctionSalesroomService.getById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ AuctionSalesroomGoods byId1 = iAuctionSalesroomGoodsService.getById(auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ AuctionSalesroomGoodsInfoVO AuctionSalesroomGoodsInfoVO=new AuctionSalesroomGoodsInfoVO();
+ AuctionSalesroomGoodsInfoVO.setSalesroomId(byId.getId());
+ AuctionSalesroomGoodsInfoVO.setSalesroomName(byId.getSalesroomName());
+ AuctionSalesroomGoodsInfoVO.setGoodsSkuId(byId1.getId());
+ AuctionSalesroomGoodsInfoVO.setGoodsSkuName(goodsSku.getSkuName());
+ AuctionSalesroomGoodsInfoVO.setStartingPrice(byId1.getStartingPrice());
+ AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
+ AuctionSalesroomGoodsInfoVO.setSalesroomType(byId.getType().getCode());
+ AuctionSalesroomGoodsInfoVO.setGoodsSkustatus(byId1.getStatus().getCode());
+ AuctionSalesroomGoodsInfoVO.setListingDuration(byId1.getListingDuration());
+ AuctionSalesroomGoodsInfoVO.setStartTime(byId1.getStartTime());
+ AuctionSalesroomGoodsInfoVO.setUnit(goodsSku.getUnit());
+ AuctionSalesroomGoodsInfoVO.setDescription(goodsSku.getDescription());
+ AuctionSalesroomGoodsInfoVO.setYears(goodsSku.getYears());
+
+
+
+
+ AuctionSalesroomGoodsInfoVO.setCoverPic(goodsSku.getCoverPic());
+ AuctionSalesroomGoodsInfoVO.setAlbum(goodsSku.getAlbum());
+ LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
+ wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
+ wrapper1.eq(AuctionBidRecord::getGoodsSkuId,byId1.getId());
+ wrapper1.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
+ if (list1!=null){
+ AuctionSalesroomGoodsInfoVO.setIsBond(2);
+ AuctionSalesroomGoodsInfoVO.setPresentBid(list1.getLastBidAmount());
+ if (list1.getStatus().getCode()==2){
+ AuctionSalesroomGoodsInfoVO.setIsStatus(2);
+ }else{
+ AuctionSalesroomGoodsInfoVO.setIsStatus(1);
+ }
+ }else{
+ AuctionSalesroomGoodsInfoVO.setIsBond(1);
+ AuctionSalesroomGoodsInfoVO.setIsStatus(1);
+ }
+ return AuctionSalesroomGoodsInfoVO;
+ }
+
public void AddOrder(Long goodsSkuId, Long memberId, BigDecimal lastBidAmount,BigDecimal bound) {
OrderDTO order=new OrderDTO();
--
Gitblit v1.7.1