From 1a7c0511f65e406d459f4ec6a0c12737d0933946 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 18 六月 2024 18:25:27 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 c193f7b..b43bbfb 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
@@ -43,10 +43,7 @@
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
-import com.ruoyi.system.api.feignClient.AuctionClient;
-import com.ruoyi.system.api.feignClient.GoodsSkuClient;
-import com.ruoyi.system.api.feignClient.MemberClient;
-import com.ruoyi.system.api.feignClient.OrderClient;
+import com.ruoyi.system.api.feignClient.*;
import com.ruoyi.system.api.util.WebSocketUsers;
import io.seata.spring.annotation.GlobalTransactional;
import java.time.LocalDateTime;
@@ -81,6 +78,7 @@
private final GoodsSkuClient goodsSkuClient;
private final MemberClient memberClient;
private final OrderClient orderClient;
+ private final SysUserClient sysUserClient;
private final AuctionClient auctionClient;
private final IAuctionBidRecordService auctionBidRecordService;
@@ -422,7 +420,7 @@
auctionGoodsinfoVO.setUnit(goodsSkuOne.getUnit());
auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setDescription(goodsSkuOne.getDescription());
- auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
+ auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
GoodsBrand data = goodsSkuClient.getBrandOne(goodsSkuOne.getBrandId(), SecurityConstants.INNER).getData();
GoodsCategory data1 = goodsSkuClient.getCategoryOne(goodsSkuOne.getCategoryId(), SecurityConstants.INNER).getData();
GoodsSeries data2 = goodsSkuClient.getSeriesOne(goodsSkuOne.getSeriesId(), SecurityConstants.INNER).getData();
@@ -441,7 +439,9 @@
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
auctionGoodsinfoVO.setBond(byId.getBond());
- auctionGoodsinfoVO.setYears(String.valueOf(goodsSkuOne.getYears()));
+ auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
+ auctionGoodsinfoVO.setSharePic(goodsSkuOne.getSharePic());
+ auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionType,1);
@@ -505,7 +505,8 @@
}
-
+ CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+ auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue());
return auctionGoodsinfoVO;
}
--
Gitblit v1.7.1