修改bug

rentaiming

2024-07-05 15643b219ddf09703ff344289a0142afef0fac6d

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java

@@ -318,12 +318,13 @@
        goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice());
        goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
        goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());
        goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
        goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
        goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
        goodsGroupPurchaseInfoVO.setDescription(one.getDescription());
        goodsGroupPurchaseInfoVO.setDetail(byId.getDescription());
        goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus());
        goodsGroupPurchaseInfoVO.setListingStatus(one.getListingStatus());
        goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());

        LambdaQueryWrapper<MemberGoodsCollection> wrapper4= Wrappers.lambdaQuery();
        wrapper4.eq(MemberGoodsCollection::getDelFlag,0);
@@ -343,7 +344,17 @@
        if (data!=null){
            goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
            goodsGroupPurchaseInfoVO.setOrder(data);
            goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.YCT_FAILURE);
        }else{
            if (one.getGroupStatus().getCode()==0){
                if (one.getGroupSize()-one.getCurrentNumber()<5){
                    goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
                }else{
                    goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
                }
            }else {
                goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
            }
            goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(1);
        }

@@ -396,11 +407,28 @@
        List<Long> goodsSkuIdList = data.stream()
                .map(OrderVO::getGoodsSkuId)
                .collect(Collectors.toList());

        LambdaQueryWrapper< GoodsSku> wrapper1= Wrappers.lambdaQuery();
        if (homeGoodsSkuDTO.getSkuName()!=null&&homeGoodsSkuDTO.getSkuName()!=""){
            wrapper1.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
        }
        List<GoodsSku> list = goodsSkuService.list(wrapper1);

        List<Long> goodsSkuIdList1 = list.stream()
                .map(GoodsSku::getId)
                .collect(Collectors.toList());

        Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize());
        LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery();
        if (goodsSkuIdList.size()>0){
            wrapper.in(GoodsGroupPurchase::getId,goodsSkuIdList);
        }
        if (goodsSkuIdList1.size()>0){
            wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList1);
        }else {
            goodsSkuIdList1.add(0L);
            wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList1);
        }
        wrapper.eq(GoodsGroupPurchase::getListingStatus,0);
        wrapper.eq( GoodsGroupPurchase::getDelFlag,0);
        Page< GoodsGroupPurchase> page1 = this.page(page, wrapper);