From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 73b0892..7503e82 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
@@ -479,6 +479,7 @@
memberAuctionSalesroomInfoVO.setType(byId.getType());
memberAuctionSalesroomInfoVO.setDescription(byId.getDescription());
memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle());
+ memberAuctionSalesroomInfoVO.setAuctionAgreement(byId.getAuctionAgreement());
if (StringUtils.isNotBlank(byId.getShareTitle())) {
memberAuctionSalesroomInfoVO.setShareTitle(byId.getShareTitle());
} else {
@@ -529,6 +530,7 @@
forepartAuctionSalesroomGoodsVO.setDealQuantity(salesroomGoods.getDealQuantity());
forepartAuctionSalesroomGoodsVO.setMaxAmount(salesroomGoods.getMaxAmount());
forepartAuctionSalesroomGoodsVO.setBidNum(salesroomGoods.getBidNum());
+ forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
@@ -707,7 +709,8 @@
SecurityConstants.INNER);
GoodsSku goodsSku = goodsSkuOneR.getData();
// 判断否大于最高价
- if (byId.getMaxAmount().compareTo(bidVO.getLastBidAmount()) < 0) {
+ if (Objects.nonNull(byId.getMaxAmount())
+ && byId.getMaxAmount().compareTo(bidVO.getLastBidAmount()) < 0) {
throw new ServiceException("出价不能高出最高价");
}
// 查询用户出价记录判断是否第一次出价 首次出价，可以只出起拍价，而不是需要比起拍价高。
@@ -1620,8 +1623,7 @@
if (CollUtils.isNotEmpty(successMemberList)) {
// 推送websocket消息
sendWebsocketMsg(auctionSalesroomGoods.getId(), successMemberList,
- goodsSku, 1,
- orderIdMap, bidMap);
+ goodsSku, 1, orderIdMap, bidMap);
// 发送短信通知
List<String> mobileList = successMemberList.stream()
.map(Member::getPhone)
@@ -1638,8 +1640,7 @@
if (CollUtils.isNotEmpty(failedMemberList)) {
// 推送websocket消息
sendWebsocketMsg(auctionSalesroomGoods.getId(), failedMemberList,
- goodsSku, 0,
- orderIdMap, bidMap);
+ goodsSku, 0, orderIdMap, bidMap);
// 发送短信通知
List<String> mobileList = failedMemberList.stream()
.map(Member::getPhone)
@@ -1696,10 +1697,11 @@
map.put("success_flag", successFlag);
map.put("order_id", successFlag == 1 ? userIdMap.getOrDefault(member.getId(), "") : "");
map.put("auction_bid_record_id", bidMap.getOrDefault(member.getId(), "0"));
+ map.put("member_id", member.getId().toString());
String msg = com.alibaba.fastjson2.JSONObject.toJSONString(map);
- sysUserClient.pushBatch(
- WebsocketMessageDTO.builder().message(msg).userId(member.getUserId()).build(),
- SecurityConstants.INNER);
+ sysUserClient.pushByClientType(
+ WebsocketMessageDTO.builder().message(msg).clientType(ClientTypeEnum.MEMBER)
+ .build(), SecurityConstants.INNER);
log.info("===================>发送websocket通知，消息体{}", msg);
}
}
--
Gitblit v1.7.1