From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:48:43 +0800
Subject: [PATCH] Merge branch 'mitao-dev'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 22742c2..69c7b40 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
@@ -16,6 +16,7 @@
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionBrowseRecordService;
import com.ruoyi.auction.service.IAuctionGoodsService;
+import com.ruoyi.auction.service.IMemberAuctionCollectionService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
@@ -80,10 +81,7 @@
private final IAuctionBidRecordService auctionBidRecordService;
@Resource
- private MemberAuctionCollectionServiceImpl memberAuctionCollectionServiceImpl;
-
- @Resource
- private IAuctionGoodsService auctionGoodsService;
+ private IMemberAuctionCollectionService memberAuctionCollectionService;
@Resource
private AuctionGoodsMapper auctionGoodsMapper;
@@ -369,7 +367,7 @@
@Override
public AuctionGoodsinfoVO getAuctionGoodsInfo(AuctionGoodsListDTO auctionGoodsListDTO) {
- AuctionGoods byId = auctionGoodsService.getById(auctionGoodsListDTO.getGoodsSkuId());
+ AuctionGoods byId = auctionGoodsMapper.selectById(auctionGoodsListDTO.getGoodsSkuId());
GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(byId.getGoodsSkuId(), SecurityConstants.INNER).getData();
AuctionGoodsinfoVO auctionGoodsinfoVO=new AuctionGoodsinfoVO();
auctionGoodsinfoVO.setGoodsSkuId(byId.getGoodsSkuId());
@@ -420,7 +418,7 @@
wrapper2.eq(MemberAuctionCollection::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper2.eq(MemberAuctionCollection::getTargetId,byId.getId());
wrapper2.eq(MemberAuctionCollection::getDelFlag,0);
- MemberAuctionCollection one = memberAuctionCollectionServiceImpl.getOne(wrapper2);
+ MemberAuctionCollection one = memberAuctionCollectionService.getOne(wrapper2);
if (one!=null){
auctionGoodsinfoVO.setIsCollection(2);
}else {
--
Gitblit v1.7.1