From 31267d9b3a33c8b3fbb1b9f810ab08e01c49b846 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 19:12:28 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 e9ed88e..8b60268 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
@@ -274,13 +274,17 @@
                         .collect(Collectors.toSet());
                 List<Member> memberList = memberClient.
                         getMemberListByIds(collect, SecurityConstants.INNER).getData();
-                Map<Long, String> memberMap = memberList.stream()
-                        .collect(Collectors.toMap(Member::getId, Member::getNickname));
+                Map<Long, Member> memberMap = memberList.stream()
+                        .collect(Collectors.toMap(Member::getId, e -> e));
                 List<MgtAuctionBidRecordVO> mgtAuctionBidRecordVOS = BeanUtils.copyList(list,
                         MgtAuctionBidRecordVO.class);
                 for (MgtAuctionBidRecordVO vo : mgtAuctionBidRecordVOS) {
-                    String memberName = memberMap.get(vo.getMemberId());
-                    vo.setMemberName(StringUtils.isNotEmpty(memberName) ? memberName : "");
+                    Member member = memberMap.get(vo.getMemberId());
+                    if (StringUtils.isNotNull(member)) {
+                        vo.setMemberName(member.getNickname());
+                        vo.setPhone(member.getPhone());
+                    }
+
                 }
                 auctionGoodsVO.setRecordList(mgtAuctionBidRecordVOS);
             }
@@ -302,6 +306,10 @@
         if (StringUtils.isNull(auctionGoods)) {
             throw new ServiceException("拍卖商品不存在");
         }
+        // 远程调用商品服务,获取商品信息
+        GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(),
+                        SecurityConstants.INNER)
+                .getData();
         if (auctionGoods.getStartStatus().equals(AuctionStartStatusEnum.IN_AUCTION)) {
             // 查询出价记录
             List<AuctionBidRecord> auctionBidRecords = auctionBidRecordService.getBidRecordByGoodsId(
@@ -341,6 +349,11 @@
                     orderDTO.setReceiverDetailAddress(data.getDetailedAddress());
                     orderDTO.setReceiverphone(data.getRecipientPhone());
                 }
+                if (StringUtils.isNotNull(goodsSku)) {
+                    orderDTO.setCoverPic(goodsSku.getCoverPic());
+                    orderDTO.setPrice(goodsSku.getPrice());
+                    orderDTO.setSkuName(goodsSku.getSkuName());
+                }
                 orderClient.saveOrderOne(orderDTO, SecurityConstants.INNER);
             } else {
                 // 没有人出价,退回拍卖商品库存

--
Gitblit v1.7.1