From 0858bae1cdbfe973ca53985e151cae48b81c8b0b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 9d38fbe..3a85a56 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
@@ -122,7 +122,7 @@
.getData();
forepartAuctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getId());
forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName());
- forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus());
+ forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
@@ -203,7 +203,7 @@
currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods.getId());
currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime());
- currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus());
+ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration());
auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
list.add(auctionSalesroomGoods.getSortNum());
@@ -231,7 +231,7 @@
currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoodss.getId());
currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoodss.getStartTime());
- currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus());
+ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus().getCode());
currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration());
auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum());
@@ -250,7 +250,7 @@
GoodsSku goodsSku1=goodsSkuOne1.getData();
nextAuctionSalesroomGoods.setNextGoodsSkuName(goodsSku1.getSkuName());
nextAuctionSalesroomGoods.setCoverPic(goodsSku1.getCoverPic());
- nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus());
+ nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus().getCode());
nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getId());
auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods);
}
@@ -270,13 +270,15 @@
forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku2.getSkuName());
forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku2.getCoverPic());
forepartAuctionSalesroomGoodsVO1.setGoodsSkuId(salesroomGoods.getId());
- forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus());
+ forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus().getCode());
auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1);
}
}
auctionSalesroomVO.setElseAuctionSalesroomGoods(auctionSalesroomGoodsVOS);
+
+
return auctionSalesroomVO;
@@ -418,6 +420,9 @@
AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2);
auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS);
auctionSalesroomGoods.setStartTime(LocalDateTime.now());
+ if (auctionSalesroomGoods.getBackupStatus()){
+ auctionSalesroomGoods.setBackupStatus(false);
+ }
this.updateById(auctionSalesroomGoods);
Map<String, Object> map = new ConcurrentHashMap<>();
@@ -467,6 +472,7 @@
for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
+ auctionBidRecordMapper.updateById(auctionBidRecord);
AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
}
@@ -481,6 +487,7 @@
for (int i = 0; i < auctionBidRecordList.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
+ auctionBidRecordMapper.updateById(auctionBidRecord);
AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
}
@@ -593,15 +600,16 @@
if (list2!=null){
AuctionSalesroomGoodsInfoVO.setZgBid(list2.getLastBidAmount());
}
-
- /* List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(homeGoodsSkuDTO.getGoodsSkuId());
+ List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>();
+ List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsSkuClient.getlistByGoodsId(goodsSku.getId(), SecurityConstants.INNER).getData();
Collections.sort(goodsInfoTitleValueVOList, Comparator.comparingInt(GoodsInfoTitleValueVO::getSortNum));
for (GoodsInfoTitleValueVO goodsInfoTitleValueVO:goodsInfoTitleValueVOList){
getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO();
getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVO.getContent());
getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVO.getTitleName());
homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVOs);
- }*/
+ }
+ AuctionSalesroomGoodsInfoVO.setXxiVOS(homeGoodsSkuXxiVOS);
return AuctionSalesroomGoodsInfoVO;
}
@@ -622,7 +630,7 @@
auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname());
- auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getId());
+ auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getMemberId());
auctionBidRecordVOList.add(auctionBidRecordVO);
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
--
Gitblit v1.7.1