修改bug

mitao

2024-07-26 357bf93f7fa56e414ad54d4fbfbf6bd97da5b1d2

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

@@ -285,6 +285,7 @@
        groupPurchase.setGroupStatus(
                res ? GroupStatusEnum.FORMED_INTO_A_GROUP : GroupStatusEnum.GROUP_FAILURE);
        groupPurchase.setStartStatus(StartStatusEnum.ENDED);

        this.updateById(groupPurchase);
    }

@@ -322,7 +323,7 @@
                    });
                    try {
                        log.info(
                                "============  =================退款结束=============================");
                                "=============================退款结束=============================");
                        log.info("退款成功订单：{}",
                                objectMapper.writeValueAsString(successfulOrders));
                        log.info("退款失败订单：{}", objectMapper.writeValueAsString(failedOrders));
@@ -349,6 +350,13 @@
                orderClient.updateOrderStatusByMubres(formedGroupMubres, SecurityConstants.INNER);
                return true;
            }
            List<GoodsGroupPurchaseInfo> notGroupedList = groupPurchaseInfoList.stream()
                    .filter(g -> !g.getCurrentNumber()
                            .equals(g.getGroupSize())).peek(p -> {
                        p.setGroupStatus(GroupStatusEnum.GROUP_FAILURE.getCode());
                    }).collect(
                            Collectors.toList());
            goodsGroupPurchaseInfoService.updateBatchById(notGroupedList);
        }
        return false;
    }
@@ -374,12 +382,14 @@
        goodsGroupPurchaseInfoVO.setShareTitle(one.getShareTitle());
        goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
        goodsGroupPurchaseInfoVO.setStartStatus(one.getStartStatus());
        goodsGroupPurchaseInfoVO.setStartTime(one.getStartTime());
        goodsGroupPurchaseInfoVO.setEndTime(one.getEndTime());
        goodsGroupPurchaseInfoVO.setSharePic(one.getSharePic());
        goodsGroupPurchaseInfoVO.setGroupPurchasePrice(one.getGroupPurchasePrice());
        goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
        goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());

        if (one.getGroupStatus().getCode()==2){
        if (one.getGroupStatus().getCode()==0){
            LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
            wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
            wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
@@ -400,7 +410,7 @@
                goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
            }
        }else{
            goodsGroupPurchaseInfoVO.setCurrentNumber(one.getGroupSize());
            goodsGroupPurchaseInfoVO.setCurrentNumber(one.getCurrentNumber());
            goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
        }

@@ -425,7 +435,7 @@
        HomeGoodsSkuDTO homeGoodsSkuDTO1=new HomeGoodsSkuDTO();
        homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
        homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
        Order data = orderClient.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
        Order data = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
        if (data!=null){
            goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
            goodsGroupPurchaseInfoVO.setOrder(data);
@@ -451,11 +461,16 @@
            }
        }else{
            if (one.getGroupStatus().getCode()==0){
                if (one.getGroupSize()-one.getCurrentNumber()<5){
                    goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
                if (one.getGroupSize()>5){
                    if (one.getGroupSize()-one.getCurrentNumber()<5){
                        goodsGroupPurchaseInfoVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
                    }else{
                        goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
                    }
                }else{
                    goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
                }

            }else {
                goodsGroupPurchaseInfoVO.setGroupStatus(one.getGroupStatus());
            }
@@ -550,31 +565,33 @@
            orderDTO.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
            orderDTO.setGoodsSkuId(goodsGroupPurchaseeVO.getId());
            orderDTO.setMemberId(homeGoodsSkuDTO.getMemberId());
            Order orderOne = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData();
            Order orderOne = orderClient.getOrderOne2(orderDTO, SecurityConstants.INNER).getData();

            LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
            wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
            wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
            wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsGroupPurchaseeVO.getId());
            wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,orderOne.getGroupNo());
            GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
            if (one1!=null){
                goodsGroupPurchaseeVO.setCurrentNumber(one1.getCurrentNumber());
                if (one1.getGroupStatus()==0){
                    if (one1.getGroupSize()-one1.getCurrentNumber()<5){
                        goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
                    }else{
                    goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
            if (orderOne!=null){
                LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
                wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
                wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsGroupPurchaseeVO.getId());
                wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,orderOne.getGroupNo());
                GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
                if (one1!=null){
                    goodsGroupPurchaseeVO.setCurrentNumber(one1.getCurrentNumber());
                    if (one1.getGroupStatus()==0){
                        if (one1.getGroupSize()-one1.getCurrentNumber()<5){
                            goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.MS_FAILURE);
                        }else{
                            goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
                        }
                    }if (one1.getGroupStatus()==1){
                        goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
                    }if (one1.getGroupStatus()==2){
                        goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                    }
                }if (one1.getGroupStatus()==1){
                    goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
                }if (one1.getGroupStatus()==2){
                    goodsGroupPurchaseeVO.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                }

                }
            }



        }