From 2dcde26e44e85d84c3a20fee0aaed3724edba3bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 14:11:40 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
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 829b3e5..560659e 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
@@ -17,9 +17,12 @@
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
+import com.ruoyi.auction.service.IAuctionBrowseRecordService;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
+import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
@@ -69,6 +72,13 @@
@Resource
private OrderClient orderClient;
+
+ @Resource
+
+ private IAuctionBrowseRecordService iAuctionBrowseRecordService;
+
+ @Resource
+ private IAuctionSalesroomService iAuctionSalesroomService;
@@ -120,6 +130,8 @@
forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
forepartAuctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
+ forepartAuctionSalesroomGoodsVO.setDetail(goodsSku.getDetail());
+ forepartAuctionSalesroomGoodsVO.setYears(String.valueOf(goodsSku.getYears().getYear()));
forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec());
forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
@@ -282,7 +294,7 @@
wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper2.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper2);
- auctionSalesroomGoods.setStatus(AuctionStartStatusEnum.IN_AUCTION);
+ auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS);
this.updateById(auctionSalesroomGoods);
}
@@ -307,8 +319,8 @@
List<AuctionSalesroomGoods> auctionSalesroomGoods=this.list(wrapper2);
if (auctionSalesroomGoods.size()>0){
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
- salesroomGoods.setStatus(AuctionStartStatusEnum.ENDED);
- iAuctionSalesroomGoodsService.updateById(salesroomGoods);
+ salesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED);
+ this.updateById(salesroomGoods);
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
@@ -364,7 +376,7 @@
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2);
- auctionSalesroomGoods.setStatus(AuctionStartStatusEnum.IN_AUCTION);
+ auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS);
this.updateById(auctionSalesroomGoods);
@@ -383,13 +395,14 @@
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
AuctionSalesroomGoods auctionSalesroomGood=this.getOne(wrapper2);
- AuctionSalesroom auctionSalesroom=this.getById(auctionSalesroomGood.getAuctionSalesroomId());
+ AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGood.getAuctionSalesroomId());
AuctionSalesroomGoods auctionSalesroomGoods=this.getById(auctionSalesroomGoodsDTO.getGoodsSkuId());
List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();
if (auctionSalesroomGoods.getStatus().getCode()==1) {
LambdaQueryWrapper<AuctionBidRecord> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.eq(AuctionBidRecord::getTargetId, auctionSalesroomGoodsDTO.getGoodsSkuId());
wrapper.eq(AuctionBidRecord::getDelFlag, 0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
@@ -421,7 +434,7 @@
}
}
- auctionSalesroomGood.setStatus(AuctionStartStatusEnum.ENDED);
+ auctionSalesroomGood.setStatus(AuctionGoodsStatusEnum.ENDED);
this.updateById(auctionSalesroomGood);
}
@@ -444,7 +457,8 @@
AuctionSalesroomGoodsInfoVO.setStartTime(byId1.getStartTime());
AuctionSalesroomGoodsInfoVO.setUnit(goodsSku.getUnit());
AuctionSalesroomGoodsInfoVO.setDescription(goodsSku.getDescription());
- AuctionSalesroomGoodsInfoVO.setYears(goodsSku.getYears());
+ AuctionSalesroomGoodsInfoVO.setDetail(goodsSku.getDetail());
+ AuctionSalesroomGoodsInfoVO.setYears(String.valueOf(goodsSku.getYears().getYear()));
GoodsBrand data = goodsSkuClient.getBrandOne(goodsSku.getBrandId(), SecurityConstants.INNER).getData();
GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSku.getCategoryId(), SecurityConstants.INNER).getData();
GoodsSeries data2 = goodsSkuClient.getSeriesOne(goodsSku.getSeriesId(), SecurityConstants.INNER).getData();
--
Gitblit v1.7.1