修改bug

rentaiming

2024-07-31 ca30305160a56538c630e64a3f78a08429c90777

修改bug

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -1154,6 +1154,11 @@
            order.setReceiveTime(LocalDateTime.now());
            baseMapper.updateById(order);

            if (order.getAuctionOrderType().getCode()==1){

            }else{

            }
            LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
            OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
@@ -1320,16 +1325,14 @@

            GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
            BeanUtils.copyProperties(data,goodsGroupPurchaseeVO1);
            GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
           /* GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
            goodsGroupPurchaseeVO1.setGoodsSkuName(byId.getSkuName());
            goodsGroupPurchaseeVO1.setCoverPic(byId.getCoverPic());
            goodsGroupPurchaseeVO1.setPrice(byId.getPrice());
            goodsGroupPurchaseeVO1.setYears(String.valueOf(byId.getYears().getYear()));
            goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
            goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);*/
            if (byId1.getGroupNo()!=null){
                GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData();

                if (one1.getGroupStatus()==3){
                    if (one1!=null) {
                        goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
                        if (one1.getGroupStatus() == 0) {
@@ -1346,11 +1349,15 @@
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                        }
                    }else{
                        goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
                    }
                }else{
                    goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
                    goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                        if (data.getGroupStatus().getCode()==1){
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
                        }
                        if (data.getGroupStatus().getCode()==2){
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
                        }
                        if (data.getGroupStatus().getCode()==3){
                            goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
                        }
                }

            }