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/MemberAuctionCollectionServiceImpl.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
index 450c310..343e525 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
@@ -3,11 +3,11 @@
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.ruoyi.auction.domain.MemberAuctionCollection;
-import com.ruoyi.auction.mapper.MemberAuctionCollectionMapper;
-import com.ruoyi.auction.service.IAuctionGoodsService;
-import com.ruoyi.auction.service.IMemberAuctionCollectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.auction.domain.MemberAuctionCollection;
+import com.ruoyi.auction.mapper.AuctionGoodsMapper;
+import com.ruoyi.auction.mapper.MemberAuctionCollectionMapper;
+import com.ruoyi.auction.service.IMemberAuctionCollectionService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -18,13 +18,12 @@
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
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>
@@ -38,12 +37,10 @@
public class MemberAuctionCollectionServiceImpl extends ServiceImpl<MemberAuctionCollectionMapper, MemberAuctionCollection> implements IMemberAuctionCollectionService {
@Resource
- private IMemberAuctionCollectionService memberAuctionCollectionService;
-
- @Resource
private GoodsSkuClient goodsSkuClient;
@Resource
- private IAuctionGoodsService auctionGoodsService;
+ private AuctionGoodsMapper auctionGoodsMapper;
+
@Override
public void saveAuctionCollection(AuctionCollectionDTO auctionCollectionDTO) {
@@ -58,18 +55,18 @@
wrapper.eq(MemberAuctionCollection::getMemberId,auctionCollectionDTO.getMemberId());
wrapper.eq(MemberAuctionCollection::getTargetId,auctionCollectionDTO.getGoodsSkuId());
if (auctionCollectionDTO.getState()==1){
- List<MemberAuctionCollection> list = memberAuctionCollectionService.list(wrapper);
+ List<MemberAuctionCollection> list = this.list(wrapper);
if (list.size()==0){
MemberAuctionCollection m =new MemberAuctionCollection();
m.setMemberId(auctionCollectionDTO.getMemberId());
m.setTargetId(auctionCollectionDTO.getGoodsSkuId());
- memberAuctionCollectionService.save(m);
+ this.save(m);
}
}else{
- List<MemberAuctionCollection> list = memberAuctionCollectionService.list(wrapper);
+ List<MemberAuctionCollection> list = this.list(wrapper);
if (list.size()>0){
for (MemberAuctionCollection memberArticleCollection:list){
- memberAuctionCollectionService.removeById(memberArticleCollection);
+ this.removeById(memberArticleCollection);
}
}
@@ -94,11 +91,11 @@
page.setCurrent(auctionCollectionDTO.getPageCurr());
LambdaQueryWrapper< MemberAuctionCollection> wrapper= Wrappers.lambdaQuery();
wrapper.in( MemberAuctionCollection::getTargetId, goodsSkuIdList);
- List<MemberAuctionCollection> list = memberAuctionCollectionService.list(wrapper);
+ List<MemberAuctionCollection> list = this.list(wrapper);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
for (MemberAuctionCollection auctionCollection:list){
- AuctionGoods auctionGoods= auctionGoodsService.getById(auctionCollection.getId());
+ AuctionGoods auctionGoods = auctionGoodsMapper.selectById(auctionCollection.getId());
AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
auctionGoodsVO.setAuctionStock(auctionGoods.getAuctionStock());
auctionGoodsVO.setGoodsSkuId(auctionGoods.getId());
--
Gitblit v1.7.1