修改bug

rentaiming

2024-07-10 b29becf95484be48aa09e87fcc7cc19f94cf9c81

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

@@ -284,8 +284,11 @@

        if (memberOrderDTO.getOrderFrom()==1){
            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (goodsSku.getListingStatus().getCode()==1){
                throw new ServiceException("该商品已经下架");
            }
            if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
                throw new ServiceException("对不起，购买数大于库存");
                throw new ServiceException("该商品已售罄，暂无库存");
            }else{
                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
@@ -305,6 +308,10 @@
        }
        if (memberOrderDTO.getOrderFrom()==2){
            GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (data.getListingStatus().getCode()==1){
                throw new ServiceException("该商品已经下架");
            }

            String goodsLock = "goods_lock_" + CacheConstants.SECKILL_GOODS + data.getId();
            RLock redissonLock = redissonClient.getLock(goodsLock);
            Integer surpNum = 0;
@@ -333,7 +340,7 @@

            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (data.getLimitNumber()<num1) {
                throw new ServiceException("对不起，大于商品购买数");
                throw new ServiceException("该商品已售罄，暂无库存");
            }

            order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
@@ -346,7 +353,7 @@
            pice=data.getSeckillPrice();

            if (data.getSeckillStock()<1){
                throw new ServiceException("对不起，购买数大于库存");
                throw new ServiceException("该商品已售罄，暂无库存");
            }else{
                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(data.getId());
@@ -363,6 +370,9 @@
        if (memberOrderDTO.getOrderFrom()==3){
            order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
            GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (data.getListingStatus().getCode()==1){
                throw new ServiceException("该商品已经下架");
            }
            Integer m=data.getCurrentNumber()+1;
            if (m>data.getGroupSize()){
                throw new ServiceException("对不起，大成团人数");
@@ -461,15 +471,16 @@
            if (order.getOrderFrom().getCode()==1){
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();

                    GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                    goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
                    goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                    goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
                            SecurityConstants.INNER);

                if (goodsSku.getStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
                    throw new ServiceException("对不起，购买数大于库存");
                    throw new ServiceException("该商品已售罄，暂无库存");
                }

                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
                goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
                        SecurityConstants.INNER);

                     Integer m= goodsSku.getStock()+order.getGoodsQuantity();
                    goodsStockUpdDTO.setAuctionStock(m-memberOrderDTO.getGoodsQuantity());
                    goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
@@ -502,14 +513,16 @@
                    if (data.getLimitNumber()<num1){
                        throw new ServiceException("对不起，大于商品购买数");
                    }else{


                        if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
                            throw new ServiceException("该商品已售罄，暂无库存");
                        }

                        GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                        goodsStockUpdDTO.setGoodsSkuId(data.getId());
                        goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                        goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);

                        if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
                            throw new ServiceException("对不起，购买数大于库存");
                        }

                        Integer m=data.getSeckillStock()+order.getGoodsQuantity();
                        GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
@@ -548,7 +561,7 @@
                        throw new ServiceException("对不起，大于商品购买数");
                    }else{
                        if (data.getLimitNumber()<memberOrderDTO.getGoodsQuantity()){
                            throw new ServiceException("对不起，购买数大于库存");
                            throw new ServiceException("该商品已售罄，暂无库存");
                        }else{
                            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
                            memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -688,6 +701,10 @@
        }
        if(memberOrderListDTO.getOrderStatus()!=null){
            wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode()-1);
        }

        if(memberOrderListDTO.getIsRequest()!=null){
            wrapper.eq(Order::getIsRequest,memberOrderListDTO.getIsRequest());
        }
        wrapper.eq(Order::getIsOrder,1);
        wrapper.eq(Order::getDelFlag,0);
@@ -991,8 +1008,6 @@

    @Override
    public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {


        LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
        wrapper1.eq(Order::getOrderStatus,1);
@@ -1037,6 +1052,13 @@
        List<Order> list2 = this.list(paylogEntityWrapper2);
        vo.setDshorderNo(list2.size());



        LambdaQueryWrapper<Order> paylogEntityWrapper3 = Wrappers.lambdaQuery();
        paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper3.eq(Order::getIsRequest,2);
        List<Order> list3 = this.list(paylogEntityWrapper3);
        vo.setShorderNo(list3.size());
        return vo;
    }