Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-18 c23f48c5ec15476299edadd91fa18f908d710a4f

 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,7 +64,9 @@
        LambdaQueryWrapper< MemberGoodsCollection> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberGoodsCollection::getMemberId,auctionCollectionDTO.getMemberId());
        wrapper.eq(MemberGoodsCollection::getTargetId,auctionCollectionDTO.getGoodsSkuId());
        wrapper.eq(MemberGoodsCollection::getType,auctionCollectionDTO.getType());
        if (auctionCollectionDTO.getType()!=null){
            wrapper.eq(MemberGoodsCollection::getType,auctionCollectionDTO.getType());
        }
        if (auctionCollectionDTO.getState()==1){
            List<MemberGoodsCollection> list = this.list(wrapper);
            if (list.size()==0){
@@ -106,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);