修改bug

rentaiming

2024-07-26 8d738d847973e1184a704b5ca3d4f492bffdb03f

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

@@ -27,6 +27,7 @@
import com.ruoyi.order.controller.management.dto.MgtOrderQuery;
import com.ruoyi.order.controller.management.vo.MgtOrderReturnRequestVO;
import com.ruoyi.order.controller.management.vo.MgtOrderVO;
import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
@@ -266,6 +267,11 @@
    }

    @Override
    public Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return baseMapper.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO);
    }

    @Override
    public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO);
    }
@@ -344,6 +350,7 @@

            MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
            memberOrderDTO1.setMemberId(order.getMemberId());
            memberOrderDTO1.setId(order.getId());
            memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
            Integer num1=0;
@@ -395,10 +402,29 @@
            if (data.getStartStatus().getCode()==0){
                throw new ServiceException("该商品未开始");
            }
            Integer m=data.getCurrentNumber()+1;
            GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
            if (goodsSeckiGoodsGroupPurchaseInfo==null){
                GoodsGroupPurchase data1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
                Integer num= data.getGroupSize()*data.getLimitNumber();
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data1.getGoodsSkuId(), SecurityConstants.INNER).getData();
                if (goodsSku.getSortNum()<num){
                    throw new ServiceException("该商品库存不足无法团购");
                }

                GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
                goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
                goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-num);
                goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
                        SecurityConstants.INNER);

            }
            /*Integer m=data.getCurrentNumber()+1;
            if (m>data.getGroupSize()){
                throw new ServiceException("对不起，大成团人数");
            }
            }*/



            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -521,25 +547,21 @@
            if (order.getOrderFrom().getCode()==2){
                MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
                memberOrderDTO1.setMemberId(order.getMemberId());
                memberOrderDTO1.setId(order.getId());
                memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
                Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
                Integer num1=0;
                if(num!=order.getGoodsQuantity()){
                    if (num!=null){
                        num1 =num+order.getGoodsQuantity();
                        num1 =num+memberOrderDTO.getGoodsQuantity();
                    }else{
                        num1=order.getGoodsQuantity();
                    }
                }else{
                      num1=num;
                }


                GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();

                if (num1!=order.getGoodsQuantity()){
                    if (data.getLimitNumber()!=0||data.getLimitNumber()<num1){

                    if (data.getLimitNumber()<num1){
                        throw new ServiceException("对不起，大于商品购买数");
                    }else{

@@ -574,7 +596,7 @@
                    memberOrderVO.setSkuName(goodsSku.getSkuName());
                    memberOrderVO.setYouhiPrice(data.getSeckillPrice());

                }


        }  if (order.getOrderFrom().getCode()==3){
                order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
@@ -732,6 +754,16 @@
    }

    @Override
    public void updMemberOrderbz(MemberOrderDTO memberOrderDTO) {
        Order order = baseMapper.selectById(memberOrderDTO.getId());
        if(memberOrderDTO.getOrderRemark()!=null){
            order.setOrderRemark(memberOrderDTO.getOrderRemark());
        }
        baseMapper.updateById(order);

    }

    @Override
    public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {

        Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
@@ -772,9 +804,34 @@
                            couponMemberDTO1.setId(order.getCouponId());
                            couponMemberDTO1.setCouponStatus(0);
                            promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
                            order.setCouponId(0L);
                        }

                        if(order.getOrderNo().contains("SP")){
                            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                            if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                            }

                            goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }

                        if(order.getOrderNo().contains("MS")){
                            GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                            if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                            }
                            goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }


                        this.updateById(order);
@@ -912,7 +969,16 @@
            }


            if(order.getOrderNo().contains("TG")){
                GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
                goodsGroupPurchaseInfo.setGroupPurchaseId(order.getGoodsSkuId());
                goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
                GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                    GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

                }
            }

        }
        if (order.getOrderStatus().getCode() == 2) {
@@ -944,6 +1010,16 @@
                    goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                }
                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
            }

            if(order.getOrderNo().contains("TG")){
                GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
                goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
                GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                    GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

                }
            }

            if (order.getCouponId()!=0){
@@ -1011,7 +1087,7 @@
            goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
            GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
            if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                GoodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
                GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

            }
        }
@@ -1137,6 +1213,42 @@
                        Order order = this.getById(MemberOrderList.getId());
                        order.setOrderStatus(OrderStatusEnum.CANCELED);
                        this.updateById(order);


                        if (order.getCouponId()!=0){
                            CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                            couponMemberDTO1.setId(order.getCouponId());
                            couponMemberDTO1.setCouponStatus(0);
                            promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
                        }

                        if(order.getOrderNo().contains("SP")){
                            GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
                            if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
                            }

                            goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }

                        if(order.getOrderNo().contains("MS")){
                            GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
                            GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
                            goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
                            goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
                            if (data.getSoldQuantity()-order.getGoodsQuantity()<0){
                                goodsStockUpdDTO1.setSoldQuantity(0);
                            }else {
                                goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
                            }
                            goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
                        }

                    }

                }
@@ -1150,6 +1262,7 @@
        paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper.eq(Order::getOrderStatus,1);
        paylogEntityWrapper.eq(Order::getDelFlag,0);
        paylogEntityWrapper.eq(Order::getIsOrder,1);
        List<Order> list = this.list(paylogEntityWrapper);
        vo.setDzforderNo(list.size());

@@ -1157,6 +1270,7 @@
        paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper1.eq(Order::getOrderStatus,2);
        paylogEntityWrapper1.eq(Order::getDelFlag,0);
        paylogEntityWrapper1.eq(Order::getIsOrder,1);
        List<Order> list1 = this.list(paylogEntityWrapper1);
        vo.setDfhorderNo(list1.size());

@@ -1164,6 +1278,7 @@
        paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper2.eq(Order::getOrderStatus,3);
        paylogEntityWrapper2.eq(Order::getDelFlag,0);
        paylogEntityWrapper2.eq(Order::getIsOrder,1);
        List<Order> list2 = this.list(paylogEntityWrapper2);
        vo.setDshorderNo(list2.size());

@@ -1173,6 +1288,7 @@
        paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
        paylogEntityWrapper3.eq(Order::getIsRequest,2);
        paylogEntityWrapper3.eq(Order::getDelFlag,0);
        paylogEntityWrapper3.eq(Order::getIsOrder,1);
        List<Order> list3 = this.list(paylogEntityWrapper3);
        vo.setShorderNo(list3.size());
        return vo;
@@ -1611,4 +1727,17 @@
        this.lambdaUpdate().set(Order::getIsOrder, 1).in(Order::getGroupNo, formedGroupMubres)
                .update();
    }


    @Override
    public void updateOrderStatusByMubres1(String formedGroupMubres) {
        LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(Order::getGroupNo, formedGroupMubres);
        List<Order> page1 = this.list(wrapper);
        for (Order p:page1){
            p.setIsOrder(1);
            this.updateById(p);
        }

    }
}