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/AuctionGoodsServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 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 24203d4..080abca 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
@@ -12,7 +12,6 @@
import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.MemberAuctionCollection;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
@@ -38,6 +37,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.constants.ConfigEnum;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
+import com.ruoyi.system.api.domain.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.GoodsBrand;
@@ -396,6 +396,7 @@
orderDTO.setSkuName(goodsSku.getSkuName());
}
orderDTO.setOrderTimeSx(auctionGoods.getEndTime());
+ orderDTO.setGoodsId(auctionGoods.getGoodsSkuId());
orderClient.saveOrderOne(orderDTO, SecurityConstants.INNER);
}
} else {
@@ -557,12 +558,19 @@
auctionGoodsinfoVO.setMinimumMarkupAmount(byId.getMinimumMarkupAmount());
auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec());
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
- auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
- auctionGoodsinfoVO.setSharePic(byId.getSharePic());
- auctionGoodsinfoVO.setShareTitle(byId.getShareTitle());
+ if (StringUtils.isNotBlank(byId.getShareTitle())) {
+ auctionGoodsinfoVO.setShareTitle(byId.getShareTitle());
+ } else {
+ auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getSkuName());
+ }
+ if (StringUtils.isNotBlank(byId.getSharePic())) {
+ auctionGoodsinfoVO.setSharePic(byId.getSharePic());
+ } else {
+ auctionGoodsinfoVO.setSharePic(goodsSkuOne.getCoverPic());
+ }
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getAuctionType,1);
wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId());
@@ -823,6 +831,7 @@
orderDTO.setSkuName(goodsSku.getSkuName());
}
orderDTO.setOrderTimeSx(auctionGoods.getEndTime());
+ orderDTO.setGoodsId(auctionGoods.getGoodsSkuId());
orderClient.saveOrderOne(orderDTO, SecurityConstants.INNER);
}
} else {
@@ -954,4 +963,11 @@
System.out.println(msg);
}
+ @Override
+ public List<GoodsSku> getGoodsSkuByAuctionGoodsIdSet(Set<Long> auctionGoodsIdSet) {
+ List<AuctionGoods> auctionGoodsList = this.listByIds(auctionGoodsIdSet);
+ List<Long> goodsSkuIdList = auctionGoodsList.stream().map(AuctionGoods::getGoodsSkuId)
+ .collect(Collectors.toList());
+ return goodsSkuClient.getGoodsListByIds(goodsSkuIdList, SecurityConstants.INNER).getData();
+ }
}
--
Gitblit v1.7.1