rentaiming
2024-07-22 80262701ddf3142954ea649ccc3eaa138e60aa04
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -299,6 +299,11 @@
        LambdaQueryWrapper<GoodsSku> wrapper3= Wrappers.lambdaQuery();
        wrapper3.eq(GoodsSku::getDelFlag,0);
        wrapper3.eq(GoodsSku::getListingStatus,0);
        if(homeGoodsSkuDTO.getId()!=null){
            List arr=new ArrayList<>();
            arr.add(homeGoodsSkuDTO.getId());
            wrapper3.notIn(GoodsSku::getId,arr);
        }
        if (homeGoodsSkuDTO.getSkuName()!=null&&homeGoodsSkuDTO.getSkuName()!=""){
            wrapper3.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
        }
@@ -458,12 +463,13 @@
        }else{
            homeGoodsSkuInfoVO.setIsCollection(1);
        }
        List list1=new ArrayList<>();
        list1.add(0);
        list1.add(1);
        LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>();
        queryWrapper2.eq(GoodsGroupPurchase::getListingStatus,
                        ListingStatusEnum.ON_SHELVES)
                .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId())
                .eq(GoodsGroupPurchase::getStartStatus,
                        StartStatusEnum.STARTED);
                .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId()).in(GoodsGroupPurchase::getStartStatus, list1);
        GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2);
        if (goodsGroupPurchase2!=null){
            homeGoodsSkuInfoVO.setGroupPurchaseGoods(2);
@@ -479,8 +485,8 @@
        wrapper4.eq(GoodsBrowseRecord::getMemberId,homeGoodsSkuDTO.getMemberId());
        wrapper4.ge(GoodsBrowseRecord::getCreateTime, newTime7)
                .le(GoodsBrowseRecord::getCreateTime,now );
        List<GoodsBrowseRecord> list1 = iGoodsBrowseRecordService.list(wrapper4);
        if (list1.size()==0){
        List<GoodsBrowseRecord> list2 = iGoodsBrowseRecordService.list(wrapper4);
        if (list2.size()==0){
            GoodsBrowseRecord auctionBrowseRecord=new GoodsBrowseRecord();
            auctionBrowseRecord.setMemberId(homeGoodsSkuDTO.getMemberId());
            auctionBrowseRecord.setGoodsSkuId(homeGoodsSkuDTO.getGoodsSkuId());