From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
index b2a3003..313439f 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
@@ -25,6 +25,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -63,12 +64,16 @@
LambdaQueryWrapper< MemberGoodsCollection> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberGoodsCollection::getMemberId,auctionCollectionDTO.getMemberId());
wrapper.eq(MemberGoodsCollection::getTargetId,auctionCollectionDTO.getGoodsSkuId());
+ if (auctionCollectionDTO.getType()!=null){
+ wrapper.eq(MemberGoodsCollection::getType,auctionCollectionDTO.getType());
+ }
if (auctionCollectionDTO.getState()==1){
List<MemberGoodsCollection> list = this.list(wrapper);
if (list.size()==0){
MemberGoodsCollection m =new MemberGoodsCollection();
m.setMemberId(auctionCollectionDTO.getMemberId());
m.setTargetId(auctionCollectionDTO.getGoodsSkuId());
+ m.setType(auctionCollectionDTO.getType());
this.save(m);
}
}else{
@@ -104,6 +109,10 @@
if (StringUtils.isNotEmpty(auctionCollectionDTO.getGoodsSkuName())){
if (goodsSkuIdList.size()>0){
wrapper.in(MemberGoodsCollection::getTargetId,goodsSkuIdList);
+ }else{
+ goodsSkuIdList=new HashSet<>();
+ goodsSkuIdList.add(0L);
+ wrapper.in(MemberGoodsCollection::getTargetId,goodsSkuIdList);
}
}
List<MemberGoodsCollection> list = this.list(wrapper);
@@ -121,7 +130,7 @@
auctionGoodsVO.setIsCollection(2);
auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
- } if(auctionCollection.getType()==2){
+ } if(auctionCollection.getType()==3){
HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
GoodsSeckill goodsSeckill = goodsSeckillMapper.selectById(auctionCollection.getTargetId());
GoodsSku goodsSku = goodsSkuMapper.selectById(goodsSeckill.getGoodsSkuId());
@@ -137,7 +146,7 @@
auctionGoodsVO.setXiaosPrice(goodsSku.getPrice());
auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
- } if(auctionCollection.getType()==3){
+ } if(auctionCollection.getType()==2){
GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectById(auctionCollection.getTargetId());
HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
GoodsSku goodsSku = goodsSkuMapper.selectById(goodsGroupPurchase.getGoodsSkuId());
--
Gitblit v1.7.1