From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 18:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index 060016a..2352ce6 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -28,6 +28,7 @@
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.GoodsSku;
@@ -426,4 +427,59 @@
}
return auctionGoodsinfoVO;
}
+
+ @Override
+ public PageDTO<AuctionGoodsListVO> getWdAuctionSalesList(AuctionGoodsListDTO auctionGoodsListDTO) {
+ MemberAuctionSalesroomDTO memberAuctionSalesroomDTO =new MemberAuctionSalesroomDTO();
+ memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId());
+ List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
+ .collect(Collectors.toSet());
+
+ AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+
+ Page<AuctionGoodsListVO> page = new Page<>();
+ page.setSize(auctionGoodsListDTO.getPageSize());
+ page.setCurrent(auctionGoodsListDTO.getPageCurr());
+ List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
+ List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
+ for (AuctionGoods auctionGoods:auctionGoodsPgeList){
+ AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
+ auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock());
+ auctionGoodsVO.setGoodsSkuId(auctionGoods.getId());
+ auctionGoodsVO.setEndTime(auctionGoods.getEndTime());
+ auctionGoodsVO.setStartTime(auctionGoods.getStartTime());
+ auctionGoodsVO.setStartingPrice(auctionGoods.getStartingPrice());
+ auctionGoodsVO.setStartStatus(auctionGoods.getStartStatus());
+ GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ auctionGoodsVO.setUnit(goodsSkuOne.getUnit());
+ auctionGoodsVO.setSpec(goodsSkuOne.getSpec());
+ auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit());
+ auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName());
+ auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic());
+
+ LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
+ wrapper1.eq(AuctionBidRecord::getAuctionType,1);
+ wrapper1.eq(AuctionBidRecord::getTargetId,auctionGoods.getId());
+ wrapper1.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
+ if (list1!=null){
+ if (list1.getStatus().getCode()==2){
+ auctionGoodsVO.setIsStatus(2);
+ }else{
+ auctionGoodsVO.setIsStatus(1);
+ }
+ }else{
+ auctionGoodsVO.setIsStatus(1);
+ }
+
+ auctionGoodsVOS.add(auctionGoodsVO);
+
+ }
+ page.setRecords(auctionGoodsVOS);
+ return PageDTO.of(page);
+ }
}
--
Gitblit v1.7.1