Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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);
@@ -142,19 +149,22 @@
            }   if(auctionCollection.getType()==2){
                GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectById(auctionCollection.getTargetId());
                HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
                GoodsSku goodsSku = goodsSkuMapper.selectById(goodsGroupPurchase.getGoodsSkuId());
                auctionGoodsVO.setId(auctionCollection.getTargetId());
                auctionGoodsVO.setPrice(goodsGroupPurchase.getGroupPurchasePrice());
                auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
                auctionGoodsVO.setSkuName(goodsSku.getSkuName());
                auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
                auctionGoodsVO.setIsCollection(2);
                auctionGoodsVO.setXiaosPrice(goodsSku.getPrice());
                auctionGoodsVO.setStartTime(goodsGroupPurchase.getStartTime());
                auctionGoodsVO.setEndTime(goodsGroupPurchase.getEndTime());
                auctionGoodsVO.setXiaosPrice(goodsGroupPurchase.getGroupPurchasePrice());
                auctionGoodsVO.setType(auctionCollection.getType());
                auctionGoodsVOS.add(auctionGoodsVO);
                if(goodsGroupPurchase!=null){
                    GoodsSku goodsSku = goodsSkuMapper.selectById(goodsGroupPurchase.getGoodsSkuId());
                    auctionGoodsVO.setId(auctionCollection.getTargetId());
                    auctionGoodsVO.setPrice(goodsGroupPurchase.getGroupPurchasePrice());
                    auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
                    auctionGoodsVO.setSkuName(goodsSku.getSkuName());
                    auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
                    auctionGoodsVO.setIsCollection(2);
                    auctionGoodsVO.setXiaosPrice(goodsSku.getPrice());
                    auctionGoodsVO.setStartTime(goodsGroupPurchase.getStartTime());
                    auctionGoodsVO.setEndTime(goodsGroupPurchase.getEndTime());
                    auctionGoodsVO.setXiaosPrice(goodsGroupPurchase.getGroupPurchasePrice());
                    auctionGoodsVO.setType(auctionCollection.getType());
                    auctionGoodsVOS.add(auctionGoodsVO);
                }

            }

        }