From f44e4d609e7efaed9eac545137970b1e334f8106 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 21 九月 2024 09:01:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 5e6ff2c..f1b24c6 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -25,7 +25,6 @@
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomScreenVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.AuctionVideo;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
@@ -61,6 +60,7 @@
import com.ruoyi.system.api.constants.ConfigEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
+import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
@@ -113,6 +113,7 @@
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.util.EntityUtils;
@@ -129,6 +130,7 @@
* @author mitao
* @since 2024-05-16
*/
+@Slf4j
@Service
public class AuctionSalesroomServiceImpl extends ServiceImpl<AuctionSalesroomMapper, AuctionSalesroom> implements IAuctionSalesroomService {
@@ -465,8 +467,17 @@
memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime());
memberAuctionSalesroomInfoVO.setType(byId.getType());
memberAuctionSalesroomInfoVO.setDescription(byId.getDescription());
- memberAuctionSalesroomInfoVO.setSharePic(byId.getSharePic());
memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle());
+ if (StringUtils.isNotBlank(byId.getShareTitle())) {
+ memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle());
+ } else {
+ memberAuctionSalesroomInfoVO.setShareTitle(byId.getSalesroomName());
+ }
+ if (StringUtils.isNotBlank(byId.getSharePic())) {
+ memberAuctionSalesroomInfoVO.setSharePic(byId.getSharePic());
+ } else {
+ memberAuctionSalesroomInfoVO.setSharePic(byId.getCoverPic());
+ }
memberAuctionSalesroomInfoVO.setStartTime(byId.getStartTime());
memberAuctionSalesroomInfoVO.setStatus(byId.getStatus());
memberAuctionSalesroomInfoVO.setCoverPic(byId.getCoverPic());
@@ -1581,6 +1592,7 @@
order.setSkuName(goodsSku.getSkuName());
order.setCoverPic(goodsSku.getCoverPic());
order.setPrice(lastBidAmount);
+ order.setGoodsId(auctionSalesroomGoods.getGoodsSkuId());
orderClient.saveOrderOne(order, SecurityConstants.INNER);
}
/**
@@ -1672,8 +1684,7 @@
map.put("message_type", "start");
map.put("type", "1");
String msg = objectMapper.writeValueAsString(map);
- sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
- .clientType(ClientTypeEnum.AUCTIONEER).build(), SecurityConstants.INNER);
+ sysUserClient.pushAll(msg, SecurityConstants.INNER);
}
@Override
@@ -1718,7 +1729,8 @@
List<AuctionBidRecord> auctionBidRecordList = auctionBidRecordMapper.selectList(
Wrappers.<AuctionBidRecord>lambdaQuery()
.eq(AuctionBidRecord::getAuctionSalesroomId, auctionSalesroomId)
- .ne(AuctionBidRecord::getStatus, BidStatusEnum.SUCCESSFUL));
+ .eq(AuctionBidRecord::getStatus, BidStatusEnum.SUCCESSFUL));
+ log.info("拍卖场{}，已中标的用户：{}", auctionSalesroomId, auctionBidRecordList);
Set<Long> memberIdList = new HashSet<>();
if (CollUtils.isNotEmpty(auctionBidRecordList)) {
memberIdList = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
@@ -1735,8 +1747,7 @@
map.put("message_type", "end");
map.put("type", "1");
String msg = objectMapper.writeValueAsString(map);
- sysUserClient.pushByClientType(WebsocketMessageDTO.builder().message(msg)
- .clientType(ClientTypeEnum.AUCTIONEER).build(), SecurityConstants.INNER);
+ sysUserClient.pushAll(msg, SecurityConstants.INNER);
}
@Override
@@ -1778,4 +1789,25 @@
public AuctionSalesroomGoods getAuctionSalesroomGoodsById(Long goodsSkuId) {
return auctionSalesroomGoodsMapper.selectById(goodsSkuId);
}
+
+ @Override
+ public AuctionBondJl getAuctionBondJLBySalesroomId(Long targetId, Long memberId,
+ Integer bondType) {
+ return auctionBondJlMapper.selectOne(
+ Wrappers.lambdaQuery(AuctionBondJl.class).eq(AuctionBondJl::getMemberId, memberId)
+ .eq(AuctionBondJl::getAuctionSalesroomId, targetId)
+ .eq(AuctionBondJl::getBondType, bondType)
+ .last("limit 1"));
+ }
+
+ @Override
+ public List<GoodsSku> getGoodsSkuByAuctionSalesroomGoodsSet(
+ Set<Long> auctionSalesroomGoodsSet) {
+ List<AuctionSalesroomGoods> auctionSalesroomGoodsList = auctionSalesroomGoodsMapper.selectBatchIds(
+ auctionSalesroomGoodsSet);
+ Set<Long> goodsSkuIdSet = auctionSalesroomGoodsList.stream()
+ .map(AuctionSalesroomGoods::getGoodsSkuId).collect(
+ Collectors.toSet());
+ return goodsSkuClient.getGoodsListByIds(goodsSkuIdSet, SecurityConstants.INNER).getData();
+ }
}
--
Gitblit v1.7.1