From 885a5836eb0fc1d7fcf54fbdb5f1969b9238a18c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 30 五月 2024 09:13:12 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 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 a6141a7..5ff06a1 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
@@ -6,12 +6,9 @@
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.controller.forepart.vo.*;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.service.IAuctionBidRecordService;
@@ -23,8 +20,7 @@
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
-import com.ruoyi.system.api.domain.GoodsSku;
-import com.ruoyi.system.api.domain.MemberAddress;
+import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -347,7 +343,7 @@
if (auctionSalesroomGoods.getStatus().getCode()==1) {
LambdaQueryWrapper<AuctionBidRecord> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getGoodsSkuId, auctionSalesroomGoodsDTO.getGoodsSkuId());
+ wrapper.eq(AuctionBidRecord::getTargetId, auctionSalesroomGoodsDTO.getGoodsSkuId());
wrapper.eq(AuctionBidRecord::getDelFlag, 0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
auctionBidRecordList = iAuctionBidRecordService.list(wrapper);
@@ -356,13 +352,13 @@
for (int i = 0; i <= auctionSalesroomGoods.getSalesroomStock(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
- AddOrder(auctionBidRecord.getGoodsSkuId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());
+ AddOrder(auctionBidRecord.getTargetId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());
}
} else {
for (int i = 0; i <= auctionBidRecordList.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
- AddOrder(auctionBidRecord.getGoodsSkuId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());
+ AddOrder(auctionBidRecord.getTargetId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());
}
}
}
@@ -391,16 +387,21 @@
AuctionSalesroomGoodsInfoVO.setUnit(goodsSku.getUnit());
AuctionSalesroomGoodsInfoVO.setDescription(goodsSku.getDescription());
AuctionSalesroomGoodsInfoVO.setYears(goodsSku.getYears());
-
-
-
-
+ 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();
+ GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(goodsSku.getFlavorTypeId(), SecurityConstants.INNER).getData();
+ AuctionSalesroomGoodsInfoVO.setBrand(data.getBrandName());
+ AuctionSalesroomGoodsInfoVO.setCategory(data1.getCategoryName());
+ AuctionSalesroomGoodsInfoVO.setSeries(data2.getSeriesName());
+ AuctionSalesroomGoodsInfoVO.setFlavorType(data3.getFlavorTypeName());
AuctionSalesroomGoodsInfoVO.setCoverPic(goodsSku.getCoverPic());
AuctionSalesroomGoodsInfoVO.setAlbum(goodsSku.getAlbum());
+ AuctionSalesroomGoodsInfoVO.setMinimumMarkupAmount(byId1.getMinimumMarkupAmount());
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::getTargetId,byId1.getId());
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
if (list1!=null){
@@ -418,6 +419,56 @@
return AuctionSalesroomGoodsInfoVO;
}
+ @Override
+ public List<AuctionBidRecordVO> getAuctionBidRecord(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
+ LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper.eq(AuctionBidRecord::getDelFlag,0);
+ wrapper.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
+ wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ wrapper.last("limit 10");
+ List<AuctionBidRecord> auctionBidRecordList=auctionBidRecordService.list(wrapper);
+ List<AuctionBidRecordVO> auctionBidRecordVOList=new ArrayList<>();
+ for (int i=0;i<auctionBidRecordList.size();i++){
+ AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
+ auctionBidRecordVO.setSort(i+1);
+ auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
+ auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
+ Member data = emberClient.getMembeOne(auctionBidRecordList.get(i).getMemberId(),
+ SecurityConstants.INNER).getData();
+ auctionBidRecordVO.setMemberName(data.getNickname());
+ auctionBidRecordVO.setMemberId(data.getId());
+ auctionBidRecordVOList.add(auctionBidRecordVO);
+ }
+ LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper1.eq(AuctionBidRecord::getDelFlag,0);
+ wrapper1.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
+ wrapper.last("limit 1");
+ AuctionBidRecord auctionBidRecord=auctionBidRecordService.getOne(wrapper);
+
+ LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
+ wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper3.eq(AuctionBidRecord::getDelFlag,0);
+ wrapper3.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
+ wrapper3.le(AuctionBidRecord::getId,auctionBidRecord.getId());
+ wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ Long count=auctionBidRecordService.count(wrapper);
+ if (count>0){
+ AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
+ auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
+ auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
+ auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
+ Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
+ SecurityConstants.INNER).getData();
+ auctionBidRecordVO.setMemberName(data.getNickname());
+ auctionBidRecordVO.setMemberId(data.getId());
+ auctionBidRecordVOList.add(auctionBidRecordVO);
+ }
+ return auctionBidRecordVOList;
+ }
+
public void AddOrder(Long goodsSkuId, Long memberId, BigDecimal lastBidAmount,BigDecimal bound) {
OrderDTO order=new OrderDTO();
--
Gitblit v1.7.1