From 2dcde26e44e85d84c3a20fee0aaed3724edba3bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 14:11:40 +0800
Subject: [PATCH] 用户端商品

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
index 3d566ff..6813e97 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -3,12 +3,12 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.auction.domain.AuctionBrowseRecord;
 import com.ruoyi.auction.mapper.AuctionBrowseRecordMapper;
 import com.ruoyi.auction.mapper.AuctionGoodsMapper;
 import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
 import com.ruoyi.auction.service.IAuctionBrowseRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.page.PageDTO;
@@ -24,15 +24,14 @@
 import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
 import com.ruoyi.system.api.feignClient.GoodsSkuClient;
 import com.ruoyi.system.api.feignClient.OrderClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -45,8 +44,7 @@
 @Service
 public class AuctionBrowseRecordServiceImpl extends ServiceImpl<AuctionBrowseRecordMapper, AuctionBrowseRecord> implements IAuctionBrowseRecordService {
 
-    @Resource
-    private IAuctionBrowseRecordService iAuctionBrowseRecordService;
+
 
     @Resource
     private AuctionSalesroomMapper auctionSalesroomMapper;
@@ -78,7 +76,7 @@
         wrapper3.ge(AuctionBrowseRecord::getCreateTime, parseTime7)
                 .le(AuctionBrowseRecord::getCreateTime, parseTime);
 
-        List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
+        List<AuctionBrowseRecord> list = this.list(wrapper3);
         Set<Long> goodsSkuIdList = null;
         goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
                 .collect(Collectors.toSet());
@@ -119,8 +117,10 @@
             auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit());
             auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName());
             auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic());
+            auctionGoodsVO.setYears(String.valueOf(goodsSkuOne.getYears().getYear()));
+            auctionGoodsVO.setDescription(goodsSkuOne.getDescription());
+            auctionGoodsVO.setDetail(goodsSkuOne.getDetail());
             auctionGoodsVOS.add(auctionGoodsVO);
-
         }
         page.setRecords(auctionGoodsVOS);
         return PageDTO.of(page);
@@ -143,7 +143,7 @@
         wrapper3.ge(AuctionBrowseRecord::getCreateTime, parseTime7)
                 .le(AuctionBrowseRecord::getCreateTime, parseTime);
 
-        List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
+        List<AuctionBrowseRecord> list = this.list(wrapper3);
         Set<Long> goodsSkuIdList = null;
         goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
                 .collect(Collectors.toSet());
@@ -166,7 +166,7 @@
             MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
             memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
             memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
-            List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
+            List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
             memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
             List.add(memberAuctionSalesroomVO);
         }

--
Gitblit v1.7.1